bfg-common 1.5.629 → 1.5.630

package/public/spice-console/run.js

@@ -1,210 +1,210 @@
-const getURLParameter = (parameter) => {
-  const regex = new RegExp(`${parameter}=([^&]+)`)
-  const match = regex.exec(window.location.pathname)
-  return match && match[1]
-}
-
-let vmHost = window.location.hostname
-if (vmHost === 'localhost') {
-  vmHost = '10.10.101.107' // Для разработки
-}
-const vmId = getURLParameter('id')
-const vmPort = window.config.public.PORT
-
-window.app = new Application({
-  supportHighDPI: false,
-})
-
-// Custom code
-let vmWidth = -1
-let vmHeight = -1
-window.addEventListener('resize', () => {
-  if (vmWidth !== -1 && vmHeight !== -1) setVmPosition(vmWidth, vmHeight)
-})
-const setVmPosition = (width, height) => {
-  // Делаем выравнивание по центру
-  vmWidth = width
-  vmHeight = height
-  const left = Math.max((window.innerWidth - width) / 2, 0)
-  const top = Math.max((window.innerHeight - height) / 2, 0)
-  document.getElementById('canvas_0').style.left = left + 'px'
-  document.getElementById('eventLayer').style.left = left + 'px'
-  document.getElementById('canvas_0').style.top = top + 'px'
-  document.getElementById('eventLayer').style.top = top + 'px'
-}
-// Custom code end
-
-function start() {
-  wdi.graphicDebug = new wdi.GraphicDebug({ debugMode: false })
-  let cancelReconnection = false
-  let cancelFreezeTimer, cancelReconnectionTimer
-
-  const handleWindowAction = function (action, params) {
-    if (action === 'windowClosed') {
-      $(params.canvas).remove()
-      $(params.eventLayer).remove()
-    } else if (action === 'windowMoved') {
-      $(params.canvas).css({
-        top: params.info.top + 'px',
-        left: params.info.left + 'px',
-      })
-      $(params.eventLayer).css({
-        top: params.info.top + 'px',
-        left: params.info.left + 'px',
-      })
-    } else if (action === 'init' || action === 'windowCreated') {
-      let item = null
-      let canvas = null
-      let eventlayer = null
-      const body = $('body')
-
-      for (let i in params) {
-        item = params[i]
-        const position = item.position * 2
-        canvas = $(item.canvas).css({
-          zIndex: 10000 - position - 1,
-          position: 'absolute',
-          top: item.info.top + 'px',
-          left: item.info.left + 'px',
-        })
-        eventlayer = $(item.eventLayer).css({
-          top: item.info.top + 'px',
-          left: item.info.left + 'px',
-          zIndex: 10000 - position,
-        })
-        body.append(canvas)
-        body.append(eventlayer)
-      }
-    } else if (action === 'ready') {
-      app.setReconnecting(false)
-      if (cancelReconnectionTimer?.clearTimeout) {
-        cancelReconnectionTimer()
-        cancelReconnectionTimer = false
-      }
-      const width = $(window).width()
-      const height = $(window).height()
-
-      app.sendCommand(
-        'setResolution',
-        app.toSpiceResolution({
-          width: width,
-          height: height,
-        })
-      )
-      if (wdi.IntegrationBenchmarkEnabled) {
-        $('#integrationBenchmark').css({ display: 'inline' })
-        $('#launchWordButton').prop('disabled', false)
-      }
-    } else if (action === 'resolution') {
-      // Делаем выравнивание по центру
-      const { 0: width, 1: height } = params
-      setVmPosition(width, height)
-    } else if (action === 'windowResized') {
-      // Делаем выравнивание по центру
-      const { 0: width } = params
-      const left = (window.innerWidth - width) / 2
-      if (left >= 0) {
-        document.getElementById('canvas_0').style.left = left + 'px'
-        document.getElementById('eventLayer').style.left = left + 'px'
-      }
-    } else if (action === 'windowMinimized') {
-      $(params.canvas).css({ display: 'none' })
-      $(params.eventLayer).css({ display: 'none' })
-    } else if (action === 'windowMaximized') {
-      $(params.canvas).css({
-        top: params.info.top + 'px',
-        left: params.info.left + 'px',
-      })
-      $(params.eventLayer).css({
-        top: params.info.top + 'px',
-        left: params.info.left + 'px',
-      })
-    } else if (action === 'windowRestored') {
-      $(params.canvas).css({ display: 'block' })
-      $(params.eventLayer).css({ display: 'block' })
-      $(params.canvas).css({
-        top: params.info.top + 'px',
-        left: params.info.left + 'px',
-      })
-      $(params.eventLayer).css({
-        top: params.info.top + 'px',
-        left: params.info.left + 'px',
-      })
-    } else if (action === 'windowFocused') {
-      //debugger; //eyeos should move the window to front!
-    } else if (action === 'timeLapseDetected') {
-      wdi.Debug.log('Detected time lapse of ', params, 'seconds')
-    } else if (action === 'error') {
-      if (!app.getReconnecting()) {
-        if (!cancelFreezeTimer) {
-          cancelFreezeTimer = setTimeout(function () {
-            console.log('cancelFreeze')
-            app.cancelFreeze()
-          }, 10000)
-        }
-        if (!cancelReconnectionTimer) {
-          cancelReconnectionTimer = setTimeout(function () {
-            console.log('cancel reconnection')
-            cancelReconnection = true
-          }, 60000)
-        }
-      }
-
-      setTimeout(function () {
-        if (!cancelReconnection) {
-          console.log('Trying reconnect ', Date.now())
-          app.reconnect({
-            freeze: true,
-          })
-        }
-      }, 1000)
-    }
-  }
-
-  $(window)['resize'](function () {
-    app.sendCommand(
-      'setResolution',
-      app.toSpiceResolution({
-        width: $(window).width(),
-        height: $(window).height(),
-      })
-    )
-  })
-
-  const runParams = {
-    callback: handleWindowAction,
-    context: this,
-    host: vmHost,
-    port: vmPort,
-    protocol: 'wss',
-    // 'vmToken': getURLParameter('vmtoken') || '',
-    token: 'password',
-    vmHost: vmHost,
-    vmPort: vmPort,
-    vmid: vmId,
-    useBus: false,
-    busHost: 'localhost',
-    busPort: 61613,
-    busSubscriptions: ['/topic/00000000-0000-0000-0000-000000000000'],
-    busUser: '00000000-0000-0000-0000-000000000000',
-    busPass: 'potato',
-    layout: 'es',
-    useWorkers: true,
-    seamlessDesktopIntegration: false,
-    connectionControl: false,
-    heartbeatToken: 'heartbeat',
-    heartbeatTimeout: 4000, //miliseconds
-    externalClipboardHandling: false,
-    disableClipboard: false,
-    layer: document.getElementById('vmw'),
-    // vmInfoToken: getURLParameter('vmInfoToken'),
-    disableMessageBuffering: true,
-    clientOffset: {
-      x: 0,
-      y: 0,
-    },
-  }
-  app.run(runParams)
-}
-
-$(document).ready(start)
+const getURLParameter = (parameter) => {
+  const regex = new RegExp(`${parameter}=([^&]+)`)
+  const match = regex.exec(window.location.pathname)
+  return match && match[1]
+}
+
+let vmHost = window.location.hostname
+if (vmHost === 'localhost') {
+  vmHost = '10.10.101.107' // Для разработки
+}
+const vmId = getURLParameter('id')
+const vmPort = window.config.public.PORT
+
+window.app = new Application({
+  supportHighDPI: false,
+})
+
+// Custom code
+let vmWidth = -1
+let vmHeight = -1
+window.addEventListener('resize', () => {
+  if (vmWidth !== -1 && vmHeight !== -1) setVmPosition(vmWidth, vmHeight)
+})
+const setVmPosition = (width, height) => {
+  // Делаем выравнивание по центру
+  vmWidth = width
+  vmHeight = height
+  const left = Math.max((window.innerWidth - width) / 2, 0)
+  const top = Math.max((window.innerHeight - height) / 2, 0)
+  document.getElementById('canvas_0').style.left = left + 'px'
+  document.getElementById('eventLayer').style.left = left + 'px'
+  document.getElementById('canvas_0').style.top = top + 'px'
+  document.getElementById('eventLayer').style.top = top + 'px'
+}
+// Custom code end
+
+function start() {
+  wdi.graphicDebug = new wdi.GraphicDebug({ debugMode: false })
+  let cancelReconnection = false
+  let cancelFreezeTimer, cancelReconnectionTimer
+
+  const handleWindowAction = function (action, params) {
+    if (action === 'windowClosed') {
+      $(params.canvas).remove()
+      $(params.eventLayer).remove()
+    } else if (action === 'windowMoved') {
+      $(params.canvas).css({
+        top: params.info.top + 'px',
+        left: params.info.left + 'px',
+      })
+      $(params.eventLayer).css({
+        top: params.info.top + 'px',
+        left: params.info.left + 'px',
+      })
+    } else if (action === 'init' || action === 'windowCreated') {
+      let item = null
+      let canvas = null
+      let eventlayer = null
+      const body = $('body')
+
+      for (let i in params) {
+        item = params[i]
+        const position = item.position * 2
+        canvas = $(item.canvas).css({
+          zIndex: 10000 - position - 1,
+          position: 'absolute',
+          top: item.info.top + 'px',
+          left: item.info.left + 'px',
+        })
+        eventlayer = $(item.eventLayer).css({
+          top: item.info.top + 'px',
+          left: item.info.left + 'px',
+          zIndex: 10000 - position,
+        })
+        body.append(canvas)
+        body.append(eventlayer)
+      }
+    } else if (action === 'ready') {
+      app.setReconnecting(false)
+      if (cancelReconnectionTimer?.clearTimeout) {
+        cancelReconnectionTimer()
+        cancelReconnectionTimer = false
+      }
+      const width = $(window).width()
+      const height = $(window).height()
+
+      app.sendCommand(
+        'setResolution',
+        app.toSpiceResolution({
+          width: width,
+          height: height,
+        })
+      )
+      if (wdi.IntegrationBenchmarkEnabled) {
+        $('#integrationBenchmark').css({ display: 'inline' })
+        $('#launchWordButton').prop('disabled', false)
+      }
+    } else if (action === 'resolution') {
+      // Делаем выравнивание по центру
+      const { 0: width, 1: height } = params
+      setVmPosition(width, height)
+    } else if (action === 'windowResized') {
+      // Делаем выравнивание по центру
+      const { 0: width } = params
+      const left = (window.innerWidth - width) / 2
+      if (left >= 0) {
+        document.getElementById('canvas_0').style.left = left + 'px'
+        document.getElementById('eventLayer').style.left = left + 'px'
+      }
+    } else if (action === 'windowMinimized') {
+      $(params.canvas).css({ display: 'none' })
+      $(params.eventLayer).css({ display: 'none' })
+    } else if (action === 'windowMaximized') {
+      $(params.canvas).css({
+        top: params.info.top + 'px',
+        left: params.info.left + 'px',
+      })
+      $(params.eventLayer).css({
+        top: params.info.top + 'px',
+        left: params.info.left + 'px',
+      })
+    } else if (action === 'windowRestored') {
+      $(params.canvas).css({ display: 'block' })
+      $(params.eventLayer).css({ display: 'block' })
+      $(params.canvas).css({
+        top: params.info.top + 'px',
+        left: params.info.left + 'px',
+      })
+      $(params.eventLayer).css({
+        top: params.info.top + 'px',
+        left: params.info.left + 'px',
+      })
+    } else if (action === 'windowFocused') {
+      //debugger; //eyeos should move the window to front!
+    } else if (action === 'timeLapseDetected') {
+      wdi.Debug.log('Detected time lapse of ', params, 'seconds')
+    } else if (action === 'error') {
+      if (!app.getReconnecting()) {
+        if (!cancelFreezeTimer) {
+          cancelFreezeTimer = setTimeout(function () {
+            console.log('cancelFreeze')
+            app.cancelFreeze()
+          }, 10000)
+        }
+        if (!cancelReconnectionTimer) {
+          cancelReconnectionTimer = setTimeout(function () {
+            console.log('cancel reconnection')
+            cancelReconnection = true
+          }, 60000)
+        }
+      }
+
+      setTimeout(function () {
+        if (!cancelReconnection) {
+          console.log('Trying reconnect ', Date.now())
+          app.reconnect({
+            freeze: true,
+          })
+        }
+      }, 1000)
+    }
+  }
+
+  $(window)['resize'](function () {
+    app.sendCommand(
+      'setResolution',
+      app.toSpiceResolution({
+        width: $(window).width(),
+        height: $(window).height(),
+      })
+    )
+  })
+
+  const runParams = {
+    callback: handleWindowAction,
+    context: this,
+    host: vmHost,
+    port: vmPort,
+    protocol: 'wss',
+    // 'vmToken': getURLParameter('vmtoken') || '',
+    token: 'password',
+    vmHost: vmHost,
+    vmPort: vmPort,
+    vmid: vmId,
+    useBus: false,
+    busHost: 'localhost',
+    busPort: 61613,
+    busSubscriptions: ['/topic/00000000-0000-0000-0000-000000000000'],
+    busUser: '00000000-0000-0000-0000-000000000000',
+    busPass: 'potato',
+    layout: 'es',
+    useWorkers: true,
+    seamlessDesktopIntegration: false,
+    connectionControl: false,
+    heartbeatToken: 'heartbeat',
+    heartbeatTimeout: 4000, //miliseconds
+    externalClipboardHandling: false,
+    disableClipboard: false,
+    layer: document.getElementById('vmw'),
+    // vmInfoToken: getURLParameter('vmInfoToken'),
+    disableMessageBuffering: true,
+    clientOffset: {
+      x: 0,
+      y: 0,
+    },
+  }
+  app.run(runParams)
+}
+
+$(document).ready(start)

package/store/main/mutations.ts

@@ -1,7 +1,7 @@
-import type { UI_I_MainState } from '~/store/main/lib/interfaces'
-
-export default {
-  M_MENU_PINED(state: UI_I_MainState, payload: boolean): void {
-    state.isMenuPined = payload
-  },
-}
+import type { UI_I_MainState } from '~/store/main/lib/interfaces'
+
+export default {
+  M_MENU_PINED(state: UI_I_MainState, payload: boolean): void {
+    state.isMenuPined = payload
+  },
+}

package/store/main/state.ts

@@ -1,7 +1,7 @@
-import type {UI_I_MainState} from "~/store/main/lib/interfaces";
-
-const state: UI_I_MainState = {
-  isMenuPined: false,
-}
-
-export default state
+import type {UI_I_MainState} from "~/store/main/lib/interfaces";
+
+const state: UI_I_MainState = {
+  isMenuPined: false,
+}
+
+export default state

package/store/tasks/actions.ts

@@ -99,6 +99,10 @@ export default {
     }
     if (payload) query.sortBy = payload
 
+    // Создаем контроллер для возможности отмены
+    const abortController = new AbortController()
+    context.commit('M_SET_ABORT_CONTROLLER', abortController)
+
     const { data, error } = await useMyFetch<
       API_UI_I_RecentTask<string>,
       API_UI_I_Error
@@ -106,6 +110,7 @@ export default {
       query,
       method: 'GET',
       initialCache: false,
+      signal: abortController.signal,
     })
 
     if (error.value?.data?.error_code)
@@ -124,6 +129,11 @@ export default {
     //   value: false,
     // })
   },
+  A_CANCEL_RECENT_TASKS(context: {
+    commit: (arg0: string) => void
+  }): void {
+    context.commit('M_CANCEL_RECENT_TASKS')
+  },
 
   // Вызывается в useMyFetch когда получаем первый ответ от запроса с url tasks
   // и default.vue когда срабатывает watch на recentTasks

package/store/tasks/lib/models/interfaces.ts

@@ -11,6 +11,7 @@ export interface UI_I_TasksState {
   taskQuery: string
   recentTaskList: UI_I_RecentTask<string> | null
   updatedTaskList: UI_I_RawRecentTaskItem<string>[] | null
+  abortController: AbortController | null
   loading: {
     tasks: boolean
     recentTasks: boolean

package/store/tasks/mutations.ts

@@ -35,6 +35,12 @@ export default {
 
     state.recentTaskList = payload
   },
+  M_SET_ABORT_CONTROLLER(state: UI_I_TasksState, payload: AbortController): void {
+    state.abortController = payload
+  },
+  M_CANCEL_RECENT_TASKS(state: UI_I_TasksState): void {
+    state.abortController && state.abortController.abort()
+  },
   M_SET_TASKS_LAST_QUERY(state: UI_I_TasksState, payload: string): void {
     state.taskLastRequestType = payload
   },

package/store/tasks/state.ts

@@ -7,6 +7,7 @@ const state: UI_I_TasksState = {
   taskLastRequestType: '',
   taskQuery: '',
   taskList: null,
+  abortController: null,
   loading: {
     tasks: false,
     recentTasks: false,