@novnc/novnc 1.2.0-test → 1.3.0-g1075cd8

package/lib/decoders/jpeg.js

@@ -0,0 +1,188 @@
+"use strict";
+
+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); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+
+/*
+ * noVNC: HTML5 VNC client
+ * Copyright (C) 2019 The noVNC Authors
+ * Licensed under MPL 2.0 (see LICENSE.txt)
+ *
+ * See README.md for usage and integration instructions.
+ *
+ */
+var JPEGDecoder = /*#__PURE__*/function () {
+  function JPEGDecoder() {
+    _classCallCheck(this, JPEGDecoder);
+
+    // RealVNC will reuse the quantization tables
+    // and Huffman tables, so we need to cache them.
+    this._quantTables = [];
+    this._huffmanTables = [];
+    this._cachedQuantTables = [];
+    this._cachedHuffmanTables = [];
+    this._jpegLength = 0;
+    this._segments = [];
+  }
+
+  _createClass(JPEGDecoder, [{
+    key: "decodeRect",
+    value: function decodeRect(x, y, width, height, sock, display, depth) {
+      // A rect of JPEG encodings is simply a JPEG file
+      if (!this._parseJPEG(sock.rQslice(0))) {
+        return false;
+      }
+
+      var data = sock.rQshiftBytes(this._jpegLength);
+
+      if (this._quantTables.length != 0 && this._huffmanTables.length != 0) {
+        // If there are quantization tables and Huffman tables in the JPEG
+        // image, we can directly render it.
+        display.imageRect(x, y, width, height, "image/jpeg", data);
+        return true;
+      } else {
+        // Otherwise we need to insert cached tables.
+        var sofIndex = this._segments.findIndex(function (x) {
+          return x[1] == 0xC0 || x[1] == 0xC2;
+        });
+
+        if (sofIndex == -1) {
+          throw new Error("Illegal JPEG image without SOF");
+        }
+
+        var segments = this._segments.slice(0, sofIndex);
+
+        segments = segments.concat(this._quantTables.length ? this._quantTables : this._cachedQuantTables);
+        segments.push(this._segments[sofIndex]);
+        segments = segments.concat(this._huffmanTables.length ? this._huffmanTables : this._cachedHuffmanTables, this._segments.slice(sofIndex + 1));
+        var length = 0;
+
+        for (var i = 0; i < segments.length; i++) {
+          length += segments[i].length;
+        }
+
+        var _data = new Uint8Array(length);
+
+        length = 0;
+
+        for (var _i = 0; _i < segments.length; _i++) {
+          _data.set(segments[_i], length);
+
+          length += segments[_i].length;
+        }
+
+        display.imageRect(x, y, width, height, "image/jpeg", _data);
+        return true;
+      }
+    }
+  }, {
+    key: "_parseJPEG",
+    value: function _parseJPEG(buffer) {
+      if (this._quantTables.length != 0) {
+        this._cachedQuantTables = this._quantTables;
+      }
+
+      if (this._huffmanTables.length != 0) {
+        this._cachedHuffmanTables = this._huffmanTables;
+      }
+
+      this._quantTables = [];
+      this._huffmanTables = [];
+      this._segments = [];
+      var i = 0;
+      var bufferLength = buffer.length;
+
+      while (true) {
+        var j = i;
+
+        if (j + 2 > bufferLength) {
+          return false;
+        }
+
+        if (buffer[j] != 0xFF) {
+          throw new Error("Illegal JPEG marker received (byte: " + buffer[j] + ")");
+        }
+
+        var type = buffer[j + 1];
+        j += 2;
+
+        if (type == 0xD9) {
+          this._jpegLength = j;
+
+          this._segments.push(buffer.slice(i, j));
+
+          return true;
+        } else if (type == 0xDA) {
+          // start of scan
+          var hasFoundEndOfScan = false;
+
+          for (var k = j + 3; k + 1 < bufferLength; k++) {
+            if (buffer[k] == 0xFF && buffer[k + 1] != 0x00 && !(buffer[k + 1] >= 0xD0 && buffer[k + 1] <= 0xD7)) {
+              j = k;
+              hasFoundEndOfScan = true;
+              break;
+            }
+          }
+
+          if (!hasFoundEndOfScan) {
+            return false;
+          }
+
+          this._segments.push(buffer.slice(i, j));
+
+          i = j;
+          continue;
+        } else if (type >= 0xD0 && type < 0xD9 || type == 0x01) {
+          // No length after marker
+          this._segments.push(buffer.slice(i, j));
+
+          i = j;
+          continue;
+        }
+
+        if (j + 2 > bufferLength) {
+          return false;
+        }
+
+        var length = (buffer[j] << 8) + buffer[j + 1] - 2;
+
+        if (length < 0) {
+          throw new Error("Illegal JPEG length received (length: " + length + ")");
+        }
+
+        j += 2;
+
+        if (j + length > bufferLength) {
+          return false;
+        }
+
+        j += length;
+        var segment = buffer.slice(i, j);
+
+        if (type == 0xC4) {
+          // Huffman tables
+          this._huffmanTables.push(segment);
+        } else if (type == 0xDB) {
+          // Quantization tables
+          this._quantTables.push(segment);
+        }
+
+        this._segments.push(segment);
+
+        i = j;
+      }
+    }
+  }]);
+
+  return JPEGDecoder;
+}();
+
+exports["default"] = JPEGDecoder;

package/lib/decoders/raw.js

@@ -3,13 +3,13 @@
 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"); } }
 
 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
@@ -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[index + _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,13 +3,13 @@
 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"); } }
 
 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
@@ -62,4 +62,4 @@ var RREDecoder = /*#__PURE__*/function () {
   return RREDecoder;
 }();
 
-exports.default = RREDecoder;
+exports["default"] = RREDecoder;

package/lib/decoders/tight.js

@@ -1,27 +1,27 @@
 "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;
+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"); } }
 
 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 TightDecoder = /*#__PURE__*/function () {
   function TightDecoder() {
@@ -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;

package/lib/decoders/tightpng.js

@@ -1,33 +1,33 @@
 "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 _tight = _interopRequireDefault(require("./tight.js"));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 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); }
 
@@ -62,6 +62,6 @@ var TightPNGDecoder = /*#__PURE__*/function (_TightDecoder) {
   }]);
 
   return TightPNGDecoder;
-}(_tight.default);
+}(_tight["default"]);
 
-exports.default = TightPNGDecoder;
+exports["default"] = TightPNGDecoder;