shared-ritm 1.3.130 → 1.3.131

package/src/api/services/VideoService.ts

@@ -1,118 +1,118 @@
-import ApiService from '../settings/ApiService'
-import { ResponseApi } from '@/api/types/Api_Service'
-import {
-  Api_Video_Combination,
-  Api_Video_Source_By_Repair,
-  Api_Video_Source_Create,
-  Api_Video_Source_Economics,
-  Api_Video_Source_Search,
-  Api_Video_Training_Status,
-  Api_Work_Zone,
-  Api_Work_Zone_Search,
-} from '@/api/types/Api_Video'
-
-class VideoService extends ApiService {
-  public async startVideoAnalytics(): Promise<boolean> {
-    return await this.post('/statanly/start', null)
-  }
-
-  public reloadVideoAnalytics(ids: string[]): Promise<any> {
-    return this.post('/horizon/video-source/reload', { video_source_ids: ids })
-  }
-
-  public hardReloadStream(): Promise<any> {
-    return this.post('horizon/video-source/streams/add', null)
-  }
-
-  public async fetchWorkZones(params?: any): Promise<ResponseApi<Api_Work_Zone_Search[]>> {
-    return await this.get('/search/work_zones', { params })
-  }
-
-  public async fetchWorkZone(id: string): Promise<ResponseApi<Api_Work_Zone>> {
-    return await this.get(`/work_zone/get_work_zone/${id}`)
-  }
-
-  public async editWorkZone(id: string, body: { title: string }): Promise<{ data: Api_Work_Zone; status: number }> {
-    return await this.put(`/admin/work-zones/${id}`, body)
-  }
-
-  public async deleteWorkZone(id: string): Promise<{ data: boolean; status: number }> {
-    return await this.delete(`/admin/work-zones/${id}`)
-  }
-
-  public async fetchVideoSources(params?: any): Promise<ResponseApi<Api_Video_Source_Search[]>> {
-    return await this.get('/search/video_sources/list', { params })
-  }
-
-  public async fetchVideoSourceEconomics(params?: any): Promise<ResponseApi<Api_Video_Source_Economics>> {
-    return await this.get('horizon/video-source/economics', { params })
-  }
-
-  public async createVideoSource(body: Api_Video_Source_Create): Promise<Api_Video_Source_Search> {
-    return await this.post('horizon/video-source', body)
-  }
-
-  public async editVideoSource(id: string, body: Partial<Api_Video_Source_Create>): Promise<Api_Video_Source_Search> {
-    return await this.put(`/horizon/video-source/${id}`, body)
-  }
-
-  public async deleteVideoSource(id: string): Promise<void> {
-    await this.delete(`/horizon/video-source/${id}`)
-  }
-
-  public async fetchListRepairsVideoSource(params?: any): Promise<Api_Video_Source_By_Repair[]> {
-    return await this.get('work_zone/get_list_video_source_by_repair', { params })
-  }
-
-  public async sendCombination(body: { cameras_id: string[] }): Promise<any> {
-    return await this.post('horizon/video-source/training', body)
-  }
-
-  public async saveCombination(body: any): Promise<any> {
-    return await this.post('horizon/video-source/bind', body)
-  }
-
-  public async fetchCombination(params?: Record<string, string>): Promise<Api_Video_Combination> {
-    return await this.get('horizon/video-source/bind/show', { params })
-  }
-
-  public async startTraining(body: { cameras_id: string[] }): Promise<any> {
-    return await this.post('horizon/video-source/training/start', body)
-  }
-
-  public async stopTraining(body: { cameras_id: string[] }): Promise<any> {
-    return await this.post('horizon/video-source/training/stop', body)
-  }
-
-  public async fetchTrainingInfo(params?: Record<string, string>): Promise<any> {
-    return await this.get('horizon/video-source/training/info', { params })
-  }
-
-  public async fetchTrainingStatus(params?: Record<string, string>): Promise<Api_Video_Training_Status> {
-    return await this.get('horizon/video-source/training/status', { params })
-  }
-
-  public async fetchVisualizationDataLink(params?: Record<string, string>): Promise<string> {
-    return await this.get('horizon/video-source/link/video/training', { params })
-  }
-
-  public async updateVisualizationData(params?: Record<string, string>): Promise<number> {
-    return await this.get('horizon/video-source/download/video/training', { params })
-  }
-
-  public async deleteFrameFromVideo(id: string): Promise<void> {
-    await this.delete(`horizon/video-source/delete/fragment/video/training/${id}`)
-  }
-
-  // Для тестирования ws видеостены
-  public async sendEvent(params?: Record<string, any>): Promise<number> {
-    return await this.post('alerts_callback_url', params)
-  }
-}
-
-let api: VideoService
-
-export default function useVideoService() {
-  if (!api) api = new VideoService()
-  return api
-}
+import ApiService from '../settings/ApiService'
+import { ResponseApi } from '@/api/types/Api_Service'
+import {
+  Api_Video_Combination,
+  Api_Video_Source_By_Repair,
+  Api_Video_Source_Create,
+  Api_Video_Source_Economics,
+  Api_Video_Source_Search,
+  Api_Video_Training_Status,
+  Api_Work_Zone,
+  Api_Work_Zone_Search,
+} from '@/api/types/Api_Video'
+
+class VideoService extends ApiService {
+  public async startVideoAnalytics(): Promise<boolean> {
+    return await this.post('/statanly/start', null)
+  }
+
+  public reloadVideoAnalytics(ids: string[]): Promise<any> {
+    return this.post('/horizon/video-source/reload', { video_source_ids: ids })
+  }
+
+  public hardReloadStream(): Promise<any> {
+    return this.post('horizon/video-source/streams/add', null)
+  }
+
+  public async fetchWorkZones(params?: any): Promise<ResponseApi<Api_Work_Zone_Search[]>> {
+    return await this.get('/search/work_zones', { params })
+  }
+
+  public async fetchWorkZone(id: string): Promise<ResponseApi<Api_Work_Zone>> {
+    return await this.get(`/work_zone/get_work_zone/${id}`)
+  }
+
+  public async editWorkZone(id: string, body: { title: string }): Promise<{ data: Api_Work_Zone; status: number }> {
+    return await this.put(`/admin/work-zones/${id}`, body)
+  }
+
+  public async deleteWorkZone(id: string): Promise<{ data: boolean; status: number }> {
+    return await this.delete(`/admin/work-zones/${id}`)
+  }
+
+  public async fetchVideoSources(params?: any): Promise<ResponseApi<Api_Video_Source_Search[]>> {
+    return await this.get('/search/video_sources/list', { params })
+  }
+
+  public async fetchVideoSourceEconomics(params?: any): Promise<ResponseApi<Api_Video_Source_Economics>> {
+    return await this.get('horizon/video-source/economics', { params })
+  }
+
+  public async createVideoSource(body: Api_Video_Source_Create): Promise<Api_Video_Source_Search> {
+    return await this.post('horizon/video-source', body)
+  }
+
+  public async editVideoSource(id: string, body: Partial<Api_Video_Source_Create>): Promise<Api_Video_Source_Search> {
+    return await this.put(`/horizon/video-source/${id}`, body)
+  }
+
+  public async deleteVideoSource(id: string): Promise<void> {
+    await this.delete(`/horizon/video-source/${id}`)
+  }
+
+  public async fetchListRepairsVideoSource(params?: any): Promise<Api_Video_Source_By_Repair[]> {
+    return await this.get('work_zone/get_list_video_source_by_repair', { params })
+  }
+
+  public async sendCombination(body: { cameras_id: string[] }): Promise<any> {
+    return await this.post('horizon/video-source/training', body)
+  }
+
+  public async saveCombination(body: any): Promise<any> {
+    return await this.post('horizon/video-source/bind', body)
+  }
+
+  public async fetchCombination(params?: Record<string, string>): Promise<Api_Video_Combination> {
+    return await this.get('horizon/video-source/bind/show', { params })
+  }
+
+  public async startTraining(body: { cameras_id: string[] }): Promise<any> {
+    return await this.post('horizon/video-source/training/start', body)
+  }
+
+  public async stopTraining(body: { cameras_id: string[] }): Promise<any> {
+    return await this.post('horizon/video-source/training/stop', body)
+  }
+
+  public async fetchTrainingInfo(params?: Record<string, string>): Promise<any> {
+    return await this.get('horizon/video-source/training/info', { params })
+  }
+
+  public async fetchTrainingStatus(params?: Record<string, string>): Promise<Api_Video_Training_Status> {
+    return await this.get('horizon/video-source/training/status', { params })
+  }
+
+  public async fetchVisualizationDataLink(params?: Record<string, string>): Promise<string> {
+    return await this.get('horizon/video-source/link/video/training', { params })
+  }
+
+  public async updateVisualizationData(params?: Record<string, string>): Promise<number> {
+    return await this.get('horizon/video-source/download/video/training', { params })
+  }
+
+  public async deleteFrameFromVideo(id: string): Promise<void> {
+    await this.delete(`horizon/video-source/delete/fragment/video/training/${id}`)
+  }
+
+  // Для тестирования ws видеостены
+  public async sendEvent(params?: Record<string, any>): Promise<number> {
+    return await this.post('alerts_callback_url', params)
+  }
+}
+
+let api: VideoService
+
+export default function useVideoService() {
+  if (!api) api = new VideoService()
+  return api
+}

package/src/api/settings/ApiService.ts

@@ -1,185 +1,185 @@
-import axios, { AxiosError, AxiosInstance, AxiosRequestConfig, AxiosResponse, InternalAxiosRequestConfig } from 'axios'
-import { Api_Auth_Login } from '@/api/types/Api_Auth'
-
-// eslint-disable-next-line
-var isRefreshing = false
-// eslint-disable-next-line
-var refreshSubscribers: any[] = []
-
-interface Api_Auth_Refresh {
-  accessToken: string
-}
-
-export enum ApiServiceType {
-  SERVICE_AUTH = 'SERVICE_AUTH',
-}
-
-export default class ApiService {
-  private axiosInstance: AxiosInstance
-
-  constructor() {
-    this.axiosInstance = axios.create({
-      //@ts-ignore
-      baseURL: window.__ENV__.VUE_APP_BACKEND,
-      headers: {
-        'Content-Type': 'application/json',
-        Accept: 'application/json',
-      },
-      withCredentials: true,
-    })
-
-    this.axiosInstance.interceptors.request.use(
-      (config: InternalAxiosRequestConfig) => {
-        config.headers.Authorization = `Bearer ${this.getAccessToken()}`
-        return config
-      },
-      (error: AxiosError) => {
-        return Promise.reject(error)
-      },
-    )
-
-    this.axiosInstance.interceptors.response.use(
-      (response: AxiosResponse) => {
-        return response.data
-      },
-      async error => {
-        const originalRequest = error.config
-
-        if (
-          error.response?.status !== 401 ||
-          originalRequest.url === '/v2/auth/refresh' ||
-          originalRequest.url === '/v2/login' ||
-          originalRequest._retry
-        ) {
-          return Promise.reject(error)
-        }
-
-        originalRequest._retry = true
-
-        if (isRefreshing) {
-          return new Promise(resolve => {
-            this.subscribeTokenRefresh(() => resolve(this.axiosInstance(originalRequest)))
-          })
-        }
-
-        isRefreshing = true
-
-        try {
-          const response = await this.refresh()
-
-          const newToken = response.accessToken
-          if (!newToken) {
-            this.logoutUser()
-            return Promise.reject(error)
-          }
-
-          this.setAccessToken(newToken)
-          this.onRefreshed()
-          isRefreshing = false
-          return this.axiosInstance(originalRequest)
-        } catch (e) {
-          this.logoutUser()
-          return Promise.reject(e)
-        }
-      },
-    )
-  }
-
-  private setAccessToken(token: string) {
-    localStorage.setItem('token', token)
-  }
-  private getAccessToken() {
-    return localStorage.getItem('token')
-  }
-
-  private removeToken() {
-    localStorage.removeItem('token')
-  }
-
-  private subscribeTokenRefresh(cb: any) {
-    refreshSubscribers.push(cb)
-  }
-
-  private refresh(): Promise<Api_Auth_Refresh> {
-    return this.post<null, Api_Auth_Login>(`/v2/auth/refresh`, null)
-  }
-
-  private onRefreshed() {
-    refreshSubscribers.forEach(cb => cb())
-    refreshSubscribers = []
-  }
-
-  public logoutUser(): any {
-    isRefreshing = false
-    this.post<any, any>(`/v2/logout`, null)
-    this.removeToken()
-    window.location.href = '/sign-in'
-  }
-
-  private handleError(error: AxiosError): void {
-    if (error.response) {
-      console.error('API Error:', error.response.status, error.response.data)
-    } else if (error.request) {
-      console.error('No response received:', error.request)
-    } else {
-      console.error('Error during request setup:', error.message)
-    }
-  }
-
-  protected async get<T>(url: string, options?: AxiosRequestConfig) {
-    try {
-      const response: AxiosResponse<T> = await this.axiosInstance.get<T>(url, options)
-      if (response?.data === false) return false as unknown as T
-
-      return response?.data ?? (response as unknown as T)
-    } catch (error) {
-      const axiosError = error as AxiosError
-      this.handleError(axiosError)
-      throw error
-    }
-  }
-
-  protected async delete<T>(url: string, options?: AxiosRequestConfig) {
-    try {
-      return await this.axiosInstance.delete<T>(url, options)
-    } catch (error) {
-      const axiosError = error as AxiosError
-      this.handleError(axiosError)
-      throw error
-    }
-  }
-
-  protected async post<T1, T2>(url: string, payload: T1, options?: AxiosRequestConfig) {
-    try {
-      const response: AxiosResponse<T2> = await this.axiosInstance.post<T1, AxiosResponse<T2>>(url, payload, options)
-      if (response?.data === false) return false
-      return response?.data || (response as any)
-    } catch (error) {
-      const axiosError = error as AxiosError
-      this.handleError(axiosError)
-      throw error
-    }
-  }
-
-  protected async patch<T1, T2>(url: string, payload: T1, options?: AxiosRequestConfig): Promise<T2> {
-    try {
-      const response: AxiosResponse<T2> = await this.axiosInstance.patch<T1, AxiosResponse<T2>>(url, payload, options)
-      return response.data
-    } catch (error) {
-      const axiosError = error as AxiosError
-      this.handleError(axiosError)
-      throw error
-    }
-  }
-
-  protected async put<T1, T2>(url: string, payload: T1, options?: AxiosRequestConfig) {
-    try {
-      const response: AxiosResponse<T2> = await this.axiosInstance.put<T1, AxiosResponse<T2>>(url, payload, options)
-      return response.data
-    } catch (error) {
-      const axiosError = error as AxiosError
-      this.handleError(axiosError)
-      throw error
-    }
-  }
-}
+import axios, { AxiosError, AxiosInstance, AxiosRequestConfig, AxiosResponse, InternalAxiosRequestConfig } from 'axios'
+import { Api_Auth_Login } from '@/api/types/Api_Auth'
+
+// eslint-disable-next-line
+var isRefreshing = false
+// eslint-disable-next-line
+var refreshSubscribers: any[] = []
+
+interface Api_Auth_Refresh {
+  accessToken: string
+}
+
+export enum ApiServiceType {
+  SERVICE_AUTH = 'SERVICE_AUTH',
+}
+
+export default class ApiService {
+  private axiosInstance: AxiosInstance
+
+  constructor() {
+    this.axiosInstance = axios.create({
+      //@ts-ignore
+      baseURL: window.__ENV__.VUE_APP_BACKEND,
+      headers: {
+        'Content-Type': 'application/json',
+        Accept: 'application/json',
+      },
+      withCredentials: true,
+    })
+
+    this.axiosInstance.interceptors.request.use(
+      (config: InternalAxiosRequestConfig) => {
+        config.headers.Authorization = `Bearer ${this.getAccessToken()}`
+        return config
+      },
+      (error: AxiosError) => {
+        return Promise.reject(error)
+      },
+    )
+
+    this.axiosInstance.interceptors.response.use(
+      (response: AxiosResponse) => {
+        return response.data
+      },
+      async error => {
+        const originalRequest = error.config
+
+        if (
+          error.response?.status !== 401 ||
+          originalRequest.url === '/v2/auth/refresh' ||
+          originalRequest.url === '/v2/login' ||
+          originalRequest._retry
+        ) {
+          return Promise.reject(error)
+        }
+
+        originalRequest._retry = true
+
+        if (isRefreshing) {
+          return new Promise(resolve => {
+            this.subscribeTokenRefresh(() => resolve(this.axiosInstance(originalRequest)))
+          })
+        }
+
+        isRefreshing = true
+
+        try {
+          const response = await this.refresh()
+
+          const newToken = response.accessToken
+          if (!newToken) {
+            this.logoutUser()
+            return Promise.reject(error)
+          }
+
+          this.setAccessToken(newToken)
+          this.onRefreshed()
+          isRefreshing = false
+          return this.axiosInstance(originalRequest)
+        } catch (e) {
+          this.logoutUser()
+          return Promise.reject(e)
+        }
+      },
+    )
+  }
+
+  private setAccessToken(token: string) {
+    localStorage.setItem('token', token)
+  }
+  private getAccessToken() {
+    return localStorage.getItem('token')
+  }
+
+  private removeToken() {
+    localStorage.removeItem('token')
+  }
+
+  private subscribeTokenRefresh(cb: any) {
+    refreshSubscribers.push(cb)
+  }
+
+  private refresh(): Promise<Api_Auth_Refresh> {
+    return this.post<null, Api_Auth_Login>(`/v2/auth/refresh`, null)
+  }
+
+  private onRefreshed() {
+    refreshSubscribers.forEach(cb => cb())
+    refreshSubscribers = []
+  }
+
+  public logoutUser(): any {
+    isRefreshing = false
+    this.post<any, any>(`/v2/logout`, null)
+    this.removeToken()
+    window.location.href = '/sign-in'
+  }
+
+  private handleError(error: AxiosError): void {
+    if (error.response) {
+      console.error('API Error:', error.response.status, error.response.data)
+    } else if (error.request) {
+      console.error('No response received:', error.request)
+    } else {
+      console.error('Error during request setup:', error.message)
+    }
+  }
+
+  protected async get<T>(url: string, options?: AxiosRequestConfig) {
+    try {
+      const response: AxiosResponse<T> = await this.axiosInstance.get<T>(url, options)
+      if (response?.data === false) return false as unknown as T
+
+      return response?.data ?? (response as unknown as T)
+    } catch (error) {
+      const axiosError = error as AxiosError
+      this.handleError(axiosError)
+      throw error
+    }
+  }
+
+  protected async delete<T>(url: string, options?: AxiosRequestConfig) {
+    try {
+      return await this.axiosInstance.delete<T>(url, options)
+    } catch (error) {
+      const axiosError = error as AxiosError
+      this.handleError(axiosError)
+      throw error
+    }
+  }
+
+  protected async post<T1, T2>(url: string, payload: T1, options?: AxiosRequestConfig) {
+    try {
+      const response: AxiosResponse<T2> = await this.axiosInstance.post<T1, AxiosResponse<T2>>(url, payload, options)
+      if (response?.data === false) return false
+      return response?.data || (response as any)
+    } catch (error) {
+      const axiosError = error as AxiosError
+      this.handleError(axiosError)
+      throw error
+    }
+  }
+
+  protected async patch<T1, T2>(url: string, payload: T1, options?: AxiosRequestConfig): Promise<T2> {
+    try {
+      const response: AxiosResponse<T2> = await this.axiosInstance.patch<T1, AxiosResponse<T2>>(url, payload, options)
+      return response.data
+    } catch (error) {
+      const axiosError = error as AxiosError
+      this.handleError(axiosError)
+      throw error
+    }
+  }
+
+  protected async put<T1, T2>(url: string, payload: T1, options?: AxiosRequestConfig) {
+    try {
+      const response: AxiosResponse<T2> = await this.axiosInstance.put<T1, AxiosResponse<T2>>(url, payload, options)
+      return response.data
+    } catch (error) {
+      const axiosError = error as AxiosError
+      this.handleError(axiosError)
+      throw error
+    }
+  }
+}