@novnc/novnc 1.2.0-test → 1.3.0-g1075cd8

package/lib/rfb.js

@@ -1,9 +1,11 @@
 "use strict";
 
+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.default = void 0;
+exports["default"] = void 0;
 
 var _int = require("./util/int.js");
 
@@ -41,7 +43,9 @@ var _xtscancodes = _interopRequireDefault(require("./input/xtscancodes.js"));
 
 var _encodings = require("./encodings.js");
 
-require("./util/polyfill.js");
+var _ra = _interopRequireDefault(require("./ra2.js"));
+
+var _md = require("./util/md5.js");
 
 var _raw = _interopRequireDefault(require("./decoders/raw.js"));
 
@@ -55,31 +59,49 @@ var _tight = _interopRequireDefault(require("./decoders/tight.js"));
 
 var _tightpng = _interopRequireDefault(require("./decoders/tightpng.js"));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+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 _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (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 _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 _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 _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); }
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
 
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
@@ -120,7 +142,7 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
 
   var _super = _createSuper(RFB);
 
-  function RFB(target, url, options) {
+  function RFB(target, urlOrChannel, options) {
     var _this;
 
     _classCallCheck(this, RFB);
@@ -129,13 +151,20 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
       throw new Error("Must specify target");
     }
 
-    if (!url) {
-      throw new Error("Must specify URL");
+    if (!urlOrChannel) {
+      throw new Error("Must specify URL, WebSocket or RTCDataChannel");
     }
 
     _this = _super.call(this);
     _this._target = target;
-    _this._url = url; // Connection details
+
+    if (typeof urlOrChannel === "string") {
+      _this._url = urlOrChannel;
+    } else {
+      _this._url = null;
+      _this._rawChannel = urlOrChannel;
+    } // Connection details
+
 
     options = options || {};
     _this._rfbCredentials = options.credentials || {};
@@ -146,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;
@@ -179,6 +209,8 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
     _this._keyboard = null; // Keyboard input handler object
 
     _this._gestures = null; // Gesture input handler object
+
+    _this._resizeObserver = null; // Resize observer object
     // Timers
 
     _this._disconnTimer = null; // disconnection timer
@@ -213,10 +245,12 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
 
     _this._eventHandlers = {
       focusCanvas: _this._focusCanvas.bind(_assertThisInitialized(_this)),
-      windowResize: _this._windowResize.bind(_assertThisInitialized(_this)),
+      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
@@ -230,9 +264,7 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
     _this._canvas = document.createElement('canvas');
     _this._canvas.style.margin = 'auto'; // Some browsers add an outline on focus
 
-    _this._canvas.style.outline = 'none'; // IE miscalculates width without this :(
-
-    _this._canvas.style.flexShrink = '0';
+    _this._canvas.style.outline = 'none';
     _this._canvas.width = 0;
     _this._canvas.height = 0;
     _this._canvas.tabIndex = -1;
@@ -240,7 +272,7 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
     _this._screen.appendChild(_this._canvas); // Cursor
 
 
-    _this._cursor = new _cursor.default(); // XXX: TightVNC 2.8.11 sends no cursor at all until Windows changes
+    _this._cursor = new _cursor["default"](); // XXX: TightVNC 2.8.11 sends no cursor at all until Windows changes
     // it. Result: no cursor at all until a window border or an edit field
     // is hit blindly. But there are also VNC servers that draw the cursor
     // in the framebuffer and don't send the empty local cursor. There is
@@ -252,95 +284,43 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
 
     _this._cursorImage = RFB.cursors.none; // populate decoder array with objects
 
-    _this._decoders[_encodings.encodings.encodingRaw] = new _raw.default();
-    _this._decoders[_encodings.encodings.encodingCopyRect] = new _copyrect.default();
-    _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.encodingRaw] = new _raw["default"]();
+    _this._decoders[_encodings.encodings.encodingCopyRect] = new _copyrect["default"]();
+    _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"]();
+    _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 {
-      _this._display = new _display.default(_this._canvas);
+      _this._display = new _display["default"](_this._canvas);
     } catch (exc) {
       Log.Error("Display exception: " + exc);
       throw exc;
     }
 
     _this._display.onflush = _this._onFlush.bind(_assertThisInitialized(_this));
-    _this._keyboard = new _keyboard.default(_this._canvas);
+    _this._keyboard = new _keyboard["default"](_this._canvas);
     _this._keyboard.onkeyevent = _this._handleKeyEvent.bind(_assertThisInitialized(_this));
-    _this._gestures = new _gesturehandler.default();
-    _this._sock = new _websock.default();
+    _this._gestures = new _gesturehandler["default"]();
+    _this._sock = new _websock["default"]();
 
-    _this._sock.on('message', function () {
-      _this._handleMessage();
-    });
-
-    _this._sock.on('open', function () {
-      if (_this._rfbConnectionState === 'connecting' && _this._rfbInitState === '') {
-        _this._rfbInitState = 'ProtocolVersion';
-        Log.Debug("Starting VNC handshake");
-      } else {
-        _this._fail("Unexpected server connection while " + _this._rfbConnectionState);
-      }
-    });
+    _this._sock.on('open', _this._socketOpen.bind(_assertThisInitialized(_this)));
 
-    _this._sock.on('close', function (e) {
-      Log.Debug("WebSocket on-close event");
-      var msg = "";
+    _this._sock.on('close', _this._socketClose.bind(_assertThisInitialized(_this)));
 
-      if (e.code) {
-        msg = "(code: " + e.code;
+    _this._sock.on('message', _this._handleMessage.bind(_assertThisInitialized(_this)));
 
-        if (e.reason) {
-          msg += ", reason: " + e.reason;
-        }
+    _this._sock.on('error', _this._socketError.bind(_assertThisInitialized(_this)));
 
-        msg += ")";
-      }
+    _this._expectedClientWidth = null;
+    _this._expectedClientHeight = null;
+    _this._resizeObserver = new ResizeObserver(_this._eventHandlers.handleResize); // All prepared, kick off the connection
 
-      switch (_this._rfbConnectionState) {
-        case 'connecting':
-          _this._fail("Connection closed " + msg);
+    _this._updateConnectionState('connecting');
 
-          break;
-
-        case 'connected':
-          // Handle disconnects that were initiated server-side
-          _this._updateConnectionState('disconnecting');
-
-          _this._updateConnectionState('disconnected');
-
-          break;
-
-        case 'disconnecting':
-          // Normal disconnection path
-          _this._updateConnectionState('disconnected');
-
-          break;
-
-        case 'disconnected':
-          _this._fail("Unexpected server disconnect " + "when already disconnected " + msg);
-
-          break;
-
-        default:
-          _this._fail("Unexpected server disconnect before connecting " + msg);
-
-          break;
-      }
-
-      _this._sock.off('close');
-    });
-
-    _this._sock.on('error', function (e) {
-      return Log.Warn("WebSocket on-error event");
-    }); // Slight delay of the actual connection so that the caller has
-    // time to set up callbacks
-
-
-    setTimeout(_this._updateConnectionState.bind(_assertThisInitialized(_this), 'connecting'));
     Log.Debug("<< RFB.constructor"); // ===== PROPERTIES =====
 
     _this.dragViewport = false;
@@ -363,8 +343,138 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
 
 
   _createClass(RFB, [{
+    key: "viewOnly",
+    get: function get() {
+      return this._viewOnly;
+    },
+    set: function set(viewOnly) {
+      this._viewOnly = viewOnly;
+
+      if (this._rfbConnectionState === "connecting" || this._rfbConnectionState === "connected") {
+        if (viewOnly) {
+          this._keyboard.ungrab();
+        } else {
+          this._keyboard.grab();
+        }
+      }
+    }
+  }, {
+    key: "capabilities",
+    get: function get() {
+      return this._capabilities;
+    }
+  }, {
+    key: "touchButton",
+    get: function get() {
+      return 0;
+    },
+    set: function set(button) {
+      Log.Warn("Using old API!");
+    }
+  }, {
+    key: "clipViewport",
+    get: function get() {
+      return this._clipViewport;
+    },
+    set: function set(viewport) {
+      this._clipViewport = viewport;
+
+      this._updateClip();
+    }
+  }, {
+    key: "scaleViewport",
+    get: function get() {
+      return this._scaleViewport;
+    },
+    set: function set(scale) {
+      this._scaleViewport = scale; // Scaling trumps clipping, so we may need to adjust
+      // clipping when enabling or disabling scaling
+
+      if (scale && this._clipViewport) {
+        this._updateClip();
+      }
+
+      this._updateScale();
+
+      if (!scale && this._clipViewport) {
+        this._updateClip();
+      }
+    }
+  }, {
+    key: "resizeSession",
+    get: function get() {
+      return this._resizeSession;
+    },
+    set: function set(resize) {
+      this._resizeSession = resize;
+
+      if (resize) {
+        this._requestRemoteResize();
+      }
+    }
+  }, {
+    key: "showDotCursor",
+    get: function get() {
+      return this._showDotCursor;
+    },
+    set: function set(show) {
+      this._showDotCursor = show;
+
+      this._refreshCursor();
+    }
+  }, {
+    key: "background",
+    get: function get() {
+      return this._screen.style.background;
+    },
+    set: function set(cssValue) {
+      this._screen.style.background = cssValue;
+    }
+  }, {
+    key: "qualityLevel",
+    get: function get() {
+      return this._qualityLevel;
+    },
+    set: function set(qualityLevel) {
+      if (!Number.isInteger(qualityLevel) || qualityLevel < 0 || qualityLevel > 9) {
+        Log.Error("qualityLevel must be an integer between 0 and 9");
+        return;
+      }
+
+      if (this._qualityLevel === qualityLevel) {
+        return;
+      }
+
+      this._qualityLevel = qualityLevel;
+
+      if (this._rfbConnectionState === 'connected') {
+        this._sendEncodings();
+      }
+    }
+  }, {
+    key: "compressionLevel",
+    get: function get() {
+      return this._compressionLevel;
+    },
+    set: function set(compressionLevel) {
+      if (!Number.isInteger(compressionLevel) || compressionLevel < 0 || compressionLevel > 9) {
+        Log.Error("compressionLevel must be an integer between 0 and 9");
+        return;
+      }
+
+      if (this._compressionLevel === compressionLevel) {
+        return;
+      }
+
+      this._compressionLevel = compressionLevel;
+
+      if (this._rfbConnectionState === 'connected') {
+        this._sendEncodings();
+      }
+    } // ===== PUBLIC METHODS =====
+
+  }, {
     key: "disconnect",
-    // ===== PUBLIC METHODS =====
     value: function disconnect() {
       this._updateConnectionState('disconnecting');
 
@@ -373,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",
@@ -388,12 +509,12 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
       }
 
       Log.Info("Sending Ctrl-Alt-Del");
-      this.sendKey(_keysym.default.XK_Control_L, "ControlLeft", true);
-      this.sendKey(_keysym.default.XK_Alt_L, "AltLeft", true);
-      this.sendKey(_keysym.default.XK_Delete, "Delete", true);
-      this.sendKey(_keysym.default.XK_Delete, "Delete", false);
-      this.sendKey(_keysym.default.XK_Alt_L, "AltLeft", false);
-      this.sendKey(_keysym.default.XK_Control_L, "ControlLeft", false);
+      this.sendKey(_keysym["default"].XK_Control_L, "ControlLeft", true);
+      this.sendKey(_keysym["default"].XK_Alt_L, "AltLeft", true);
+      this.sendKey(_keysym["default"].XK_Delete, "Delete", true);
+      this.sendKey(_keysym["default"].XK_Delete, "Delete", false);
+      this.sendKey(_keysym["default"].XK_Alt_L, "AltLeft", false);
+      this.sendKey(_keysym["default"].XK_Control_L, "ControlLeft", false);
     }
   }, {
     key: "machineShutdown",
@@ -425,7 +546,7 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
         return;
       }
 
-      var scancode = _xtscancodes.default[code];
+      var scancode = _xtscancodes["default"][code];
 
       if (this._qemuExtKeyEventSupported && scancode) {
         // 0 is NoSymbol
@@ -443,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",
@@ -477,16 +598,25 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
     key: "_connect",
     value: function _connect() {
       Log.Debug(">> RFB.connect");
-      Log.Info("connecting to " + this._url);
 
-      try {
-        // WebSocket.onopen transitions to the RFB init states
+      if (this._url) {
+        Log.Info("connecting to ".concat(this._url));
+
         this._sock.open(this._url, this._wsProtocols);
-      } catch (e) {
-        if (e.name === 'SyntaxError') {
-          this._fail("Invalid host or port (" + e + ")");
-        } else {
-          this._fail("Error when opening socket (" + e + ")");
+      } else {
+        Log.Info("attaching ".concat(this._rawChannel, " to Websock"));
+
+        this._sock.attach(this._rawChannel);
+
+        if (this._sock.readyState === 'closed') {
+          throw Error("Cannot use already closed WebSocket/RTCDataChannel");
+        }
+
+        if (this._sock.readyState === 'open') {
+          // FIXME: _socketOpen() can in theory call _fail(), which
+          //        isn't allowed this early, but I'm not sure that can
+          //        happen without a bug messing up our state variables
+          this._socketOpen();
         }
       } // Make our elements part of the page
 
@@ -497,11 +627,11 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
 
       this._cursor.attach(this._canvas);
 
-      this._refreshCursor(); // Monitor size changes of the screen
-      // FIXME: Use ResizeObserver, or hidden overflow
+      this._refreshCursor(); // Monitor size changes of the screen element
+
 
+      this._resizeObserver.observe(this._screen); // Always grab focus on some kind of click event
 
-      window.addEventListener('resize', this._eventHandlers.windowResize); // Always grab focus on some kind of click event
 
       this._canvas.addEventListener("mousedown", this._eventHandlers.focusCanvas);
 
@@ -562,7 +692,7 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
 
       this._canvas.removeEventListener("touchstart", this._eventHandlers.focusCanvas);
 
-      window.removeEventListener('resize', this._eventHandlers.windowResize);
+      this._resizeObserver.disconnect();
 
       this._keyboard.ungrab();
 
@@ -584,6 +714,73 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
       clearTimeout(this._mouseMoveTimer);
       Log.Debug("<< RFB.disconnect");
     }
+  }, {
+    key: "_socketOpen",
+    value: function _socketOpen() {
+      if (this._rfbConnectionState === 'connecting' && this._rfbInitState === '') {
+        this._rfbInitState = 'ProtocolVersion';
+        Log.Debug("Starting VNC handshake");
+      } else {
+        this._fail("Unexpected server connection while " + this._rfbConnectionState);
+      }
+    }
+  }, {
+    key: "_socketClose",
+    value: function _socketClose(e) {
+      Log.Debug("WebSocket on-close event");
+      var msg = "";
+
+      if (e.code) {
+        msg = "(code: " + e.code;
+
+        if (e.reason) {
+          msg += ", reason: " + e.reason;
+        }
+
+        msg += ")";
+      }
+
+      switch (this._rfbConnectionState) {
+        case 'connecting':
+          this._fail("Connection closed " + msg);
+
+          break;
+
+        case 'connected':
+          // Handle disconnects that were initiated server-side
+          this._updateConnectionState('disconnecting');
+
+          this._updateConnectionState('disconnected');
+
+          break;
+
+        case 'disconnecting':
+          // Normal disconnection path
+          this._updateConnectionState('disconnected');
+
+          break;
+
+        case 'disconnected':
+          this._fail("Unexpected server disconnect " + "when already disconnected " + msg);
+
+          break;
+
+        default:
+          this._fail("Unexpected server disconnect before connecting " + msg);
+
+          break;
+      }
+
+      this._sock.off('close'); // Delete reference to raw channel to allow cleanup.
+
+
+      this._rawChannel = null;
+    }
+  }, {
+    key: "_socketError",
+    value: function _socketError(e) {
+      Log.Warn("WebSocket on-error event");
+    }
   }, {
     key: "_focusCanvas",
     value: function _focusCanvas(event) {
@@ -591,7 +788,9 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
         return;
       }
 
-      this.focus();
+      this.focus({
+        preventScroll: true
+      });
     }
   }, {
     key: "_setDesktopName",
@@ -604,12 +803,38 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
       }));
     }
   }, {
-    key: "_windowResize",
-    value: function _windowResize(event) {
+    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();
 
@@ -650,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();
       }
     }
   }, {
@@ -696,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();
@@ -1275,7 +1507,7 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
               magnitude = Math.hypot(ev.detail.magnitudeX, ev.detail.magnitudeY);
 
               if (Math.abs(magnitude - this._gestureLastMagnitudeX) > GESTURE_ZOOMSENS) {
-                this._handleKeyEvent(_keysym.default.XK_Control_L, "ControlLeft", true);
+                this._handleKeyEvent(_keysym["default"].XK_Control_L, "ControlLeft", true);
 
                 while (magnitude - this._gestureLastMagnitudeX > GESTURE_ZOOMSENS) {
                   this._handleMouseButton(pos.x, pos.y, true, 0x8);
@@ -1294,7 +1526,7 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
                 }
               }
 
-              this._handleKeyEvent(_keysym.default.XK_Control_L, "ControlLeft", false);
+              this._handleKeyEvent(_keysym["default"].XK_Control_L, "ControlLeft", false);
 
               break;
           }
@@ -1348,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;
 
@@ -1360,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
@@ -1399,18 +1631,6 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
   }, {
     key: "_negotiateSecurity",
     value: function _negotiateSecurity() {
-      // Polyfill since IE and PhantomJS doesn't have
-      // TypedArray.includes()
-      function includes(item, array) {
-        for (var i = 0; i < array.length; i++) {
-          if (array[i] === item) {
-            return true;
-          }
-        }
-
-        return false;
-      }
-
       if (this._rfbVersion >= 3.7) {
         // Server sends supported list, client decides
         var numTypes = this._sock.rQshift8();
@@ -1430,15 +1650,19 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
 
         Log.Debug("Server security types: " + types); // Look for each auth in preferred order
 
-        if (includes(1, types)) {
+        if (types.includes(1)) {
           this._rfbAuthScheme = 1; // None
-        } else if (includes(22, types)) {
+        } else if (types.includes(22)) {
           this._rfbAuthScheme = 22; // XVP
-        } else if (includes(16, types)) {
+        } else if (types.includes(16)) {
           this._rfbAuthScheme = 16; // Tight
-        } else if (includes(2, types)) {
+        } else if (types.includes(6)) {
+          this._rfbAuthScheme = 6; // RA2ne Auth
+        } else if (types.includes(2)) {
           this._rfbAuthScheme = 2; // VNC Auth
-        } else if (includes(19, types)) {
+        } else if (types.includes(30)) {
+          this._rfbAuthScheme = 30; // ARD Auth
+        } else if (types.includes(19)) {
           this._rfbAuthScheme = 19; // VeNCrypt Auth
         } else {
           return this._fail("Unsupported security types (types: " + types + ")");
@@ -1602,7 +1826,7 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
 
 
       if (this._rfbVeNCryptState == 4) {
-        if (!this._rfbCredentials.username || !this._rfbCredentials.password) {
+        if (this._rfbCredentials.username === undefined || this._rfbCredentials.password === undefined) {
           this.dispatchEvent(new CustomEvent("credentialsrequired", {
             detail: {
               types: ["username", "password"]
@@ -1612,11 +1836,11 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
         }
 
         var user = (0, _strings.encodeUTF8)(this._rfbCredentials.username);
-        var pass = (0, _strings.encodeUTF8)(this._rfbCredentials.password); // XXX we assume lengths are <= 255 (should not be an issue in the real world)
+        var pass = (0, _strings.encodeUTF8)(this._rfbCredentials.password);
 
-        this._sock.send([0, 0, 0, user.length]);
+        this._sock.send([user.length >> 24 & 0xFF, user.length >> 16 & 0xFF, user.length >> 8 & 0xFF, user.length & 0xFF]);
 
-        this._sock.send([0, 0, 0, pass.length]);
+        this._sock.send([pass.length >> 24 & 0xFF, pass.length >> 16 & 0xFF, pass.length >> 8 & 0xFF, pass.length & 0xFF]);
 
         this._sock.sendString(user);
 
@@ -1651,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() {
@@ -1815,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() {
@@ -1833,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();
@@ -1849,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 + ")");
       }
@@ -2007,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);
       }
@@ -2139,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);
           }
@@ -2199,12 +2685,12 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
 
           var zlibStream = this._sock.rQshiftBytes(length - 4);
 
-          var streamInflator = new _inflator.default();
+          var streamInflator = new _inflator["default"]();
           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;
@@ -2226,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;
@@ -2486,16 +2972,7 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
           return this._handleCursor();
 
         case _encodings.encodings.pseudoEncodingQEMUExtendedKeyEvent:
-          // Old Safari doesn't support creating keyboard events
-          try {
-            var keyboardEvent = document.createEvent("keyboardEvent");
-
-            if (keyboardEvent.code !== undefined) {
-              this._qemuExtKeyEventSupported = true;
-            }
-          } catch (err) {// Do nothing
-          }
-
+          this._qemuExtKeyEventSupported = true;
           return true;
 
         case _encodings.encodings.pseudoEncodingDesktopName:
@@ -2823,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",
@@ -2882,151 +3362,21 @@ var RFB = /*#__PURE__*/function (_EventTargetMixin) {
 
       this._cursor.change(image.rgbaPixels, image.hotx, image.hoty, image.w, image.h);
     }
-  }, {
-    key: "viewOnly",
-    get: function get() {
-      return this._viewOnly;
-    },
-    set: function set(viewOnly) {
-      this._viewOnly = viewOnly;
-
-      if (this._rfbConnectionState === "connecting" || this._rfbConnectionState === "connected") {
-        if (viewOnly) {
-          this._keyboard.ungrab();
-        } else {
-          this._keyboard.grab();
-        }
-      }
-    }
-  }, {
-    key: "capabilities",
-    get: function get() {
-      return this._capabilities;
-    }
-  }, {
-    key: "touchButton",
-    get: function get() {
-      return 0;
-    },
-    set: function set(button) {
-      Log.Warn("Using old API!");
-    }
-  }, {
-    key: "clipViewport",
-    get: function get() {
-      return this._clipViewport;
-    },
-    set: function set(viewport) {
-      this._clipViewport = viewport;
-
-      this._updateClip();
-    }
-  }, {
-    key: "scaleViewport",
-    get: function get() {
-      return this._scaleViewport;
-    },
-    set: function set(scale) {
-      this._scaleViewport = scale; // Scaling trumps clipping, so we may need to adjust
-      // clipping when enabling or disabling scaling
-
-      if (scale && this._clipViewport) {
-        this._updateClip();
-      }
-
-      this._updateScale();
-
-      if (!scale && this._clipViewport) {
-        this._updateClip();
-      }
-    }
-  }, {
-    key: "resizeSession",
-    get: function get() {
-      return this._resizeSession;
-    },
-    set: function set(resize) {
-      this._resizeSession = resize;
-
-      if (resize) {
-        this._requestRemoteResize();
-      }
-    }
-  }, {
-    key: "showDotCursor",
-    get: function get() {
-      return this._showDotCursor;
-    },
-    set: function set(show) {
-      this._showDotCursor = show;
-
-      this._refreshCursor();
-    }
-  }, {
-    key: "background",
-    get: function get() {
-      return this._screen.style.background;
-    },
-    set: function set(cssValue) {
-      this._screen.style.background = cssValue;
-    }
-  }, {
-    key: "qualityLevel",
-    get: function get() {
-      return this._qualityLevel;
-    },
-    set: function set(qualityLevel) {
-      if (!Number.isInteger(qualityLevel) || qualityLevel < 0 || qualityLevel > 9) {
-        Log.Error("qualityLevel must be an integer between 0 and 9");
-        return;
-      }
-
-      if (this._qualityLevel === qualityLevel) {
-        return;
-      }
-
-      this._qualityLevel = qualityLevel;
-
-      if (this._rfbConnectionState === 'connected') {
-        this._sendEncodings();
-      }
-    }
-  }, {
-    key: "compressionLevel",
-    get: function get() {
-      return this._compressionLevel;
-    },
-    set: function set(compressionLevel) {
-      if (!Number.isInteger(compressionLevel) || compressionLevel < 0 || compressionLevel > 9) {
-        Log.Error("compressionLevel must be an integer between 0 and 9");
-        return;
-      }
-
-      if (this._compressionLevel === compressionLevel) {
-        return;
-      }
-
-      this._compressionLevel = compressionLevel;
-
-      if (this._rfbConnectionState === 'connected') {
-        this._sendEncodings();
-      }
-    }
   }], [{
     key: "genDES",
     value: function genDES(password, challenge) {
       var passwordChars = password.split('').map(function (c) {
         return c.charCodeAt(0);
       });
-      return new _des.default(passwordChars).encrypt(challenge);
+      return new _des["default"](passwordChars).encrypt(challenge);
     }
   }]);
 
   return RFB;
-}(_eventtarget.default); // Class Methods
+}(_eventtarget["default"]); // Class Methods
 
 
-exports.default = RFB;
+exports["default"] = RFB;
 RFB.messages = {
   keyEvent: function keyEvent(sock, keysym, down) {
     var buff = sock._sQ;
@@ -3098,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
@@ -3114,7 +3464,7 @@ RFB.messages = {
   },
   extendedClipboardProvide: function extendedClipboardProvide(sock, formats, inData) {
     // Deflate incomming data and their sizes
-    var deflator = new _deflator.default();
+    var deflator = new _deflator["default"]();
     var dataToDeflate = [];
 
     for (var i = 0; i < formats.length; i++) {
@@ -3350,11 +3700,11 @@ RFB.messages = {
 
     buff[offset + 13] = (1 << bits) - 1; // blue-max
 
-    buff[offset + 14] = bits * 2; // red-shift
+    buff[offset + 14] = bits * 0; // red-shift
 
     buff[offset + 15] = bits * 1; // green-shift
 
-    buff[offset + 16] = bits * 0; // blue-shift
+    buff[offset + 16] = bits * 2; // blue-shift
 
     buff[offset + 17] = 0; // padding