Feature/ping services #23

Xemka · 2021-01-29T18:19:54Z

Добавлена функциональность для считывания всех сервисов всех подключенных пользователей, проверка их на доступность и отправка пользователям статусов этих сервисов

… into feature/ping-services � Conflicts: � package.json

… into feature/ping-services

src/types/serviceStatus.ts

src/controllers/statuses.ts

fixed ping, now gets statuses

Statuses now are pushing to db

ilyamore88

Ещё пофикси ts. Тогда потестирую на локали и апрувну.

src/services/server.ts

src/types/serviceStatus.ts

neSpecc · 2021-02-25T18:20:25Z

src/config/index.ts

@@ -27,4 +27,8 @@ export default class Config {
   * Workspaces config-file path
   */
  public static workspacesConfigPath: string = process.env.CONFIG_FILE || '';
+  /**
+   * Cron schedule


непонятное описание

neSpecc · 2021-02-25T18:20:28Z

src/controllers/statuses.ts

+import ServerService from '../services/server';
+
+/**
+ * Statuses controller


непонятное описание

все еще

neSpecc · 2021-02-25T18:20:55Z

src/controllers/statuses.ts

+   * Update statuses and send to logged users
+   */
+  public static async updateStatuses(): Promise<void> {
+    const users = app.context.transport.clients.find(client => !!client).toArray();


зачем этот find?

Чтобы вернуть всех клиентов

чтобы вернуть всех, не нужно делать поиск по массиву

neSpecc · 2021-02-25T18:22:31Z

src/controllers/statuses.ts

+
+          for (const workspaceAggregation of workspaceAggregations) {
+            const serverServicesStatuses: ServiceStatus = {} as ServiceStatus;
+            const serviceList = workspaceAggregation.servicesList[0].projectName.flat(Infinity);


magic number

это лог workspaceAggregation

все равно magic number

neSpecc · 2021-02-25T18:23:44Z

src/controllers/statuses.ts

+        if (ws) {
+          const workspaceAggregations = await WorkspacesService.aggregateServices(ws._id);
+
+          for (const workspaceAggregation of workspaceAggregations) {


непонятный код, нужно добавить комментариев

src/database/models/serverServicesStatuses.ts

neSpecc · 2021-02-25T18:26:56Z

src/services/server.ts

+import ServiceStatus from '../database/models/serverServicesStatuses';
+
+/**
+ * Server service


описание дублирует название

kebyo · 2021-03-16T20:50:30Z

src/controllers/statuses.ts

+  public static async pingProjects(serviceType:string, workspaceAggregation: WorkspacesAggregation, serverServicesStatuses: ServiceStatus = {} as ServiceStatus): Promise<void> {
+    if (serviceType === 'nginx') {
+      const projectList = workspaceAggregation.servers.services.payload;


А нельзя просто принять projectList?

kebyo · 2021-03-16T20:52:37Z

src/controllers/statuses.ts

+      for (const project of projectList) {
+        projects.push(project.serverName as string);
+      }


Может тут использовать map?

kebyo

Мои сервера:

Service_statuses:

Почему-то в бд только 1 сервер

kebyo · 2021-03-18T09:52:47Z

src/controllers/statuses.ts

+  public static async pingProjects(workspaceAggregation: WorkspacesAggregation, serverServicesStatuses: ServiceStatus = {} as ServiceStatus): Promise<void> {
+    const serviceType = workspaceAggregation.servers.services.type;
+


А может просто передать workspaceAgregation.servers?

neSpecc

Нужен рефакторинг

neSpecc · 2021-03-18T18:21:45Z

src/controllers/statuses.ts

+          /**
+           * If type of service is nginx, server's projects are pinged
+           */
+          await this.pingProjects(w.servers, serverServicesStatuses);


функция называется pingProjects, а принимает servers. Надо назватьpingServers, судя по всему

и зачем она принимает serverServicesStatuses? Она же сама должна пинговать, судя по названию.

и почему она принимает несколько серверов? Лучше сделать, чтобы принимала один конкретный хост и пинговала его

в servers тип + проекты какого-то сервера

neSpecc · 2021-03-18T18:24:58Z

src/controllers/statuses.ts

+   * @param serverServicesStatuses - object with serverToken and statuses of server's projects
+   */
+  public static async pingProjects(workspaceAggregationServer: IServer, serverServicesStatuses: ServiceStatus = {} as ServiceStatus): Promise<void> {
+    const serviceType = workspaceAggregationServer.services.type;


не понятно, что такое services.type. Type может быть у одного какого-то сервиса

и зачем сюда передавать какой-то не понятный объект workspaceAggregationServer . Надо передать один конкретный хост. Функция должна вернуть результат пинга. Обновление статуса в базе надо отсюда вынести. Ну или как-то соответствующим образом поменять название метода.

neSpecc · 2021-03-18T18:31:37Z

src/controllers/statuses.ts

+      projectList.forEach((project) => {
+        projects.push(project.serverName as string);
+      });
+      const projectsStatuses = await StatusesController.checkingProjectsAvailability(projects);


что такое checkingProjectsAvailability ? почему нет глагола и почему передается сразу несколько проектов? пинговать же можно один какой-то хост.

neSpecc · 2021-03-18T18:33:07Z

src/services/server.ts

+   * @param serviceStatuses - services' statuses and server token
+   */
+  public static async updateServicesStatuses(serviceStatuses: IServiceStatus): Promise<mongoose.Document> {
+    const server = await ServiceStatus.findOne({ serverToken: serviceStatuses.serverToken });


почему в переменную server записывается не сервер, а какой-то статус?

neSpecc · 2021-03-22T18:24:26Z

src/controllers/statuses.ts

+        /**
+         * Get workspace servers and their projects
+         */
+        const workspaceAggregations: WorkspacesAggregation[] = await WorkspacesService.aggregateServices(workspace._id);


Эта агрегация портит структуру кода. Почему просто не взять workspace.servers циклом?

comments will be removed at next pr

neSpecc · 2021-03-25T07:58:59Z

src/controllers/statuses.ts

+   *
+   * @param projectList - list of project of payload of some service of some server
+   */
+  public static async pingProjects(projectList: Record<string, unknown>[]): Promise<ProjectStatus[]> {


Почему Record<string, unknown>[] ? Нам же известна структура

потому что мы работаем с payload'ом сервисов, а у него такой тип

у payload должен быть Union Type с перечислением NginxPayload | DockerPayload | ...

src/controllers/statuses.ts

neSpecc · 2021-03-25T08:01:56Z

src/controllers/statuses.ts

+             */
+              if (service.type == 'nginx') {
+                const projectsStatuses = await this.pingProjects(service.payload);
+                const serverProjectsStatuses: ServerProjectsStatuses = {} as ServerProjectsStatuses;


можно сразу написать

const serverProjectsStatuses: ServerProjectsStatuses = { projectsStatuses, serverToken: s.token }

neSpecc · 2021-03-25T08:09:25Z

src/services/server.ts

+   *
+   * @param serviceStatuses - services' statuses and server token
+   */
+  public static async updateServicesStatuses(serviceStatuses: IServiceStatus): Promise<mongoose.Document> {


тут все еще бардак

updateServicesStatuses — статусы сервисов
serviceStatuses - статусы сервиса
ServiceStatus.updateOne - статус сервиса

а обновление происходит по serverToken, значит это обновление инфы о сервере, то есть в названии должно быть что-то типа updateServerPojectsStatuses

neSpecc · 2021-03-25T08:13:45Z

src/services/server.ts

+      await this.add(serviceStatuses);
+    }
+
+    return ServiceStatus.updateOne({


а что такое ServiceStatus? они же лежат в одной таблице workspaces?

почему то по shift+fn+f6 не везде заменило имена, сейчас исправлю

kebyo · 2021-03-25T18:14:59Z

src/controllers/statuses.ts

+import ping from 'ping';
+// eslint-disable-next-line @typescript-eslint/no-unused-vars-experimental,@typescript-eslint/no-unused-vars
+import app from './../app';
+import WorkspacesService from './../services/workspace';
+import ServerProjectsStatuses, { ProjectStatus } from '../types/serverProjectsStatuses';
+import IWorkspace from './../types/workspace';
+// eslint-disable-next-line @typescript-eslint/no-unused-vars,@typescript-eslint/no-unused-vars-experimental
+import Client from 'ctproto/build/src/server/client';
+// eslint-disable-next-line @typescript-eslint/no-unused-vars,@typescript-eslint/no-unused-vars-experimental
+import { DevopsToolboxAuthData } from '../types/api/responses/authorize';
+// eslint-disable-next-line @typescript-eslint/no-unused-vars,@typescript-eslint/no-unused-vars-experimental
+import { ApiOutgoingMessage, ApiResponse } from '../types';
+import Server from '../services/server';
+// eslint-disable-next-line @typescript-eslint/no-unused-vars,@typescript-eslint/no-unused-vars-experimental
+import WorkspaceAggregation, { Server as IServer } from '../types/workspaceAggregation';


А eslint-disable нужны?

kebyo · 2021-03-25T18:22:32Z

src/controllers/statuses.ts

+  // public static sendStatuses(statuses: ServerProjectsStatuses[], user: Client<DevopsToolboxAuthData, ApiResponse, ApiOutgoingMessage>): void {
+  //   if (typeof user.authData.userToken === 'string') {
+  //     app.context.transport
+  //       .clients
+  //       .find((client) => client.authData.userToken === user.authData.userToken)
+  //       .send('statuses-updated', { statuses });
+  //   }
+  // }


Если это тебе не нужно, то можно убрать это вообще

комменты уберу в некст реквесте

kebyo · 2021-03-25T18:34:16Z

src/types/serverProjectsStatuses.ts

@@ -0,0 +1,28 @@
+import * as mongoose from 'mongoose';


А почему не просто import mongoose from 'mongoose'?

kebyo · 2021-03-25T18:38:32Z

src/types/workspaceAggregation.ts

+
+/**
+ * Interface for server
+ */
+export interface Server {
+  /**
+   * Server name
+   */
+  name: string;
+
+  /**
+   * Integration token
+   * given on server creation
+   */
+  token: string;
+
+  /**
+   * Information for SSH connection to server
+   */
+  sshConnectionInfo: SSHConnectionInfo;
+
+  /**
+   * List of services running on the server
+   */
+  services: Service[];


А зачем это надо? Нельзя ли просто import Server from './server'?

neSpecc · 2021-03-27T08:04:53Z

src/controllers/statuses.ts

+        /**
+         * Get workspace servers and their projects
+         */
+        const workspaceAggregations: WorkspaceAggregation[] = await WorkspacesService.aggregateServices(workspace._id);


объясни плз, зачем делать доп запросы в базу. Разве переменная workspaces не содержит серверы и сервисы?

neSpecc · 2021-03-27T08:07:05Z

src/controllers/statuses.ts

+   *
+   * @param projectList - list of project of payload of some service of some server
+   */
+  public static async pingProjects(projectList: Record<string, unknown>[]): Promise<ProjectStatus[]> {


у payload должен быть Union Type с перечислением NginxPayload | DockerPayload | ...

neSpecc · 2021-03-27T08:07:51Z

src/services/server.ts

+   * @param serverProjectsStatuses - server projects' statuses and server token
+   */
+  public static async updateServicesStatuses(serverProjectsStatuses: ServerProjectsStatuses): Promise<mongoose.Document> {
+    const server = await IServerProjectsStatuses.findOne({ serverToken: serverProjectsStatuses.serverToken });


Префикс I означает интерфейс. А у тебя тут какой то класс с таким префиксом

kebyo · 2021-04-06T18:19:26Z

src/types/servicePayload.ts

@@ -0,0 +1,33 @@
+export interface Port {


kebyo · 2021-04-06T18:20:53Z

src/types/service.ts

+export interface NginxService extends Service<NginxPayload> {
+  type: 'nginx';
+}
+export interface DockerService extends Service<DockerPayload> {
+  type: 'docker';


kebyo · 2021-04-06T18:22:58Z

src/controllers/statuses.ts

-    for (const project of projectList) {
-      projectsStatuses.push(await StatusesController.checkProjectAvailability(project['serverName'] as string));
+    for (const payloadElement of payload) {
+      projectsStatuses.push(await StatusesController.checkProjectAvailability(payloadElement.serverName));


Я бы вынес это в переменную

kebyo · 2021-04-06T18:23:29Z

src/controllers/statuses.ts

-                  projectsStatuses,
-                  serverToken: s.token,
-                } as ServerProjectsStatuses;
+            if (service.type == 'nginx') {


Я бы === поставил

В чем надобность?

Ну тут особо разницы нет. Просто мы вроде везде используем ===

nikmel2803 · 2021-04-29T10:56:52Z

src/types/servicePayload.ts

+    /**
+     * Host for inside container
+     */
+    host: string,
+    /**
+     * Port for inside container
+     */
+    port: string,
+    /**
+     * Type of  inside container
+     */
+    type: string,


почему бы не вынести этот код в отдельный интерфейс, чтобы не дублировать его?

nikmel2803 · 2021-04-29T10:57:17Z

src/types/servicePayload.ts

+  listen: string,
+  serverName: string,
+  proxyPass: string,


nikmel2803 · 2021-04-29T10:57:26Z

src/types/servicePayload.ts

+  names: string,
+  containerId: string,
+  image: string,
+  created: Date,
+  status: string,
+  ports: Port[]


тоже доки

nikmel2803 · 2021-04-29T11:05:10Z

src/index.ts

+ * Ping availability of connected user's services
+ */
+cron.schedule(Config.pingSchedule, () => {
+  StatusesController.updateStatuses();


промис надо обработать

nikmel2803 · 2021-04-29T11:06:15Z

src/controllers/statuses.ts

+// eslint-disable-next-line @typescript-eslint/no-unused-vars-experimental,@typescript-eslint/no-unused-vars
+import app from './../app';
+import WorkspacesService from './../services/workspace';
+import ServerProjectsStatuses, { ProjectStatus } from '../types/serverProjectsStatuses';
+import Workspace from './../types/workspace';
+// eslint-disable-next-line @typescript-eslint/no-unused-vars,@typescript-eslint/no-unused-vars-experimental
+import Client from 'ctproto/build/src/server/client';
+// eslint-disable-next-line @typescript-eslint/no-unused-vars,@typescript-eslint/no-unused-vars-experimental
+import { DevopsToolboxAuthData } from '../types/api/responses/authorize';
+// eslint-disable-next-line @typescript-eslint/no-unused-vars,@typescript-eslint/no-unused-vars-experimental
+import { ApiOutgoingMessage, ApiResponse } from '../types';
+import Server from '../services/server';
+import { NginxPayload } from '../types/servicePayload';
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars,@typescript-eslint/no-unused-vars-experimental


что за беспредел

В следующем реквесте уберу..

Xemka added 20 commits January 13, 2021 19:28

Add cron schedule to env.example

cf6b853

Update yarn.lock

dc9d2c9

Add cron schedule listener

8aa8aaa

Add update message to types

6f17fd1

Update package.json

456202e

Add service status to types

6a87e1a

Add update message to outgoing messages

d522262

Fix type of services

e77b00e

Added a scheduled launch to index.ts

b9edd24

Added statuses reader

befa352

Refactor statuses.ts

1cd6462

Added a file for searching one workspace

17d9318

Merge branch 'main' of https://github.com/codex-team/devops-toolbox-api…

94ecadb

… into feature/ping-services � Conflicts: � package.json

Refactoring

12ad87d

Add axios to package.json

a690d43

Refactor statuses.ts

ffcf8c4

Added services aggregation type

af9773a

Added use of mongodb aggregations in statuses.ts

e78f88b

Added aggregations function in workspaces service

fe96048

Merge branch 'main' of https://github.com/codex-team/devops-toolbox-api…

d392ebd

… into feature/ping-services

kebyo reviewed Jan 29, 2021

View reviewed changes

src/types/serviceStatus.ts Outdated Show resolved Hide resolved

src/controllers/statuses.ts Outdated Show resolved Hide resolved

Xemka and others added 6 commits February 2, 2021 19:50

Moved aggregation condition to services

b697b28

Refactored types and promises

4be581c

Merge branch 'main' into feature/ping-services

f722f38

fixes

af93395

fixed ping, now gets statuses

Added ping of services

869b489

Statuses now are pushing to db

eslint fixes

5816b0d

ilyamore88 requested changes Feb 25, 2021

View reviewed changes

src/services/server.ts Outdated Show resolved Hide resolved

src/services/server.ts Outdated Show resolved Hide resolved

src/types/serviceStatus.ts Outdated Show resolved Hide resolved

neSpecc requested changes Feb 25, 2021

View reviewed changes

fixes of commits

3f427b2

kebyo suggested changes Mar 16, 2021

View reviewed changes

fixed pingProjects

9303915

kebyo reviewed Mar 18, 2021

View reviewed changes

fabled228 added 2 commits March 18, 2021 13:05

Update statuses.ts

00c9538

added export

185d932

neSpecc requested changes Mar 18, 2021

View reviewed changes

neSpecc reviewed Mar 22, 2021

View reviewed changes

fabled228 added 3 commits March 24, 2021 16:11

refactoring

3670d6a

comments will be removed at next pr

Update statuses.ts

2c59cca

changed workspace aggregation

228d0ac

neSpecc reviewed Mar 25, 2021

View reviewed changes

refactoring

cdfb9f3

kebyo suggested changes Mar 25, 2021

View reviewed changes

removed excess code

3151c73

neSpecc reviewed Mar 27, 2021

View reviewed changes

fabled228 added 4 commits April 1, 2021 02:20

removed aggregations

2044caa

fixed names

f6e58e9

removed extend db operations

f0c14e7

refactoring

1436e8f

kebyo suggested changes Apr 6, 2021

View reviewed changes

fabled228 added 3 commits April 9, 2021 18:48

added docs

b63e434

fixes

28715eb

Update servicePayload.ts

2503fdc

kebyo approved these changes Apr 9, 2021

View reviewed changes

fabled228 requested review from neSpecc and ilyamore88 April 15, 2021 17:52

nikmel2803 reviewed Apr 29, 2021

View reviewed changes

fabled228 added 2 commits May 5, 2021 20:28

docs

8cc4b4f

Update index.ts

b6f10b7

		public static async pingProjects(workspaceAggregation: WorkspacesAggregation, serverServicesStatuses: ServiceStatus = {} as ServiceStatus): Promise<void> {
		const serviceType = workspaceAggregation.servers.services.type;

Feature/ping services #23

Are you sure you want to change the base?

Feature/ping services #23

Uh oh!

Conversation

Xemka commented Jan 29, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ilyamore88 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

fabled228 Feb 25, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

kebyo left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

neSpecc left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Xemka commented Jan 29, 2021 •

edited

Loading

fabled228 Feb 25, 2021 •

edited

Loading