@novnc/novnc 1.2.0 → 1.3.0-g0ef7582

package/lib/decoders/copyrect.js

@@ -3,14 +3,10 @@
 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
  * Copyright (C) 2019 The noVNC Authors
@@ -23,22 +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;
+exports["default"] = CopyRectDecoder;

package/lib/decoders/hextile.js

@@ -1,32 +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;
-
+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 _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 _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) {
@@ -36,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;
@@ -69,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
@@ -82,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);
@@ -93,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
@@ -110,6 +91,11 @@ 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 {
@@ -118,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;
           }
-
-          display.startTile(tx, ty, tw, th, this._background);
-
+          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]];
@@ -142,7 +123,6 @@ var HextileDecoder = /*#__PURE__*/function () {
               } else {
                 color = this._foreground;
               }
-
               var xy = rQ[rQi];
               rQi++;
               var sx = xy >> 4;
@@ -151,23 +131,67 @@ 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;
         this._lastsubencoding = subencoding;
         this._tiles--;
       }
-
       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/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

@@ -3,14 +3,10 @@
 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
  * Copyright (C) 2019 The noVNC Authors
@@ -22,57 +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 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);
       sock.rQskipBytes(currHeight * bytesPerLine);
       this._lines -= currHeight;
-
       if (this._lines > 0) {
         return false;
       }
-
       return true;
     }
   }]);
-
   return RawDecoder;
 }();
-
-exports.default = RawDecoder;
+exports["default"] = RawDecoder;

package/lib/decoders/rre.js

@@ -3,14 +3,10 @@
 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
  * 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;
+exports["default"] = RREDecoder;