@novnc/novnc 1.3.0-beta → 1.3.0-g1075cd8

package/lib/rfb.js

@@ -1,6 +1,6 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -43,6 +43,10 @@ var _xtscancodes = _interopRequireDefault(require("./input/xtscancodes.js"));
 
 var _encodings = require("./encodings.js");
 
+var _ra = _interopRequireDefault(require("./ra2.js"));
+
+var _md = require("./util/md5.js");
+
 var _raw = _interopRequireDefault(require("./decoders/raw.js"));
 
 var _copyrect = _interopRequireDefault(require("./decoders/copyrect.js"));
@@ -55,19 +59,39 @@ var _tight = _interopRequireDefault(require("./decoders/tight.js"));
 
 var _tightpng = _interopRequireDefault(require("./decoders/tightpng.js"));
 
+var _zrle = _interopRequireDefault(require("./decoders/zrle.js"));
+
+var _jpeg = _interopRequireDefault(require("./decoders/jpeg.js"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
 function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
@@ -151,7 +175,8 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
     _this._rfbConnectionState = '';
     _this._rfbInitState = '';
     _this._rfbAuthScheme = -1;
-    _this._rfbCleanDisconnect = true; // Server capabilities
+    _this._rfbCleanDisconnect = true;
+    _this._rfbRSAAESAuthenticationState = null; // Server capabilities
 
     _this._rfbVersion = 0;
     _this._rfbMaxVersion = 3.8;
@@ -223,7 +248,9 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
       handleResize: _this._handleResize.bind(_assertThisInitialized(_this)),
       handleMouse: _this._handleMouse.bind(_assertThisInitialized(_this)),
       handleWheel: _this._handleWheel.bind(_assertThisInitialized(_this)),
-      handleGesture: _this._handleGesture.bind(_assertThisInitialized(_this))
+      handleGesture: _this._handleGesture.bind(_assertThisInitialized(_this)),
+      handleRSAAESCredentialsRequired: _this._handleRSAAESCredentialsRequired.bind(_assertThisInitialized(_this)),
+      handleRSAAESServerVerification: _this._handleRSAAESServerVerification.bind(_assertThisInitialized(_this))
     }; // main setup
 
     Log.Debug(">> RFB.constructor"); // Create DOM elements
@@ -262,7 +289,9 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
     _this._decoders[_encodings.encodings.encodingRRE] = new _rre["default"]();
     _this._decoders[_encodings.encodings.encodingHextile] = new _hextile["default"]();
     _this._decoders[_encodings.encodings.encodingTight] = new _tight["default"]();
-    _this._decoders[_encodings.encodings.encodingTightPNG] = new _tightpng["default"](); // NB: nothing that needs explicit teardown should be done
+    _this._decoders[_encodings.encodings.encodingTightPNG] = new _tightpng["default"]();
+    _this._decoders[_encodings.encodings.encodingZRLE] = new _zrle["default"]();
+    _this._decoders[_encodings.encodings.encodingJPEG] = new _jpeg["default"](); // NB: nothing that needs explicit teardown should be done
     // before this point, since this can throw an exception
 
     try {
@@ -286,6 +315,8 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
 
     _this._sock.on('error', _this._socketError.bind(_assertThisInitialized(_this)));
 
+    _this._expectedClientWidth = null;
+    _this._expectedClientHeight = null;
     _this._resizeObserver = new ResizeObserver(_this._eventHandlers.handleResize); // All prepared, kick off the connection
 
     _this._updateConnectionState('connecting');
@@ -452,6 +483,17 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
       this._sock.off('message');
 
       this._sock.off('open');
+
+      if (this._rfbRSAAESAuthenticationState !== null) {
+        this._rfbRSAAESAuthenticationState.disconnect();
+      }
+    }
+  }, {
+    key: "approveServer",
+    value: function approveServer() {
+      if (this._rfbRSAAESAuthenticationState !== null) {
+        this._rfbRSAAESAuthenticationState.approveServer();
+      }
     }
   }, {
     key: "sendCredentials",
@@ -522,8 +564,8 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
     }
   }, {
     key: "focus",
-    value: function focus() {
-      this._canvas.focus();
+    value: function focus(options) {
+      this._canvas.focus(options);
     }
   }, {
     key: "blur",
@@ -746,7 +788,9 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
         return;
       }
 
-      this.focus();
+      this.focus({
+        preventScroll: true
+      });
     }
   }, {
     key: "_setDesktopName",
@@ -758,13 +802,39 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
         }
       }));
     }
+  }, {
+    key: "_saveExpectedClientSize",
+    value: function _saveExpectedClientSize() {
+      this._expectedClientWidth = this._screen.clientWidth;
+      this._expectedClientHeight = this._screen.clientHeight;
+    }
+  }, {
+    key: "_currentClientSize",
+    value: function _currentClientSize() {
+      return [this._screen.clientWidth, this._screen.clientHeight];
+    }
+  }, {
+    key: "_clientHasExpectedSize",
+    value: function _clientHasExpectedSize() {
+      var _this$_currentClientS = this._currentClientSize(),
+          _this$_currentClientS2 = _slicedToArray(_this$_currentClientS, 2),
+          currentWidth = _this$_currentClientS2[0],
+          currentHeight = _this$_currentClientS2[1];
+
+      return currentWidth == this._expectedClientWidth && currentHeight == this._expectedClientHeight;
+    }
   }, {
     key: "_handleResize",
     value: function _handleResize() {
       var _this2 = this;
 
-      // If the window resized then our screen element might have
+      // Don't change anything if the client size is already as expected
+      if (this._clientHasExpectedSize()) {
+        return;
+      } // If the window resized then our screen element might have
       // as well. Update the viewport dimensions.
+
+
       window.requestAnimationFrame(function () {
         _this2._updateClip();
 
@@ -805,6 +875,12 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
         this._display.viewportChangeSize(size.w, size.h);
 
         this._fixScrollbars();
+      } // When changing clipping we might show or hide scrollbars.
+      // This causes the expected client dimensions to change.
+
+
+      if (curClip !== newClip) {
+        this._saveExpectedClientSize();
       }
     }
   }, {
@@ -851,11 +927,12 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
   }, {
     key: "_fixScrollbars",
     value: function _fixScrollbars() {
-      // This is a hack because Chrome screws up the calculation
-      // for when scrollbars are needed. So to fix it we temporarily
-      // toggle them off and on.
+      // This is a hack because Safari on macOS screws up the calculation
+      // for when scrollbars are needed. We get scrollbars when making the
+      // browser smaller, despite remote resize being enabled. So to fix it
+      // we temporarily toggle them off and on.
       var orig = this._screen.style.overflow;
-      this._screen.style.overflow = 'hidden'; // Force Chrome to recalculate the layout by asking for
+      this._screen.style.overflow = 'hidden'; // Force Safari to recalculate the layout by asking for
       // an element's dimensions
 
       this._screen.getBoundingClientRect();
@@ -1503,10 +1580,8 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
           break;
 
         case "003.003":
-        case "003.006": // UltraVNC
-
-        case "003.889":
-          // Apple Remote Desktop
+        case "003.006":
+          // UltraVNC
           this._rfbVersion = 3.3;
           break;
 
@@ -1515,6 +1590,8 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
           break;
 
         case "003.008":
+        case "003.889": // Apple Remote Desktop
+
         case "004.000": // Intel AMT KVM
 
         case "004.001": // RealVNC 4.6
@@ -1579,8 +1656,12 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
           this._rfbAuthScheme = 22; // XVP
         } else if (types.includes(16)) {
           this._rfbAuthScheme = 16; // Tight
+        } else if (types.includes(6)) {
+          this._rfbAuthScheme = 6; // RA2ne Auth
         } else if (types.includes(2)) {
           this._rfbAuthScheme = 2; // VNC Auth
+        } else if (types.includes(30)) {
+          this._rfbAuthScheme = 30; // ARD Auth
         } else if (types.includes(19)) {
           this._rfbAuthScheme = 19; // VeNCrypt Auth
         } else {
@@ -1794,6 +1875,209 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
       this._rfbInitState = "SecurityResult";
       return true;
     }
+  }, {
+    key: "_negotiateARDAuth",
+    value: function _negotiateARDAuth() {
+      if (this._rfbCredentials.username === undefined || this._rfbCredentials.password === undefined) {
+        this.dispatchEvent(new CustomEvent("credentialsrequired", {
+          detail: {
+            types: ["username", "password"]
+          }
+        }));
+        return false;
+      }
+
+      if (this._rfbCredentials.ardPublicKey != undefined && this._rfbCredentials.ardCredentials != undefined) {
+        // if the async web crypto is done return the results
+        this._sock.send(this._rfbCredentials.ardCredentials);
+
+        this._sock.send(this._rfbCredentials.ardPublicKey);
+
+        this._rfbCredentials.ardCredentials = null;
+        this._rfbCredentials.ardPublicKey = null;
+        this._rfbInitState = "SecurityResult";
+        return true;
+      }
+
+      if (this._sock.rQwait("read ard", 4)) {
+        return false;
+      }
+
+      var generator = this._sock.rQshiftBytes(2); // DH base generator value
+
+
+      var keyLength = this._sock.rQshift16();
+
+      if (this._sock.rQwait("read ard keylength", keyLength * 2, 4)) {
+        return false;
+      } // read the server values
+
+
+      var prime = this._sock.rQshiftBytes(keyLength); // predetermined prime modulus
+
+
+      var serverPublicKey = this._sock.rQshiftBytes(keyLength); // other party's public key
+
+
+      var clientPrivateKey = window.crypto.getRandomValues(new Uint8Array(keyLength));
+      var padding = Array.from(window.crypto.getRandomValues(new Uint8Array(64)), function (_byte) {
+        return String.fromCharCode(65 + _byte % 26);
+      }).join('');
+
+      this._negotiateARDAuthAsync(generator, keyLength, prime, serverPublicKey, clientPrivateKey, padding);
+
+      return false;
+    }
+  }, {
+    key: "_modPow",
+    value: function _modPow(base, exponent, modulus) {
+      var baseHex = "0x" + Array.from(base, function (_byte2) {
+        return ('0' + (_byte2 & 0xFF).toString(16)).slice(-2);
+      }).join('');
+      var exponentHex = "0x" + Array.from(exponent, function (_byte3) {
+        return ('0' + (_byte3 & 0xFF).toString(16)).slice(-2);
+      }).join('');
+      var modulusHex = "0x" + Array.from(modulus, function (_byte4) {
+        return ('0' + (_byte4 & 0xFF).toString(16)).slice(-2);
+      }).join('');
+      var b = BigInt(baseHex);
+      var e = BigInt(exponentHex);
+      var m = BigInt(modulusHex);
+      var r = 1n;
+      b = b % m;
+
+      while (e > 0) {
+        if (e % 2n === 1n) {
+          r = r * b % m;
+        }
+
+        e = e / 2n;
+        b = b * b % m;
+      }
+
+      var hexResult = r.toString(16);
+
+      while (hexResult.length / 2 < exponent.length || hexResult.length % 2 != 0) {
+        hexResult = "0" + hexResult;
+      }
+
+      var bytesResult = [];
+
+      for (var c = 0; c < hexResult.length; c += 2) {
+        bytesResult.push(parseInt(hexResult.substr(c, 2), 16));
+      }
+
+      return bytesResult;
+    }
+  }, {
+    key: "_aesEcbEncrypt",
+    value: function () {
+      var _aesEcbEncrypt2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(string, key) {
+        var keyString, aesKey, data, i, encrypted, _i2, block, encryptedBlock;
+
+        return regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                // perform AES-ECB blocks
+                keyString = Array.from(key, function (_byte5) {
+                  return String.fromCharCode(_byte5);
+                }).join('');
+                _context.next = 3;
+                return window.crypto.subtle.importKey("raw", (0, _md.MD5)(keyString), {
+                  name: "AES-CBC"
+                }, false, ["encrypt"]);
+
+              case 3:
+                aesKey = _context.sent;
+                data = new Uint8Array(string.length);
+
+                for (i = 0; i < string.length; ++i) {
+                  data[i] = string.charCodeAt(i);
+                }
+
+                encrypted = new Uint8Array(data.length);
+                _i2 = 0;
+
+              case 8:
+                if (!(_i2 < data.length)) {
+                  _context.next = 17;
+                  break;
+                }
+
+                block = data.slice(_i2, _i2 + 16);
+                _context.next = 12;
+                return window.crypto.subtle.encrypt({
+                  name: "AES-CBC",
+                  iv: block
+                }, aesKey, new Uint8Array([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]));
+
+              case 12:
+                encryptedBlock = _context.sent;
+                encrypted.set(new Uint8Array(encryptedBlock).slice(0, 16), _i2);
+
+              case 14:
+                _i2 += 16;
+                _context.next = 8;
+                break;
+
+              case 17:
+                return _context.abrupt("return", encrypted);
+
+              case 18:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }));
+
+      function _aesEcbEncrypt(_x, _x2) {
+        return _aesEcbEncrypt2.apply(this, arguments);
+      }
+
+      return _aesEcbEncrypt;
+    }()
+  }, {
+    key: "_negotiateARDAuthAsync",
+    value: function () {
+      var _negotiateARDAuthAsync2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(generator, keyLength, prime, serverPublicKey, clientPrivateKey, padding) {
+        var clientPublicKey, sharedKey, username, password, paddedUsername, paddedPassword, credentials, encrypted;
+        return regeneratorRuntime.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                // calculate the DH keys
+                clientPublicKey = this._modPow(generator, clientPrivateKey, prime);
+                sharedKey = this._modPow(serverPublicKey, clientPrivateKey, prime);
+                username = (0, _strings.encodeUTF8)(this._rfbCredentials.username).substring(0, 63);
+                password = (0, _strings.encodeUTF8)(this._rfbCredentials.password).substring(0, 63);
+                paddedUsername = username + '\0' + padding.substring(0, 63);
+                paddedPassword = password + '\0' + padding.substring(0, 63);
+                credentials = paddedUsername.substring(0, 64) + paddedPassword.substring(0, 64);
+                _context2.next = 9;
+                return this._aesEcbEncrypt(credentials, sharedKey);
+
+              case 9:
+                encrypted = _context2.sent;
+                this._rfbCredentials.ardCredentials = encrypted;
+                this._rfbCredentials.ardPublicKey = clientPublicKey;
+                setTimeout(this._initMsg.bind(this), 0);
+
+              case 13:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2, this);
+      }));
+
+      function _negotiateARDAuthAsync(_x3, _x4, _x5, _x6, _x7, _x8) {
+        return _negotiateARDAuthAsync2.apply(this, arguments);
+      }
+
+      return _negotiateARDAuthAsync;
+    }()
   }, {
     key: "_negotiateTightUnixAuth",
     value: function _negotiateTightUnixAuth() {
@@ -1958,6 +2242,55 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
 
       return this._fail("No supported sub-auth types!");
     }
+  }, {
+    key: "_handleRSAAESCredentialsRequired",
+    value: function _handleRSAAESCredentialsRequired(event) {
+      this.dispatchEvent(event);
+    }
+  }, {
+    key: "_handleRSAAESServerVerification",
+    value: function _handleRSAAESServerVerification(event) {
+      this.dispatchEvent(event);
+    }
+  }, {
+    key: "_negotiateRA2neAuth",
+    value: function _negotiateRA2neAuth() {
+      var _this5 = this;
+
+      if (this._rfbRSAAESAuthenticationState === null) {
+        this._rfbRSAAESAuthenticationState = new _ra["default"](this._sock, function () {
+          return _this5._rfbCredentials;
+        });
+
+        this._rfbRSAAESAuthenticationState.addEventListener("serververification", this._eventHandlers.handleRSAAESServerVerification);
+
+        this._rfbRSAAESAuthenticationState.addEventListener("credentialsrequired", this._eventHandlers.handleRSAAESCredentialsRequired);
+      }
+
+      this._rfbRSAAESAuthenticationState.checkInternalEvents();
+
+      if (!this._rfbRSAAESAuthenticationState.hasStarted) {
+        this._rfbRSAAESAuthenticationState.negotiateRA2neAuthAsync()["catch"](function (e) {
+          if (e.message !== "disconnect normally") {
+            _this5._fail(e.message);
+          }
+        }).then(function () {
+          _this5.dispatchEvent(new CustomEvent('securityresult'));
+
+          _this5._rfbInitState = "SecurityResult";
+
+          _this5._initMsg();
+        })["finally"](function () {
+          _this5._rfbRSAAESAuthenticationState.removeEventListener("serververification", _this5._eventHandlers.handleRSAAESServerVerification);
+
+          _this5._rfbRSAAESAuthenticationState.removeEventListener("credentialsrequired", _this5._eventHandlers.handleRSAAESCredentialsRequired);
+
+          _this5._rfbRSAAESAuthenticationState = null;
+        });
+      }
+
+      return false;
+    }
   }, {
     key: "_negotiateAuthentication",
     value: function _negotiateAuthentication() {
@@ -1976,6 +2309,10 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
           // XVP auth
           return this._negotiateXvpAuth();
 
+        case 30:
+          // ARD auth
+          return this._negotiateARDAuth();
+
         case 2:
           // VNC authentication
           return this._negotiateStdVNCAuth();
@@ -1992,6 +2329,10 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
           // TightVNC UNIX Security Type
           return this._negotiateTightUnixAuth();
 
+        case 6:
+          // RA2ne Security Type
+          return this._negotiateRA2neAuth();
+
         default:
           return this._fail("Unsupported auth scheme (scheme: " + this._rfbAuthScheme + ")");
       }
@@ -2150,6 +2491,8 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
       if (this._fbDepth == 24) {
         encs.push(_encodings.encodings.encodingTight);
         encs.push(_encodings.encodings.encodingTightPNG);
+        encs.push(_encodings.encodings.encodingZRLE);
+        encs.push(_encodings.encodings.encodingJPEG);
         encs.push(_encodings.encodings.encodingHextile);
         encs.push(_encodings.encodings.encodingRRE);
       }
@@ -2282,8 +2625,8 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
           } // Update our server capabilities for Actions
 
 
-          for (var _i = 24; _i <= 31; _i++) {
-            var _index = 1 << _i;
+          for (var _i3 = 24; _i3 <= 31; _i3++) {
+            var _index = 1 << _i3;
 
             this._clipboardServerCapabilitiesActions[_index] = !!(actions & _index);
           }
@@ -2346,8 +2689,8 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
           var textData = null;
           streamInflator.setInput(zlibStream);
 
-          for (var _i2 = 0; _i2 <= 15; _i2++) {
-            var format = 1 << _i2;
+          for (var _i4 = 0; _i4 <= 15; _i4++) {
+            var format = 1 << _i4;
 
             if (formats & format) {
               var size = 0x00;
@@ -2369,8 +2712,8 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
           if (textData !== null) {
             var tmpText = "";
 
-            for (var _i3 = 0; _i3 < textData.length; _i3++) {
-              tmpText += String.fromCharCode(textData[_i3]);
+            for (var _i5 = 0; _i5 < textData.length; _i5++) {
+              tmpText += String.fromCharCode(textData[_i5]);
             }
 
             textData = tmpText;
@@ -2957,7 +3300,10 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
 
       this._updateScale();
 
-      this._updateContinuousUpdates();
+      this._updateContinuousUpdates(); // Keep this size until browser client size changes
+
+
+      this._saveExpectedClientSize();
     }
   }, {
     key: "_xvpOp",
@@ -3102,8 +3448,8 @@ RFB.messages = {
       actionFlag |= actions[i];
     }
 
-    for (var _i4 = 0; _i4 < formats.length; _i4++) {
-      formatFlag |= formats[_i4];
+    for (var _i6 = 0; _i6 < formats.length; _i6++) {
+      formatFlag |= formats[_i6];
     }
 
     data[0] = actionFlag >> 24; // Actions

package/lib/util/browser.js

@@ -1,16 +1,18 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isMac = isMac;
-exports.isWindows = isWindows;
+exports.hasScrollbarGutter = exports.dragThreshold = void 0;
+exports.isFirefox = isFirefox;
 exports.isIOS = isIOS;
+exports.isMac = isMac;
 exports.isSafari = isSafari;
-exports.isFirefox = isFirefox;
-exports.hasScrollbarGutter = exports.supportsCursorURIs = exports.dragThreshold = exports.isTouchDevice = void 0;
+exports.isTouchDevice = void 0;
+exports.isWindows = isWindows;
+exports.supportsCursorURIs = void 0;
 
 var Log = _interopRequireWildcard(require("./logging.js"));
 
@@ -28,7 +30,9 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
  * Browser feature support detection
  */
 // Touch detection
-var isTouchDevice = 'ontouchstart' in document.documentElement || document.ontouchstart !== undefined || navigator.maxTouchPoints > 0 || navigator.msMaxTouchPoints > 0;
+var isTouchDevice = 'ontouchstart' in document.documentElement || // requried for Chrome debugger
+document.ontouchstart !== undefined || // required for MS Surface
+navigator.maxTouchPoints > 0 || navigator.msMaxTouchPoints > 0;
 exports.isTouchDevice = isTouchDevice;
 window.addEventListener('touchstart', function onFirstTouch() {
   exports.isTouchDevice = isTouchDevice = true;

package/lib/util/cursor.js

@@ -11,7 +11,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
 var useFallback = !_browser.supportsCursorURIs || _browser.isTouchDevice;
 

package/lib/util/events.js

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getPointerEvent = getPointerEvent;
-exports.stopEvent = stopEvent;
-exports.setCapture = setCapture;
 exports.releaseCapture = releaseCapture;
+exports.setCapture = setCapture;
+exports.stopEvent = stopEvent;
 
 /*
  * noVNC: HTML5 VNC client

package/lib/util/eventtarget.js

@@ -9,7 +9,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
 /*
  * noVNC: HTML5 VNC client

package/lib/util/int.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.toUnsigned32bit = toUnsigned32bit;
 exports.toSigned32bit = toSigned32bit;
+exports.toUnsigned32bit = toUnsigned32bit;
 
 /*
  * noVNC: HTML5 VNC client