@novnc/novnc 1.3.0-beta → 1.3.0-g0ef7582

package/core/util/md5.js

@@ -0,0 +1,79 @@
+/*
+ * noVNC: HTML5 VNC client
+ * Copyright (C) 2021 The noVNC Authors
+ * Licensed under MPL 2.0 (see LICENSE.txt)
+ *
+ * See README.md for usage and integration instructions.
+ */
+
+/*
+ * Performs MD5 hashing on a string of binary characters, returns an array of bytes
+ */
+
+export function MD5(d) {
+    let r = M(V(Y(X(d), 8 * d.length)));
+    return r;
+}
+
+function M(d) {
+    let f = new Uint8Array(d.length);
+    for (let i=0;i<d.length;i++) {
+        f[i] = d.charCodeAt(i);
+    }
+    return f;
+}
+
+function X(d) {
+    let r = Array(d.length >> 2);
+    for (let m = 0; m < r.length; m++) r[m] = 0;
+    for (let m = 0; m < 8 * d.length; m += 8) r[m >> 5] |= (255 & d.charCodeAt(m / 8)) << m % 32;
+    return r;
+}
+
+function V(d) {
+    let r = "";
+    for (let m = 0; m < 32 * d.length; m += 8) r += String.fromCharCode(d[m >> 5] >>> m % 32 & 255);
+    return r;
+}
+
+function Y(d, g) {
+    d[g >> 5] |= 128 << g % 32, d[14 + (g + 64 >>> 9 << 4)] = g;
+    let m = 1732584193, f = -271733879, r = -1732584194, i = 271733878;
+    for (let n = 0; n < d.length; n += 16) {
+        let h = m,
+            t = f,
+            g = r,
+            e = i;
+        f = ii(f = ii(f = ii(f = ii(f = hh(f = hh(f = hh(f = hh(f = gg(f = gg(f = gg(f = gg(f = ff(f = ff(f = ff(f = ff(f, r = ff(r, i = ff(i, m = ff(m, f, r, i, d[n + 0], 7, -680876936), f, r, d[n + 1], 12, -389564586), m, f, d[n + 2], 17, 606105819), i, m, d[n + 3], 22, -1044525330), r = ff(r, i = ff(i, m = ff(m, f, r, i, d[n + 4], 7, -176418897), f, r, d[n + 5], 12, 1200080426), m, f, d[n + 6], 17, -1473231341), i, m, d[n + 7], 22, -45705983), r = ff(r, i = ff(i, m = ff(m, f, r, i, d[n + 8], 7, 1770035416), f, r, d[n + 9], 12, -1958414417), m, f, d[n + 10], 17, -42063), i, m, d[n + 11], 22, -1990404162), r = ff(r, i = ff(i, m = ff(m, f, r, i, d[n + 12], 7, 1804603682), f, r, d[n + 13], 12, -40341101), m, f, d[n + 14], 17, -1502002290), i, m, d[n + 15], 22, 1236535329), r = gg(r, i = gg(i, m = gg(m, f, r, i, d[n + 1], 5, -165796510), f, r, d[n + 6], 9, -1069501632), m, f, d[n + 11], 14, 643717713), i, m, d[n + 0], 20, -373897302), r = gg(r, i = gg(i, m = gg(m, f, r, i, d[n + 5], 5, -701558691), f, r, d[n + 10], 9, 38016083), m, f, d[n + 15], 14, -660478335), i, m, d[n + 4], 20, -405537848), r = gg(r, i = gg(i, m = gg(m, f, r, i, d[n + 9], 5, 568446438), f, r, d[n + 14], 9, -1019803690), m, f, d[n + 3], 14, -187363961), i, m, d[n + 8], 20, 1163531501), r = gg(r, i = gg(i, m = gg(m, f, r, i, d[n + 13], 5, -1444681467), f, r, d[n + 2], 9, -51403784), m, f, d[n + 7], 14, 1735328473), i, m, d[n + 12], 20, -1926607734), r = hh(r, i = hh(i, m = hh(m, f, r, i, d[n + 5], 4, -378558), f, r, d[n + 8], 11, -2022574463), m, f, d[n + 11], 16, 1839030562), i, m, d[n + 14], 23, -35309556), r = hh(r, i = hh(i, m = hh(m, f, r, i, d[n + 1], 4, -1530992060), f, r, d[n + 4], 11, 1272893353), m, f, d[n + 7], 16, -155497632), i, m, d[n + 10], 23, -1094730640), r = hh(r, i = hh(i, m = hh(m, f, r, i, d[n + 13], 4, 681279174), f, r, d[n + 0], 11, -358537222), m, f, d[n + 3], 16, -722521979), i, m, d[n + 6], 23, 76029189), r = hh(r, i = hh(i, m = hh(m, f, r, i, d[n + 9], 4, -640364487), f, r, d[n + 12], 11, -421815835), m, f, d[n + 15], 16, 530742520), i, m, d[n + 2], 23, -995338651), r = ii(r, i = ii(i, m = ii(m, f, r, i, d[n + 0], 6, -198630844), f, r, d[n + 7], 10, 1126891415), m, f, d[n + 14], 15, -1416354905), i, m, d[n + 5], 21, -57434055), r = ii(r, i = ii(i, m = ii(m, f, r, i, d[n + 12], 6, 1700485571), f, r, d[n + 3], 10, -1894986606), m, f, d[n + 10], 15, -1051523), i, m, d[n + 1], 21, -2054922799), r = ii(r, i = ii(i, m = ii(m, f, r, i, d[n + 8], 6, 1873313359), f, r, d[n + 15], 10, -30611744), m, f, d[n + 6], 15, -1560198380), i, m, d[n + 13], 21, 1309151649), r = ii(r, i = ii(i, m = ii(m, f, r, i, d[n + 4], 6, -145523070), f, r, d[n + 11], 10, -1120210379), m, f, d[n + 2], 15, 718787259), i, m, d[n + 9], 21, -343485551), m = add(m, h), f = add(f, t), r = add(r, g), i = add(i, e);
+    }
+    return Array(m, f, r, i);
+}
+
+function cmn(d, g, m, f, r, i) {
+    return add(rol(add(add(g, d), add(f, i)), r), m);
+}
+
+function ff(d, g, m, f, r, i, n) {
+    return cmn(g & m | ~g & f, d, g, r, i, n);
+}
+
+function gg(d, g, m, f, r, i, n) {
+    return cmn(g & f | m & ~f, d, g, r, i, n);
+}
+
+function hh(d, g, m, f, r, i, n) {
+    return cmn(g ^ m ^ f, d, g, r, i, n);
+}
+
+function ii(d, g, m, f, r, i, n) {
+    return cmn(m ^ (g | ~f), d, g, r, i, n);
+}
+
+function add(d, g) {
+    let m = (65535 & d) + (65535 & g);
+    return (d >> 16) + (g >> 16) + (m >> 16) << 16 | 65535 & m;
+}
+
+function rol(d, g) {
+    return d << g | d >>> 32 - g;
+}

package/docs/API.md

@@ -86,9 +86,13 @@ protocol stream.
   - The `connect` event is fired when the `RFB` object has completed
     the connection and handshaking with the server.
 
-[`disconnect`](#disconnected)
+[`disconnect`](#disconnect)
   - The `disconnect` event is fired when the `RFB` object disconnects.
 
+[`serververification`](#serververification)
+  - The `serververification` event is fired when the server identity
+    must be confirmed by the user.
+
 [`credentialsrequired`](#credentialsrequired)
   - The `credentialsrequired` event is fired when more credentials must
     be given to continue.
@@ -118,11 +122,16 @@ protocol stream.
 [`RFB.disconnect()`](#rfbdisconnect)
   - Disconnect from the server.
 
+[`RFB.approveServer()`](#rfbapproveserver)
+  - Proceed connecting to the server. Should be called after the
+    [`serververification`](#serververification) event has fired and the
+    user has verified the identity of the server.
+
 [`RFB.sendCredentials()`](#rfbsendcredentials)
   - Send credentials to server. Should be called after the
     [`credentialsrequired`](#credentialsrequired) event has fired.
 
-[`RFB.sendKey()`](#rfbsendKey)
+[`RFB.sendKey()`](#rfbsendkey)
   - Send a key event.
 
 [`RFB.sendCtrlAltDel()`](#rfbsendctrlaltdel)
@@ -143,9 +152,18 @@ protocol stream.
 [`RFB.machineReset()`](#rfbmachinereset)
   - Request a reset of the remote machine.
 
-[`RFB.clipboardPasteFrom()`](#rfbclipboardPasteFrom)
+[`RFB.clipboardPasteFrom()`](#rfbclipboardpastefrom)
   - Send clipboard contents to server.
 
+[`RFB.getImageData()`](#rfbgetimagedata)
+  - Return the current content of the screen as an ImageData array.
+
+[`RFB.toDataURL()`](#rfbtodataurl)
+  - Return the current content of the screen as data-url encoded image file.
+
+[`RFB.toBlob()`](#rfbtoblob)
+  - Return the current content of the screen as Blob encoded image file.
+
 ### Details
 
 #### RFB()
@@ -212,6 +230,20 @@ property `clean`. `clean` is a `boolean` indicating if the termination
 was clean or not. In the event of an unexpected termination or an error
 `clean` will be set to false.
 
+#### serververification
+
+The `serververification` event is fired when the server provides
+information that allows the user to verify that it is the correct server
+and protect against a man-in-the-middle attack. The `detail` property is
+an `Object` containing the property `type` which is a `DOMString`
+specifying which type of information the server has provided. Other
+properties are also available, depending on the value of `type`:
+
+`"RSA"`
+ - The server identity is verified using just a RSA key. The property
+   `publickey` is a `Uint8Array` containing the public key in a unsigned
+   big endian representation.
+
 #### credentialsrequired
 
 The `credentialsrequired` event is fired when the server requests more
@@ -271,6 +303,16 @@ connected server.
 
     RFB.disconnect( );
 
+#### RFB.approveServer()
+
+The `RFB.approveServer()` method is used to signal that the user has
+verified the server identity provided in a `serververification` event
+and that the connection can continue.
+
+##### Syntax
+
+    RFB.approveServer( );
+
 #### RFB.sendCredentials()
 
 The `RFB.sendCredentials()` method is used to provide the missing
@@ -328,7 +370,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()
 
@@ -383,3 +432,55 @@ to the remote server.
 
 **`text`**
   - A `DOMString` specifying the clipboard data to send.
+
+#### RFB.getImageData()
+
+The `RFB.getImageData()` method is used to return the current content of the
+screen encoded as [`ImageData`](https://developer.mozilla.org/en-US/docs/Web/API/ImageData).
+
+##### Syntax
+
+  RFB.getImageData();
+
+#### RFB.toDataURL()
+
+The `RFB.toDataURL()` method is used to return the current content of the
+screen encoded as a data URL that could for example be put in the `src` attribute
+of an `img` tag.
+
+##### Syntax
+
+  RFB.toDataURL();
+  RFB.toDataURL(type);
+  RFB.toDataURL(type, encoderOptions);
+
+###### Parameters
+
+**`type`** *Optional*
+  - A string indicating the requested MIME type of the image
+
+**`encoderOptions`** *Optional*
+  - A number between 0 and 1 indicating the image quality.
+
+#### RFB.toBlob()
+
+The `RFB.toBlob()` method is used to return the current content of the
+screen encoded as [`Blob`](https://developer.mozilla.org/en-US/docs/Web/API/Blob).
+
+##### Syntax
+
+  RFB.toDataURL(callback);
+  RFB.toDataURL(callback, type);
+  RFB.toDataURL(callback, type, quality);
+
+###### Parameters
+
+**`callback`**
+  - A callback function which will receive the resulting [`Blob`](https://developer.mozilla.org/en-US/docs/Web/API/Blob)
+    as the single argument
+
+**`type`** *Optional*
+  - A string indicating the requested MIME type of the image
+
+**`encoderOptions`** *Optional*
+  - A number between 0 and 1 indicating the image quality.

package/lib/base64.js

@@ -1,18 +1,13 @@
 "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["default"] = void 0;
-
 var Log = _interopRequireWildcard(require("./util/logging.js"));
-
 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; }
-
 /* 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
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -26,18 +21,18 @@ var _default = {
 
     var result = '';
     var length = data.length;
-    var lengthpad = length % 3; // Convert every three bytes to 4 ascii characters.
+    var lengthpad = length % 3;
+    // Convert every three bytes to 4 ascii characters.
 
     for (var i = 0; i < length - 2; i += 3) {
       result += this.toBase64Table[data[i] >> 2];
       result += this.toBase64Table[((data[i] & 0x03) << 4) + (data[i + 1] >> 4)];
       result += this.toBase64Table[((data[i + 1] & 0x0f) << 2) + (data[i + 2] >> 6)];
       result += this.toBase64Table[data[i + 2] & 0x3f];
-    } // Convert the remaining 1 or 2 bytes, pad out to 4 characters.
-
+    }
 
+    // Convert the remaining 1 or 2 bytes, pad out to 4 characters.
     var j = length - lengthpad;
-
     if (lengthpad === 2) {
       result += this.toBase64Table[data[j] >> 2];
       result += this.toBase64Table[((data[j] & 0x03) << 4) + (data[j + 1] >> 4)];
@@ -49,67 +44,58 @@ var _default = {
       result += this.toBase64Table[64];
       result += this.toBase64Table[64];
     }
-
     return result;
   },
-
   /* Convert Base64 data to a string */
-
   /* eslint-disable comma-spacing */
   toBinaryTable: [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, 0, -1, -1, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1],
-
-  /* eslint-enable comma-spacing */
-  decode: function decode(data) {
+  /* eslint-enable comma-spacing */decode: function decode(data) {
     var offset = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
     var dataLength = data.indexOf('=') - offset;
-
     if (dataLength < 0) {
       dataLength = data.length - offset;
     }
-    /* Every four characters is 3 resulting numbers */
-
 
+    /* Every four characters is 3 resulting numbers */
     var resultLength = (dataLength >> 2) * 3 + Math.floor(dataLength % 4 / 1.5);
-    var result = new Array(resultLength); // Convert one by one.
+    var result = new Array(resultLength);
 
-    var leftbits = 0; // number of bits decoded, but yet to be appended
+    // Convert one by one.
 
+    var leftbits = 0; // number of bits decoded, but yet to be appended
     var leftdata = 0; // bits decoded, but yet to be appended
-
     for (var idx = 0, i = offset; i < data.length; i++) {
       var c = this.toBinaryTable[data.charCodeAt(i) & 0x7f];
-      var padding = data.charAt(i) === this.base64Pad; // Skip illegal characters and whitespace
-
+      var padding = data.charAt(i) === this.base64Pad;
+      // Skip illegal characters and whitespace
       if (c === -1) {
         Log.Error("Illegal character code " + data.charCodeAt(i) + " at position " + i);
         continue;
-      } // Collect data into leftdata, update bitcount
-
+      }
 
+      // Collect data into leftdata, update bitcount
       leftdata = leftdata << 6 | c;
-      leftbits += 6; // If we have 8 or more bits, append 8 bits to the result
+      leftbits += 6;
 
+      // If we have 8 or more bits, append 8 bits to the result
       if (leftbits >= 8) {
-        leftbits -= 8; // Append if not padding.
-
+        leftbits -= 8;
+        // Append if not padding.
         if (!padding) {
           result[idx++] = leftdata >> leftbits & 0xff;
         }
-
         leftdata &= (1 << leftbits) - 1;
       }
-    } // If there are any bits left, the base64 string was corrupted
-
+    }
 
+    // If there are any bits left, the base64 string was corrupted
     if (leftbits) {
       var err = new Error('Corrupted base64 string');
       err.name = 'Base64-Error';
       throw err;
     }
-
     return result;
   }
 };
 /* End of Base64 namespace */
-
 exports["default"] = _default;

package/lib/decoders/copyrect.js

@@ -4,13 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 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; }
 /*
  * noVNC: HTML5 VNC client
  * Copyright (C) 2019 The noVNC Authors
@@ -23,27 +19,21 @@ var CopyRectDecoder = /*#__PURE__*/function () {
   function CopyRectDecoder() {
     _classCallCheck(this, CopyRectDecoder);
   }
-
   _createClass(CopyRectDecoder, [{
     key: "decodeRect",
     value: function decodeRect(x, y, width, height, sock, display, depth) {
       if (sock.rQwait("COPYRECT", 4)) {
         return false;
       }
-
       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;
     }
   }]);
-
   return CopyRectDecoder;
 }();
-
 exports["default"] = CopyRectDecoder;

package/lib/decoders/hextile.js

@@ -1,33 +1,23 @@
 "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["default"] = void 0;
-
 var Log = _interopRequireWildcard(require("../util/logging.js"));
-
 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 _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; }
 var HextileDecoder = /*#__PURE__*/function () {
   function HextileDecoder() {
     _classCallCheck(this, HextileDecoder);
-
     this._tiles = 0;
     this._lastsubencoding = 0;
     this._tileBuffer = new Uint8Array(16 * 16 * 4);
   }
-
   _createClass(HextileDecoder, [{
     key: "decodeRect",
     value: function decodeRect(x, y, width, height, sock, display, depth) {
@@ -37,31 +27,27 @@ var HextileDecoder = /*#__PURE__*/function () {
         this._totalTiles = this._tilesX * this._tilesY;
         this._tiles = this._totalTiles;
       }
-
       while (this._tiles > 0) {
         var bytes = 1;
-
         if (sock.rQwait("HEXTILE", bytes)) {
           return false;
         }
-
         var rQ = sock.rQ;
         var rQi = sock.rQi;
         var subencoding = rQ[rQi]; // Peek
-
         if (subencoding > 30) {
           // Raw
           throw new Error("Illegal hextile subencoding (subencoding: " + subencoding + ")");
         }
-
         var currTile = this._totalTiles - this._tiles;
         var tileX = currTile % this._tilesX;
         var tileY = Math.floor(currTile / this._tilesX);
         var tx = x + tileX * 16;
         var ty = y + tileY * 16;
         var tw = Math.min(16, x + width - tx);
-        var th = Math.min(16, y + height - ty); // Figure out how much we are expecting
+        var th = Math.min(16, y + height - ty);
 
+        // Figure out how much we are expecting
         if (subencoding & 0x01) {
           // Raw
           bytes += tw * th * 4;
@@ -70,12 +56,10 @@ var HextileDecoder = /*#__PURE__*/function () {
             // Background
             bytes += 4;
           }
-
           if (subencoding & 0x04) {
             // Foreground
             bytes += 4;
           }
-
           if (subencoding & 0x08) {
             // AnySubrects
             bytes++; // Since we aren't shifting it off
@@ -83,9 +67,7 @@ var HextileDecoder = /*#__PURE__*/function () {
             if (sock.rQwait("HEXTILE", bytes)) {
               return false;
             }
-
             var subrects = rQ[rQi + bytes - 1]; // Peek
-
             if (subencoding & 0x10) {
               // SubrectsColoured
               bytes += subrects * (4 + 2);
@@ -94,14 +76,12 @@ var HextileDecoder = /*#__PURE__*/function () {
             }
           }
         }
-
         if (sock.rQwait("HEXTILE", bytes)) {
           return false;
-        } // We know the encoding and have a whole tile
-
+        }
 
+        // We know the encoding and have a whole tile
         rQi++;
-
         if (subencoding === 0) {
           if (this._lastsubencoding & 0x01) {
             // Weird: ignore blanks are RAW
@@ -111,12 +91,11 @@ var HextileDecoder = /*#__PURE__*/function () {
           }
         } else if (subencoding & 0x01) {
           // Raw
-          var pixels = tw * th; // Max sure the image is fully opaque
-
+          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,23 +104,18 @@ var HextileDecoder = /*#__PURE__*/function () {
             this._background = [rQ[rQi], rQ[rQi + 1], rQ[rQi + 2], rQ[rQi + 3]];
             rQi += 4;
           }
-
           if (subencoding & 0x04) {
             // Foreground
             this._foreground = [rQ[rQi], rQ[rQi + 1], rQ[rQi + 2], rQ[rQi + 3]];
             rQi += 4;
           }
-
           this._startTile(tx, ty, tw, th, this._background);
-
           if (subencoding & 0x08) {
             // AnySubrects
             var _subrects = rQ[rQi];
             rQi++;
-
             for (var s = 0; s < _subrects; s++) {
               var color = void 0;
-
               if (subencoding & 0x10) {
                 // SubrectsColoured
                 color = [rQ[rQi], rQ[rQi + 1], rQ[rQi + 2], rQ[rQi + 3]];
@@ -149,7 +123,6 @@ var HextileDecoder = /*#__PURE__*/function () {
               } else {
                 color = this._foreground;
               }
-
               var xy = rQ[rQi];
               rQi++;
               var sx = xy >> 4;
@@ -158,22 +131,19 @@ var HextileDecoder = /*#__PURE__*/function () {
               rQi++;
               var sw = (wh >> 4) + 1;
               var sh = (wh & 0x0f) + 1;
-
               this._subTile(sx, sy, sw, sh, color);
             }
           }
-
           this._finishTile(display);
         }
-
         sock.rQi = rQi;
         this._lastsubencoding = subencoding;
         this._tiles--;
       }
-
       return true;
-    } // start updating a tile
+    }
 
+    // start updating a tile
   }, {
     key: "_startTile",
     value: function _startTile(x, y, width, height, color) {
@@ -185,15 +155,15 @@ var HextileDecoder = /*#__PURE__*/function () {
       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
+    }
 
+    // update sub-rectangle of the current tile
   }, {
     key: "_subTile",
     value: function _subTile(x, y, w, h, color) {
@@ -204,7 +174,6 @@ var HextileDecoder = /*#__PURE__*/function () {
       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;
@@ -214,16 +183,15 @@ var HextileDecoder = /*#__PURE__*/function () {
           data[p + 3] = 255;
         }
       }
-    } // draw the current tile to the screen
+    }
 
+    // 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;