bfg-common 1.5.511 → 1.5.513

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/public/spice-console/spiceobjects/spiceobjects.js

@@ -2257,17 +2257,17 @@ wdi.RedCursor = $.spcExtend(wdi.SpiceObject, {
 
 
     marshall: function () {
-		this.rawData = [];
-		this.rawData = this.rawData.concat(
-			this.numberTo16(this.flags)
-		);
-		if(!(this.flags & 1)){
-			this.rawData = this.rawData.concat(
-				this.header.marshall(),
-				this.data
-			);
-		}
-		return this.rawData;
+        this.rawData = [];
+        this.rawData = this.rawData.concat(
+            this.numberTo16(this.flags)
+        );
+        if(!(this.flags & 1)){
+            this.rawData = this.rawData.concat(
+                this.header.marshall(),
+                this.data
+            );
+        }
+        return this.rawData;
     },
 
     demarshall: function (queue, expSize) {
@@ -2292,16 +2292,16 @@ wdi.RedCursorHeader = $.spcExtend(wdi.SpiceObject, {
 
 
     marshall: function () {
-		this.rawData = [];
-		this.rawData = this.rawData.concat(
-			this.numberTo64(this.unique),
-			this.numberTo8(this.type),
-			this.numberTo16(this.width),
-			this.numberTo16(this.height),
-			this.numberTo16(this.hot_spot_x),
-			this.numberTo16(this.hot_spot_y)
-		);
-		return this.rawData;
+        this.rawData = [];
+        this.rawData = this.rawData.concat(
+            this.numberTo64(this.unique),
+            this.numberTo8(this.type),
+            this.numberTo16(this.width),
+            this.numberTo16(this.height),
+            this.numberTo16(this.hot_spot_x),
+            this.numberTo16(this.hot_spot_y)
+        );
+        return this.rawData;
     },
 
     demarshall: function (queue, expSize) {
@@ -2323,13 +2323,13 @@ wdi.RedCursorSet = $.spcExtend(wdi.SpiceObject, {
     objectSize: 5,
 
     marshall: function () {
-		this.rawData = [];
-		this.rawData = this.rawData.concat(
-			this.position.marshall(),
-			this.numberTo8(this.visible),
-			this.cursor.marshall()
-		);
-		return this.rawData;
+        this.rawData = [];
+        this.rawData = this.rawData.concat(
+            this.position.marshall(),
+            this.numberTo8(this.visible),
+            this.cursor.marshall()
+        );
+        return this.rawData;
     },
 
     demarshall: function (queue, expSize) {
@@ -2343,6 +2343,27 @@ wdi.RedCursorSet = $.spcExtend(wdi.SpiceObject, {
     }
 });
 
+// Custom code
+wdi.RedCursorMove = $.spcExtend(wdi.SpiceObject, {
+    objectSize: 4,
+
+    marshall: function () {
+        this.rawData = [];
+        this.rawData = this.rawData.concat(
+            this.position.marshall(),
+        );
+        return this.rawData;
+    },
+
+    demarshall: function (queue, expSize) {
+        this.expectedSize = expSize || this.objectSize;
+        if (queue.getLength() < this.expectedSize) throw new wdi.Exception({message: 'Not enough queue to read', errorCode: 3});
+        this.position = new wdi.SpicePoint16().demarshall(queue);
+        return this;
+    }
+});
+// Custom code end
+
 wdi.RedCursorHide = $.spcExtend(wdi.SpiceObject, {
     objectSize: 5,