@novnc/novnc 1.3.0-beta → 1.3.0-g0cb5f23

package/lib/decoders/jpeg.js

@@ -0,0 +1,146 @@
+"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

@@ -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
@@ -22,66 +18,54 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 var RawDecoder = /*#__PURE__*/function () {
   function RawDecoder() {
     _classCallCheck(this, RawDecoder);
-
     this._lines = 0;
   }
-
   _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;
       }
-
       var pixelSize = depth == 8 ? 1 : 4;
       var bytesPerLine = width * pixelSize;
-
       if (sock.rQwait("RAW", bytesPerLine)) {
         return false;
       }
-
       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
+      var index = sock.rQi;
 
+      // Convert data if needed
       if (depth == 8) {
         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 + 3] = 255;
         }
-
         data = newdata;
         index = 0;
-      } // Max sure the image is fully opaque
-
+      }
 
+      // Max sure the image is fully opaque
       for (var _i = 0; _i < pixels; _i++) {
-        data[_i * 4 + 3] = 255;
+        data[index + _i * 4 + 3] = 255;
       }
-
       display.blitImage(x, curY, width, currHeight, data, index);
       sock.rQskipBytes(currHeight * bytesPerLine);
       this._lines -= currHeight;
-
       if (this._lines > 0) {
         return false;
       }
-
       return true;
     }
   }]);
-
   return RawDecoder;
 }();
-
 exports["default"] = RawDecoder;

package/lib/decoders/rre.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
@@ -22,10 +18,8 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 var RREDecoder = /*#__PURE__*/function () {
   function RREDecoder() {
     _classCallCheck(this, RREDecoder);
-
     this._subrects = 0;
   }
-
   _createClass(RREDecoder, [{
     key: "decodeRect",
     value: function decodeRect(x, y, width, height, sock, display, depth) {
@@ -33,20 +27,15 @@ var RREDecoder = /*#__PURE__*/function () {
         if (sock.rQwait("RRE", 4 + 4)) {
           return false;
         }
-
         this._subrects = sock.rQshift32();
         var color = sock.rQshiftBytes(4); // Background
-
         display.fillRect(x, y, width, height, color);
       }
-
       while (this._subrects > 0) {
         if (sock.rQwait("RRE", 4 + 8)) {
           return false;
         }
-
         var _color = sock.rQshiftBytes(4);
-
         var sx = sock.rQshift16();
         var sy = sock.rQshift16();
         var swidth = sock.rQshift16();
@@ -54,12 +43,9 @@ var RREDecoder = /*#__PURE__*/function () {
         display.fillRect(x + sx, y + sy, swidth, sheight, _color);
         this._subrects--;
       }
-
       return true;
     }
   }]);
-
   return RREDecoder;
 }();
-
 exports["default"] = RREDecoder;

package/lib/decoders/tight.js

@@ -1,45 +1,31 @@
 "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"));
-
 var _inflator = _interopRequireDefault(require("../inflator.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 _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() {
     _classCallCheck(this, TightDecoder);
-
     this._ctl = null;
     this._filter = null;
     this._numColors = 0;
     this._palette = new Uint8Array(1024); // 256 * 4 (max palette size * max bytes-per-pixel)
-
     this._len = 0;
     this._zlibs = [];
-
     for (var i = 0; i < 4; i++) {
       this._zlibs[i] = new _inflator["default"]();
     }
   }
-
   _createClass(TightDecoder, [{
     key: "decodeRect",
     value: function decodeRect(x, y, width, height, sock, display, depth) {
@@ -47,23 +33,20 @@ var TightDecoder = /*#__PURE__*/function () {
         if (sock.rQwait("TIGHT compression-control", 1)) {
           return false;
         }
+        this._ctl = sock.rQshift8();
 
-        this._ctl = sock.rQshift8(); // Reset streams if the server requests it
-
+        // Reset streams if the server requests it
         for (var i = 0; i < 4; i++) {
           if (this._ctl >> i & 1) {
             this._zlibs[i].reset();
-
             Log.Info("Reset zlib stream " + i);
           }
-        } // Figure out filter
-
+        }
 
+        // Figure out filter
         this._ctl = this._ctl >> 4;
       }
-
       var ret;
-
       if (this._ctl === 0x08) {
         ret = this._fillRect(x, y, width, height, sock, display, depth);
       } else if (this._ctl === 0x09) {
@@ -75,11 +58,9 @@ var TightDecoder = /*#__PURE__*/function () {
       } else {
         throw new Error("Illegal tight compression received (ctl: " + this._ctl + ")");
       }
-
       if (ret) {
         this._ctl = null;
       }
-
       return ret;
     }
   }, {
@@ -88,7 +69,6 @@ var TightDecoder = /*#__PURE__*/function () {
       if (sock.rQwait("TIGHT", 3)) {
         return false;
       }
-
       var rQi = sock.rQi;
       var rQ = sock.rQ;
       display.fillRect(x, y, width, height, [rQ[rQi], rQ[rQi + 1], rQ[rQi + 2]], false);
@@ -99,11 +79,9 @@ var TightDecoder = /*#__PURE__*/function () {
     key: "_jpegRect",
     value: function _jpegRect(x, y, width, height, sock, display, depth) {
       var data = this._readData(sock);
-
       if (data === null) {
         return false;
       }
-
       display.imageRect(x, y, width, height, "image/jpeg", data);
       return true;
     }
@@ -120,41 +98,33 @@ var TightDecoder = /*#__PURE__*/function () {
           if (sock.rQwait("TIGHT", 1)) {
             return false;
           }
-
           this._filter = sock.rQshift8();
         } else {
           // Implicit CopyFilter
           this._filter = 0;
         }
       }
-
       var streamId = ctl & 0x3;
       var ret;
-
       switch (this._filter) {
         case 0:
           // CopyFilter
           ret = this._copyFilter(streamId, x, y, width, height, sock, display, depth);
           break;
-
         case 1:
           // PaletteFilter
           ret = this._paletteFilter(streamId, x, y, width, height, sock, display, depth);
           break;
-
         case 2:
           // GradientFilter
           ret = this._gradientFilter(streamId, x, y, width, height, sock, display, depth);
           break;
-
         default:
           throw new Error("Illegal tight filter received (ctl: " + this._filter + ")");
       }
-
       if (ret) {
         this._filter = null;
       }
-
       return ret;
     }
   }, {
@@ -162,33 +132,24 @@ var TightDecoder = /*#__PURE__*/function () {
     value: function _copyFilter(streamId, x, y, width, height, sock, display, depth) {
       var uncompressedSize = width * height * 3;
       var data;
-
       if (uncompressedSize === 0) {
         return true;
       }
-
       if (uncompressedSize < 12) {
         if (sock.rQwait("TIGHT", uncompressedSize)) {
           return false;
         }
-
         data = sock.rQshiftBytes(uncompressedSize);
       } else {
         data = this._readData(sock);
-
         if (data === null) {
           return false;
         }
-
         this._zlibs[streamId].setInput(data);
-
         data = this._zlibs[streamId].inflate(uncompressedSize);
-
         this._zlibs[streamId].setInput(null);
       }
-
       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];
@@ -206,55 +167,43 @@ var TightDecoder = /*#__PURE__*/function () {
         if (sock.rQwait("TIGHT palette", 1)) {
           return false;
         }
-
         var numColors = sock.rQpeek8() + 1;
         var paletteSize = numColors * 3;
-
         if (sock.rQwait("TIGHT palette", 1 + paletteSize)) {
           return false;
         }
-
         this._numColors = numColors;
         sock.rQskipBytes(1);
         sock.rQshiftTo(this._palette, paletteSize);
       }
-
       var bpp = this._numColors <= 2 ? 1 : 8;
       var rowSize = Math.floor((width * bpp + 7) / 8);
       var uncompressedSize = rowSize * height;
       var data;
-
       if (uncompressedSize === 0) {
         return true;
       }
-
       if (uncompressedSize < 12) {
         if (sock.rQwait("TIGHT", uncompressedSize)) {
           return false;
         }
-
         data = sock.rQshiftBytes(uncompressedSize);
       } else {
         data = this._readData(sock);
-
         if (data === null) {
           return false;
         }
-
         this._zlibs[streamId].setInput(data);
-
         data = this._zlibs[streamId].inflate(uncompressedSize);
-
         this._zlibs[streamId].setInput(null);
-      } // Convert indexed (palette based) image data to RGB
-
+      }
 
+      // Convert indexed (palette based) image data to RGB
       if (this._numColors == 2) {
         this._monoRect(x, y, width, height, data, this._palette, display);
       } else {
         this._paletteRect(x, y, width, height, data, this._palette, display);
       }
-
       this._numColors = 0;
       return true;
     }
@@ -264,15 +213,12 @@ var TightDecoder = /*#__PURE__*/function () {
       // Convert indexed (palette based) image data to RGB
       // TODO: reduce number of calculations inside loop
       var dest = this._getScratchBuffer(width * height * 4);
-
       var w = Math.floor((width + 7) / 8);
       var w1 = Math.floor(width / 8);
-
       for (var _y = 0; _y < height; _y++) {
         var dp = void 0,
-            sp = void 0,
-            _x = void 0;
-
+          sp = void 0,
+          _x = void 0;
         for (_x = 0; _x < w1; _x++) {
           for (var b = 7; b >= 0; b--) {
             dp = (_y * width + _x * 8 + 7 - b) * 4;
@@ -283,7 +229,6 @@ var TightDecoder = /*#__PURE__*/function () {
             dest[dp + 3] = 255;
           }
         }
-
         for (var _b = 7; _b >= 8 - width % 8; _b--) {
           dp = (_y * width + _x * 8 + 7 - _b) * 4;
           sp = (data[_y * w + _x] >> _b & 1) * 3;
@@ -293,7 +238,6 @@ var TightDecoder = /*#__PURE__*/function () {
           dest[dp + 3] = 255;
         }
       }
-
       display.blitImage(x, y, width, height, dest, 0, false);
     }
   }, {
@@ -301,9 +245,7 @@ var TightDecoder = /*#__PURE__*/function () {
     value: function _paletteRect(x, y, width, height, data, palette, display) {
       // Convert indexed (palette based) image data to RGB
       var dest = this._getScratchBuffer(width * height * 4);
-
       var total = width * height * 4;
-
       for (var i = 0, j = 0; i < total; i += 4, j++) {
         var sp = data[j] * 3;
         dest[i] = palette[sp];
@@ -311,7 +253,6 @@ var TightDecoder = /*#__PURE__*/function () {
         dest[i + 2] = palette[sp + 2];
         dest[i + 3] = 255;
       }
-
       display.blitImage(x, y, width, height, dest, 0, false);
     }
   }, {
@@ -326,27 +267,21 @@ var TightDecoder = /*#__PURE__*/function () {
         if (sock.rQwait("TIGHT", 3)) {
           return null;
         }
-
         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 << 14;
           }
         }
       }
-
       if (sock.rQwait("TIGHT", this._len)) {
         return null;
       }
-
       var data = sock.rQshiftBytes(this._len);
       this._len = 0;
       return data;
@@ -357,12 +292,9 @@ var TightDecoder = /*#__PURE__*/function () {
       if (!this._scratchBuffer || this._scratchBuffer.length < size) {
         this._scratchBuffer = new Uint8Array(size);
       }
-
       return this._scratchBuffer;
     }
   }]);
-
   return TightDecoder;
 }();
-
 exports["default"] = TightDecoder;