bfg-common 1.5.459 → 1.5.460

package/components/common/spiceConsole/SpiceConsole.vue

@@ -136,20 +136,20 @@ onBeforeUnmount(() => {
   window.removeEventListener('blur', inputManagerBlur)
 })
 
-// TODO Этот код решает проблему когда у вм нету пароли, но окно подтверждения все равно открывается
-const { $store }: any = useNuxtApp()
-$store.dispatch('vm/A_GET_VM_SETTINGS', props.vmId) // Работает и для Пракуратора и для Сферы
-const vmSettings = computed<UI_I_VmSettings | null>(
-  () => $store.getters['vm/getVmSettings']
-)
-watch(
-  vmSettings,
-  (newValue) => {
-    // @ts-ignore
-    window.vmHasPassword = !!newValue?.options.remote_console.password
-  },
-  { deep: true, immediate: true }
-)
+// // TODO Этот код решает проблему когда у вм нету пароли, но окно подтверждения все равно открывается
+// const { $store }: any = useNuxtApp()
+// $store.dispatch('vm/A_GET_VM_SETTINGS', props.vmId) // Работает и для Пракуратора и для Сферы
+// const vmSettings = computed<UI_I_VmSettings | null>(
+//   () => $store.getters['vm/getVmSettings']
+// )
+// watch(
+//   vmSettings,
+//   (newValue) => {
+//     // @ts-ignore
+//     window.vmHasPassword = !!newValue?.options.remote_console.password
+//   },
+//   { deep: true, immediate: true }
+// )
 </script>
 <style scoped lang="scss">
 .spice-console {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.5.459",
+  "version": "1.5.460",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",

package/public/spice-console/network/spicechannel.js

@@ -346,6 +346,51 @@ wdi.SpiceChannel = $.spcExtend(wdi.EventObject.prototype, {
     errorQ.setData(data)
     var errorCode = wdi.SpiceObject.bytesToInt32NoAllocate(errorQ)
     wdi.GlobalPool.discard('ViewQueue', errorQ)
+
+    // TODO remove
+    let chanelName =
+      this.channel === wdi.SpiceVars.SPICE_CHANNEL_DISPLAY ? 'display' : 'main'
+    switch (this.channel) {
+      case wdi.SpiceVars.SPICE_CHANNEL_MAIN:
+        chanelName = 'main'
+        break
+      case wdi.SpiceVars.SPICE_CHANNEL_DISPLAY:
+        chanelName = 'display'
+        break
+      case wdi.SpiceVars.SPICE_CHANNEL_INPUTS:
+        chanelName = 'inputs'
+        break
+      case wdi.SpiceVars.SPICE_CHANNEL_CURSOR:
+        chanelName = 'cursor'
+        break
+      case wdi.SpiceVars.SPICE_CHANNEL_PLAYBACK:
+        chanelName = 'playback'
+        break
+      case wdi.SpiceVars.SPICE_CHANNEL_RECORD:
+        chanelName = 'record'
+        break
+      case wdi.SpiceVars.SPICE_CHANNEL_TUNNEL:
+        chanelName = 'tunnel'
+        break
+      case wdi.SpiceVars.SPICE_CHANNEL_SMARTCARD:
+        chanelName = 'smartcard'
+        break
+      case wdi.SpiceVars.SPICE_CHANNEL_USBREDIR:
+        chanelName = 'usbredir'
+        break
+    }
+    if (errorCode === 7) {
+      console.log(
+        `%c error code: 7; channel: ${chanelName} (${this.channel})`,
+        'color: red'
+      )
+    } else {
+      console.log(
+        'getErrorCodeBytes',
+        `error code: ${errorCode}`,
+        `channel: ${chanelName} (${this.channel})`
+      )
+    }
     if (errorCode === 0) {
       if (this.channel === wdi.SpiceVars.SPICE_CHANNEL_DISPLAY) {
         var redDisplayInit = new wdi.SpiceDataHeader({
@@ -374,24 +419,14 @@ wdi.SpiceChannel = $.spcExtend(wdi.EventObject.prototype, {
       }
       // Custom code
     } else if (errorCode === 7) {
-      // TODO сейчас не работает, точнее иногда всплывает окно с паролем хотя не надо. Временное решение ниже
-      // const vmId = location.pathname.match(/id=(.+)/)[1]
-      // let password = window.sessionStorage.getItem(`password-${vmId}`)
-      // if (window.passwordInit) password = ''
-      //
-      // window.password = password || window.prompt('Enter the password')
-      // window.password &&
-      //   window.sessionStorage.setItem(`password-${vmId}`, window.password)
-      // window.passwordInit = true
-      // TODO Временное решение
-      if (window.vmHasPassword) {
+      if (this.channel === wdi.SpiceVars.SPICE_CHANNEL_MAIN) {
         const vmId = location.pathname.match(/id=(.+)/)[1]
         let password = window.sessionStorage.getItem(`password-${vmId}`)
         if (window.passwordInit) password = ''
 
         window.password = password || window.prompt('Enter the password')
         window.password &&
-        window.sessionStorage.setItem(`password-${vmId}`, window.password)
+          window.sessionStorage.setItem(`password-${vmId}`, window.password)
         window.passwordInit = true
       }
       // Custom code end