@novnc/novnc 1.2.0-test → 1.3.0-g7ad4e60

package/core/util/browser.js

@@ -45,15 +45,6 @@ try {
 
 export const supportsCursorURIs = _supportsCursorURIs;
 
-let _supportsImageMetadata = false;
-try {
-    new ImageData(new Uint8ClampedArray(4), 1, 1);
-    _supportsImageMetadata = true;
-} catch (ex) {
-    // ignore failure
-}
-export const supportsImageMetadata = _supportsImageMetadata;
-
 let _hasScrollbarGutter = true;
 try {
     // Create invisible container
@@ -106,14 +97,6 @@ export function isSafari() {
                          navigator.userAgent.indexOf('Chrome') === -1);
 }
 
-export function isIE() {
-    return navigator && !!(/trident/i).exec(navigator.userAgent);
-}
-
-export function isEdge() {
-    return navigator && !!(/edge/i).exec(navigator.userAgent);
-}
-
 export function isFirefox() {
     return navigator && !!(/firefox/i).exec(navigator.userAgent);
 }

package/core/util/cursor.js

@@ -43,9 +43,6 @@ export default class Cursor {
         if (useFallback) {
             document.body.appendChild(this._canvas);
 
-            // FIXME: These don't fire properly except for mouse
-            ///       movement in IE. We want to also capture element
-            //        movement, size changes, visibility, etc.
             const options = { capture: true, passive: true };
             this._target.addEventListener('mouseover', this._eventHandlers.mouseover, options);
             this._target.addEventListener('mouseleave', this._eventHandlers.mouseleave, options);
@@ -90,14 +87,7 @@ export default class Cursor {
         this._canvas.width = w;
         this._canvas.height = h;
 
-        let img;
-        try {
-            // IE doesn't support this
-            img = new ImageData(new Uint8ClampedArray(rgba), w, h);
-        } catch (ex) {
-            img = ctx.createImageData(w, h);
-            img.data.set(new Uint8ClampedArray(rgba));
-        }
+        let img = new ImageData(new Uint8ClampedArray(rgba), w, h);
         ctx.clearRect(0, 0, w, h);
         ctx.putImageData(img, 0, 0);
 

package/core/util/events.js

@@ -65,10 +65,6 @@ export function setCapture(target) {
 
         target.setCapture();
         document.captureElement = target;
-
-        // IE releases capture on 'click' events which might not trigger
-        target.addEventListener('mouseup', releaseCapture);
-
     } else {
         // Release any existing capture in case this method is
         // called multiple times without coordination

package/core/websock.js

@@ -1,10 +1,10 @@
 /*
- * Websock: high-performance binary WebSockets
+ * Websock: high-performance buffering wrapper
  * Copyright (C) 2019 The noVNC Authors
  * Licensed under MPL 2.0 (see LICENSE.txt)
  *
- * Websock is similar to the standard WebSocket object but with extra
- * buffer handling.
+ * Websock is similar to the standard WebSocket / RTCDataChannel object
+ * but with extra buffer handling.
  *
  * Websock has built-in receive queue buffering; the message event
  * does not contain actual data but is simply a notification that
@@ -17,14 +17,39 @@ import * as Log from './util/logging.js';
 // this has performance issues in some versions Chromium, and
 // doesn't gain a tremendous amount of performance increase in Firefox
 // at the moment.  It may be valuable to turn it on in the future.
-// Also copyWithin() for TypedArrays is not supported in IE 11 or
-// Safari 13 (at the moment we want to support Safari 11).
-const ENABLE_COPYWITHIN = false;
 const MAX_RQ_GROW_SIZE = 40 * 1024 * 1024;  // 40 MiB
 
+// Constants pulled from RTCDataChannelState enum
+// https://developer.mozilla.org/en-US/docs/Web/API/RTCDataChannel/readyState#RTCDataChannelState_enum
+const DataChannel = {
+    CONNECTING: "connecting",
+    OPEN: "open",
+    CLOSING: "closing",
+    CLOSED: "closed"
+};
+
+const ReadyStates = {
+    CONNECTING: [WebSocket.CONNECTING, DataChannel.CONNECTING],
+    OPEN: [WebSocket.OPEN, DataChannel.OPEN],
+    CLOSING: [WebSocket.CLOSING, DataChannel.CLOSING],
+    CLOSED: [WebSocket.CLOSED, DataChannel.CLOSED],
+};
+
+// Properties a raw channel must have, WebSocket and RTCDataChannel are two examples
+const rawChannelProps = [
+    "send",
+    "close",
+    "binaryType",
+    "onerror",
+    "onmessage",
+    "onopen",
+    "protocol",
+    "readyState",
+];
+
 export default class Websock {
     constructor() {
-        this._websocket = null;  // WebSocket object
+        this._websocket = null;  // WebSocket or RTCDataChannel object
 
         this._rQi = 0;           // Receive queue index
         this._rQlen = 0;         // Next write position in the receive queue
@@ -46,6 +71,29 @@ export default class Websock {
     }
 
     // Getters and Setters
+
+    get readyState() {
+        let subState;
+
+        if (this._websocket === null) {
+            return "unused";
+        }
+
+        subState = this._websocket.readyState;
+
+        if (ReadyStates.CONNECTING.includes(subState)) {
+            return "connecting";
+        } else if (ReadyStates.OPEN.includes(subState)) {
+            return "open";
+        } else if (ReadyStates.CLOSING.includes(subState)) {
+            return "closing";
+        } else if (ReadyStates.CLOSED.includes(subState)) {
+            return "closed";
+        }
+
+        return "unknown";
+    }
+
     get sQ() {
         return this._sQ;
     }
@@ -143,7 +191,7 @@ export default class Websock {
     // Send Queue
 
     flush() {
-        if (this._sQlen > 0 && this._websocket.readyState === WebSocket.OPEN) {
+        if (this._sQlen > 0 && this.readyState === 'open') {
             this._websocket.send(this._encodeMessage());
             this._sQlen = 0;
         }
@@ -180,12 +228,25 @@ export default class Websock {
     }
 
     open(uri, protocols) {
+        this.attach(new WebSocket(uri, protocols));
+    }
+
+    attach(rawChannel) {
         this.init();
 
-        this._websocket = new WebSocket(uri, protocols);
-        this._websocket.binaryType = 'arraybuffer';
+        // Must get object and class methods to be compatible with the tests.
+        const channelProps = [...Object.keys(rawChannel), ...Object.getOwnPropertyNames(Object.getPrototypeOf(rawChannel))];
+        for (let i = 0; i < rawChannelProps.length; i++) {
+            const prop = rawChannelProps[i];
+            if (channelProps.indexOf(prop) < 0) {
+                throw new Error('Raw channel missing property: ' + prop);
+            }
+        }
 
+        this._websocket = rawChannel;
+        this._websocket.binaryType = "arraybuffer";
         this._websocket.onmessage = this._recvMessage.bind(this);
+
         this._websocket.onopen = () => {
             Log.Debug('>> WebSock.onopen');
             if (this._websocket.protocol) {
@@ -195,11 +256,13 @@ export default class Websock {
             this._eventHandlers.open();
             Log.Debug("<< WebSock.onopen");
         };
+
         this._websocket.onclose = (e) => {
             Log.Debug(">> WebSock.onclose");
             this._eventHandlers.close(e);
             Log.Debug("<< WebSock.onclose");
         };
+
         this._websocket.onerror = (e) => {
             Log.Debug(">> WebSock.onerror: " + e);
             this._eventHandlers.error(e);
@@ -209,8 +272,8 @@ export default class Websock {
 
     close() {
         if (this._websocket) {
-            if ((this._websocket.readyState === WebSocket.OPEN) ||
-                    (this._websocket.readyState === WebSocket.CONNECTING)) {
+            if (this.readyState === 'connecting' ||
+                this.readyState === 'open') {
                 Log.Info("Closing WebSocket connection");
                 this._websocket.close();
             }
@@ -256,11 +319,7 @@ export default class Websock {
             this._rQ = new Uint8Array(this._rQbufferSize);
             this._rQ.set(new Uint8Array(oldRQbuffer, this._rQi, this._rQlen - this._rQi));
         } else {
-            if (ENABLE_COPYWITHIN) {
-                this._rQ.copyWithin(0, this._rQi, this._rQlen);
-            } else {
-                this._rQ.set(new Uint8Array(this._rQ.buffer, this._rQi, this._rQlen - this._rQi));
-            }
+            this._rQ.copyWithin(0, this._rQi, this._rQlen);
         }
 
         this._rQlen = this._rQlen - this._rQi;

package/docs/API.md

@@ -165,9 +165,9 @@ connection to a specified VNC server.
     existing contents of the `HTMLElement` will be untouched, but new
     elements will be added during the lifetime of the `RFB` object.
 
-**`url`**
+**`urlOrDataChannel`**
   - A `DOMString` specifying the VNC server to connect to. This must be
-    a valid WebSocket URL.
+    a valid WebSocket URL. This can also be a `WebSocket` or `RTCDataChannel`.
 
 **`options`** *Optional*
   - An `Object` specifying extra details about how the connection
@@ -328,7 +328,14 @@ Keyboard events will be sent to the remote server after this point.
 
 ##### Syntax
 
-    RFB.focus( );
+    RFB.focus( [options] );
+
+###### Parameters
+
+**`options`** *Optional*
+  - A `object` providing options to control how the focus will be
+    performed. Please see [`HTMLElement.focus()`](https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/focus)
+    for available options.
 
 #### RFB.blur()
 

package/docs/LIBRARY.md

@@ -18,18 +18,14 @@ do things.
 
 ## Conversion of Modules
 
-noVNC is written using ECMAScript 6 modules. Many of the major browsers support
-these modules natively, but not all. They are also not supported by Node.js. To
-use noVNC in these places the library must first be converted.
+noVNC is written using ECMAScript 6 modules. This is not supported by older
+versions of Node.js. To use noVNC with those older versions of Node.js the
+library must first be converted.
 
 Fortunately noVNC includes a script to handle this conversion. Please follow
 the following steps:
 
  1. Install Node.js
  2. Run `npm install` in the noVNC directory
- 3. Run `./utils/use_require.js --as <module format>`
-
-Several module formats are available. Please run
-`./utils/use_require.js --help` to see them all.
 
 The result of the conversion is available in the `lib/` directory.

package/lib/base64.js

@@ -5,13 +5,13 @@ function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "functi
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports["default"] = void 0;
 
 var Log = _interopRequireWildcard(require("./util/logging.js"));
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
+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) { 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 _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; }
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -112,4 +112,4 @@ var _default = {
 };
 /* End of Base64 namespace */
 
-exports.default = _default;
+exports["default"] = _default;

package/lib/decoders/copyrect.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports["default"] = void 0;
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
@@ -33,6 +33,11 @@ var CopyRectDecoder = /*#__PURE__*/function () {
 
       var deltaX = sock.rQshift16();
       var deltaY = sock.rQshift16();
+
+      if (width === 0 || height === 0) {
+        return true;
+      }
+
       display.copyImage(deltaX, deltaY, x, y, width, height);
       return true;
     }
@@ -41,4 +46,4 @@ var CopyRectDecoder = /*#__PURE__*/function () {
   return CopyRectDecoder;
 }();
 
-exports.default = CopyRectDecoder;
+exports["default"] = CopyRectDecoder;

package/lib/decoders/hextile.js

@@ -5,13 +5,13 @@ function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "functi
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports["default"] = void 0;
 
 var Log = _interopRequireWildcard(require("../util/logging.js"));
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
+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) { 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 _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 _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
@@ -25,6 +25,7 @@ var HextileDecoder = /*#__PURE__*/function () {
 
     this._tiles = 0;
     this._lastsubencoding = 0;
+    this._tileBuffer = new Uint8Array(16 * 16 * 4);
   }
 
   _createClass(HextileDecoder, [{
@@ -110,6 +111,12 @@ var HextileDecoder = /*#__PURE__*/function () {
           }
         } else if (subencoding & 0x01) {
           // Raw
+          var pixels = tw * th; // Max sure the image is fully opaque
+
+          for (var i = 0; i < pixels; i++) {
+            rQ[rQi + i * 4 + 3] = 255;
+          }
+
           display.blitImage(tx, ty, tw, th, rQ, rQi);
           rQi += bytes - 1;
         } else {
@@ -125,7 +132,7 @@ var HextileDecoder = /*#__PURE__*/function () {
             rQi += 4;
           }
 
-          display.startTile(tx, ty, tw, th, this._background);
+          this._startTile(tx, ty, tw, th, this._background);
 
           if (subencoding & 0x08) {
             // AnySubrects
@@ -151,11 +158,12 @@ var HextileDecoder = /*#__PURE__*/function () {
               rQi++;
               var sw = (wh >> 4) + 1;
               var sh = (wh & 0x0f) + 1;
-              display.subTile(sx, sy, sw, sh, color);
+
+              this._subTile(sx, sy, sw, sh, color);
             }
           }
 
-          display.finishTile();
+          this._finishTile(display);
         }
 
         sock.rQi = rQi;
@@ -164,10 +172,58 @@ var HextileDecoder = /*#__PURE__*/function () {
       }
 
       return true;
+    } // start updating a tile
+
+  }, {
+    key: "_startTile",
+    value: function _startTile(x, y, width, height, color) {
+      this._tileX = x;
+      this._tileY = y;
+      this._tileW = width;
+      this._tileH = height;
+      var red = color[0];
+      var green = color[1];
+      var blue = color[2];
+      var data = this._tileBuffer;
+
+      for (var i = 0; i < width * height * 4; i += 4) {
+        data[i] = red;
+        data[i + 1] = green;
+        data[i + 2] = blue;
+        data[i + 3] = 255;
+      }
+    } // update sub-rectangle of the current tile
+
+  }, {
+    key: "_subTile",
+    value: function _subTile(x, y, w, h, color) {
+      var red = color[0];
+      var green = color[1];
+      var blue = color[2];
+      var xend = x + w;
+      var yend = y + h;
+      var data = this._tileBuffer;
+      var width = this._tileW;
+
+      for (var j = y; j < yend; j++) {
+        for (var i = x; i < xend; i++) {
+          var p = (i + j * width) * 4;
+          data[p] = red;
+          data[p + 1] = green;
+          data[p + 2] = blue;
+          data[p + 3] = 255;
+        }
+      }
+    } // draw the current tile to the screen
+
+  }, {
+    key: "_finishTile",
+    value: function _finishTile(display) {
+      display.blitImage(this._tileX, this._tileY, this._tileW, this._tileH, this._tileBuffer, 0);
     }
   }]);
 
   return HextileDecoder;
 }();
 
-exports.default = HextileDecoder;
+exports["default"] = HextileDecoder;

package/lib/decoders/raw.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports["default"] = void 0;
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
@@ -29,6 +29,10 @@ var RawDecoder = /*#__PURE__*/function () {
   _createClass(RawDecoder, [{
     key: "decodeRect",
     value: function decodeRect(x, y, width, height, sock, display, depth) {
+      if (width === 0 || height === 0) {
+        return true;
+      }
+
       if (this._lines === 0) {
         this._lines = height;
       }
@@ -42,22 +46,27 @@ var RawDecoder = /*#__PURE__*/function () {
 
       var curY = y + (height - this._lines);
       var currHeight = Math.min(this._lines, Math.floor(sock.rQlen / bytesPerLine));
+      var pixels = width * currHeight;
       var data = sock.rQ;
       var index = sock.rQi; // Convert data if needed
 
       if (depth == 8) {
-        var pixels = width * currHeight;
         var newdata = new Uint8Array(pixels * 4);
 
         for (var i = 0; i < pixels; i++) {
           newdata[i * 4 + 0] = (data[index + i] >> 0 & 0x3) * 255 / 3;
           newdata[i * 4 + 1] = (data[index + i] >> 2 & 0x3) * 255 / 3;
           newdata[i * 4 + 2] = (data[index + i] >> 4 & 0x3) * 255 / 3;
-          newdata[i * 4 + 4] = 0;
+          newdata[i * 4 + 3] = 255;
         }
 
         data = newdata;
         index = 0;
+      } // Max sure the image is fully opaque
+
+
+      for (var _i = 0; _i < pixels; _i++) {
+        data[_i * 4 + 3] = 255;
       }
 
       display.blitImage(x, curY, width, currHeight, data, index);
@@ -75,4 +84,4 @@ var RawDecoder = /*#__PURE__*/function () {
   return RawDecoder;
 }();
 
-exports.default = RawDecoder;
+exports["default"] = RawDecoder;

package/lib/decoders/rre.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports["default"] = void 0;
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
@@ -62,4 +62,4 @@ var RREDecoder = /*#__PURE__*/function () {
   return RREDecoder;
 }();
 
-exports.default = RREDecoder;
+exports["default"] = RREDecoder;

package/lib/decoders/tight.js

@@ -5,17 +5,17 @@ function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "functi
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports["default"] = void 0;
 
 var Log = _interopRequireWildcard(require("../util/logging.js"));
 
 var _inflator = _interopRequireDefault(require("../inflator.js"));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
+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) { 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 _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 _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
@@ -36,7 +36,7 @@ var TightDecoder = /*#__PURE__*/function () {
     this._zlibs = [];
 
     for (var i = 0; i < 4; i++) {
-      this._zlibs[i] = new _inflator.default();
+      this._zlibs[i] = new _inflator["default"]();
     }
   }
 
@@ -70,7 +70,7 @@ var TightDecoder = /*#__PURE__*/function () {
         ret = this._jpegRect(x, y, width, height, sock, display, depth);
       } else if (this._ctl === 0x0A) {
         ret = this._pngRect(x, y, width, height, sock, display, depth);
-      } else if ((this._ctl & 0x80) == 0) {
+      } else if ((this._ctl & 0x08) == 0) {
         ret = this._basicRect(this._ctl, x, y, width, height, sock, display, depth);
       } else {
         throw new Error("Illegal tight compression received (ctl: " + this._ctl + ")");
@@ -91,7 +91,7 @@ var TightDecoder = /*#__PURE__*/function () {
 
       var rQi = sock.rQi;
       var rQ = sock.rQ;
-      display.fillRect(x, y, width, height, [rQ[rQi + 2], rQ[rQi + 1], rQ[rQi]], false);
+      display.fillRect(x, y, width, height, [rQ[rQi], rQ[rQi + 1], rQ[rQi + 2]], false);
       sock.rQskipBytes(3);
       return true;
     }
@@ -163,6 +163,10 @@ var TightDecoder = /*#__PURE__*/function () {
       var uncompressedSize = width * height * 3;
       var data;
 
+      if (uncompressedSize === 0) {
+        return true;
+      }
+
       if (uncompressedSize < 12) {
         if (sock.rQwait("TIGHT", uncompressedSize)) {
           return false;
@@ -183,7 +187,16 @@ var TightDecoder = /*#__PURE__*/function () {
         this._zlibs[streamId].setInput(null);
       }
 
-      display.blitRgbImage(x, y, width, height, data, 0, false);
+      var rgbx = new Uint8Array(width * height * 4);
+
+      for (var i = 0, j = 0; i < width * height * 4; i += 4, j += 3) {
+        rgbx[i] = data[j];
+        rgbx[i + 1] = data[j + 1];
+        rgbx[i + 2] = data[j + 2];
+        rgbx[i + 3] = 255; // Alpha
+      }
+
+      display.blitImage(x, y, width, height, rgbx, 0, false);
       return true;
     }
   }, {
@@ -211,6 +224,10 @@ var TightDecoder = /*#__PURE__*/function () {
       var uncompressedSize = rowSize * height;
       var data;
 
+      if (uncompressedSize === 0) {
+        return true;
+      }
+
       if (uncompressedSize < 12) {
         if (sock.rQwait("TIGHT", uncompressedSize)) {
           return false;
@@ -277,7 +294,7 @@ var TightDecoder = /*#__PURE__*/function () {
         }
       }
 
-      display.blitRgbxImage(x, y, width, height, dest, 0, false);
+      display.blitImage(x, y, width, height, dest, 0, false);
     }
   }, {
     key: "_paletteRect",
@@ -295,7 +312,7 @@ var TightDecoder = /*#__PURE__*/function () {
         dest[i + 3] = 255;
       }
 
-      display.blitRgbxImage(x, y, width, height, dest, 0, false);
+      display.blitImage(x, y, width, height, dest, 0, false);
     }
   }, {
     key: "_gradientFilter",
@@ -310,17 +327,18 @@ var TightDecoder = /*#__PURE__*/function () {
           return null;
         }
 
-        var byte;
-        byte = sock.rQshift8();
-        this._len = byte & 0x7f;
+        var _byte;
+
+        _byte = sock.rQshift8();
+        this._len = _byte & 0x7f;
 
-        if (byte & 0x80) {
-          byte = sock.rQshift8();
-          this._len |= (byte & 0x7f) << 7;
+        if (_byte & 0x80) {
+          _byte = sock.rQshift8();
+          this._len |= (_byte & 0x7f) << 7;
 
-          if (byte & 0x80) {
-            byte = sock.rQshift8();
-            this._len |= byte << 14;
+          if (_byte & 0x80) {
+            _byte = sock.rQshift8();
+            this._len |= _byte << 14;
           }
         }
       }
@@ -347,4 +365,4 @@ var TightDecoder = /*#__PURE__*/function () {
   return TightDecoder;
 }();
 
-exports.default = TightDecoder;
+exports["default"] = TightDecoder;