@novnc/novnc 1.3.0-beta → 1.3.0-g0ef7582

package/lib/display.js

@@ -1,67 +1,54 @@
 "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 _base = _interopRequireDefault(require("./base64.js"));
-
 var _int = require("./util/int.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 Display = /*#__PURE__*/function () {
   function Display(target) {
     _classCallCheck(this, Display);
-
     this._drawCtx = null;
     this._renderQ = []; // queue drawing actions for in-oder rendering
+    this._flushing = false;
 
-    this._flushing = false; // the full frame buffer (logical canvas) size
-
+    // the full frame buffer (logical canvas) size
     this._fbWidth = 0;
     this._fbHeight = 0;
     this._prevDrawStyle = "";
-    Log.Debug(">> Display.constructor"); // The visible canvas
+    Log.Debug(">> Display.constructor");
 
+    // The visible canvas
     this._target = target;
-
     if (!this._target) {
       throw new Error("Target must be set");
     }
-
     if (typeof this._target === 'string') {
       throw new Error('target must be a DOM element');
     }
-
     if (!this._target.getContext) {
       throw new Error("no getContext method");
     }
+    this._targetCtx = this._target.getContext('2d');
 
-    this._targetCtx = this._target.getContext('2d'); // the visible canvas viewport (i.e. what actually gets seen)
-
+    // the visible canvas viewport (i.e. what actually gets seen)
     this._viewportLoc = {
       'x': 0,
       'y': 0,
       'w': this._target.width,
       'h': this._target.height
-    }; // The hidden canvas, where we do the actual rendering
+    };
 
+    // The hidden canvas, where we do the actual rendering
     this._backbuffer = document.createElement('canvas');
     this._drawCtx = this._backbuffer.getContext('2d');
     this._damageBounds = {
@@ -71,16 +58,19 @@ var Display = /*#__PURE__*/function () {
       bottom: this._backbuffer.height
     };
     Log.Debug("User Agent: " + navigator.userAgent);
-    Log.Debug("<< Display.constructor"); // ===== PROPERTIES =====
+    Log.Debug("<< Display.constructor");
 
-    this._scale = 1.0;
-    this._clipViewport = false; // ===== EVENT HANDLERS =====
+    // ===== PROPERTIES =====
 
-    this.onflush = function () {}; // A flush request has finished
+    this._scale = 1.0;
+    this._clipViewport = false;
 
-  } // ===== PROPERTIES =====
+    // ===== EVENT HANDLERS =====
 
+    this.onflush = function () {}; // A flush request has finished
+  }
 
+  // ===== PROPERTIES =====
   _createClass(Display, [{
     key: "scale",
     get: function get() {
@@ -95,8 +85,8 @@ var Display = /*#__PURE__*/function () {
       return this._clipViewport;
     },
     set: function set(viewport) {
-      this._clipViewport = viewport; // May need to readjust the viewport dimensions
-
+      this._clipViewport = viewport;
+      // May need to readjust the viewport dimensions
       var vp = this._viewportLoc;
       this.viewportChangeSize(vp.w, vp.h);
       this.viewportChangePos(0, 0);
@@ -110,50 +100,43 @@ var Display = /*#__PURE__*/function () {
     key: "height",
     get: function get() {
       return this._fbHeight;
-    } // ===== PUBLIC METHODS =====
+    }
 
+    // ===== PUBLIC METHODS =====
   }, {
     key: "viewportChangePos",
     value: function viewportChangePos(deltaX, deltaY) {
       var vp = this._viewportLoc;
       deltaX = Math.floor(deltaX);
       deltaY = Math.floor(deltaY);
-
       if (!this._clipViewport) {
         deltaX = -vp.w; // clamped later of out of bounds
-
         deltaY = -vp.h;
       }
-
       var vx2 = vp.x + vp.w - 1;
-      var vy2 = vp.y + vp.h - 1; // Position change
+      var vy2 = vp.y + vp.h - 1;
+
+      // Position change
 
       if (deltaX < 0 && vp.x + deltaX < 0) {
         deltaX = -vp.x;
       }
-
       if (vx2 + deltaX >= this._fbWidth) {
         deltaX -= vx2 + deltaX - this._fbWidth + 1;
       }
-
       if (vp.y + deltaY < 0) {
         deltaY = -vp.y;
       }
-
       if (vy2 + deltaY >= this._fbHeight) {
         deltaY -= vy2 + deltaY - this._fbHeight + 1;
       }
-
       if (deltaX === 0 && deltaY === 0) {
         return;
       }
-
       Log.Debug("viewportChange deltaX: " + deltaX + ", deltaY: " + deltaY);
       vp.x += deltaX;
       vp.y += deltaY;
-
       this._damage(vp.x, vp.y, vp.w, vp.h);
-
       this.flip();
     }
   }, {
@@ -164,33 +147,28 @@ var Display = /*#__PURE__*/function () {
         width = this._fbWidth;
         height = this._fbHeight;
       }
-
       width = Math.floor(width);
       height = Math.floor(height);
-
       if (width > this._fbWidth) {
         width = this._fbWidth;
       }
-
       if (height > this._fbHeight) {
         height = this._fbHeight;
       }
-
       var vp = this._viewportLoc;
-
       if (vp.w !== width || vp.h !== height) {
         vp.w = width;
         vp.h = height;
         var canvas = this._target;
         canvas.width = width;
-        canvas.height = height; // The position might need to be updated if we've grown
+        canvas.height = height;
 
+        // The position might need to be updated if we've grown
         this.viewportChangePos(0, 0);
-
         this._damage(vp.x, vp.y, vp.w, vp.h);
+        this.flip();
 
-        this.flip(); // Update the visible size of the target canvas
-
+        // Update the visible size of the target canvas
         this._rescale(this._scale);
       }
     }
@@ -200,7 +178,6 @@ var Display = /*#__PURE__*/function () {
       if (this._scale === 0) {
         return 0;
       }
-
       return (0, _int.toSigned32bit)(x / this._scale + this._viewportLoc.x);
     }
   }, {
@@ -209,7 +186,6 @@ var Display = /*#__PURE__*/function () {
       if (this._scale === 0) {
         return 0;
       }
-
       return (0, _int.toSigned32bit)(y / this._scale + this._viewportLoc.y);
     }
   }, {
@@ -219,56 +195,65 @@ var Display = /*#__PURE__*/function () {
       this._fbWidth = width;
       this._fbHeight = height;
       var canvas = this._backbuffer;
-
       if (canvas.width !== width || canvas.height !== height) {
         // We have to save the canvas data since changing the size will clear it
         var saveImg = null;
-
         if (canvas.width > 0 && canvas.height > 0) {
           saveImg = this._drawCtx.getImageData(0, 0, canvas.width, canvas.height);
         }
-
         if (canvas.width !== width) {
           canvas.width = width;
         }
-
         if (canvas.height !== height) {
           canvas.height = height;
         }
-
         if (saveImg) {
           this._drawCtx.putImageData(saveImg, 0, 0);
         }
-      } // Readjust the viewport as it may be incorrectly sized
-      // and positioned
-
+      }
 
+      // Readjust the viewport as it may be incorrectly sized
+      // and positioned
       var vp = this._viewportLoc;
       this.viewportChangeSize(vp.w, vp.h);
       this.viewportChangePos(0, 0);
-    } // Track what parts of the visible canvas that need updating
+    }
+  }, {
+    key: "getImageData",
+    value: function getImageData() {
+      return this._drawCtx.getImageData(0, 0, this.width, this.height);
+    }
+  }, {
+    key: "toDataURL",
+    value: function toDataURL(type, encoderOptions) {
+      return this._backbuffer.toDataURL(type, encoderOptions);
+    }
+  }, {
+    key: "toBlob",
+    value: function toBlob(callback, type, quality) {
+      return this._backbuffer.toBlob(callback, type, quality);
+    }
 
+    // Track what parts of the visible canvas that need updating
   }, {
     key: "_damage",
     value: function _damage(x, y, w, h) {
       if (x < this._damageBounds.left) {
         this._damageBounds.left = x;
       }
-
       if (y < this._damageBounds.top) {
         this._damageBounds.top = y;
       }
-
       if (x + w > this._damageBounds.right) {
         this._damageBounds.right = x + w;
       }
-
       if (y + h > this._damageBounds.bottom) {
         this._damageBounds.bottom = y + h;
       }
-    } // Update the visible canvas with the contents of the
-    // rendering canvas
+    }
 
+    // Update the visible canvas with the contents of the
+    // rendering canvas
   }, {
     key: "flip",
     value: function flip(fromQueue) {
@@ -283,34 +268,28 @@ var Display = /*#__PURE__*/function () {
         var h = this._damageBounds.bottom - y;
         var vx = x - this._viewportLoc.x;
         var vy = y - this._viewportLoc.y;
-
         if (vx < 0) {
           w += vx;
           x -= vx;
           vx = 0;
         }
-
         if (vy < 0) {
           h += vy;
           y -= vy;
           vy = 0;
         }
-
         if (vx + w > this._viewportLoc.w) {
           w = this._viewportLoc.w - vx;
         }
-
         if (vy + h > this._viewportLoc.h) {
           h = this._viewportLoc.h - vy;
         }
-
         if (w > 0 && h > 0) {
           // FIXME: We may need to disable image smoothing here
           //        as well (see copyImage()), but we haven't
           //        noticed any problem yet.
           this._targetCtx.drawImage(this._backbuffer, x, y, w, h, vx, vy, w, h);
         }
-
         this._damageBounds.left = this._damageBounds.top = 65535;
         this._damageBounds.right = this._damageBounds.bottom = 0;
       }
@@ -343,9 +322,7 @@ var Display = /*#__PURE__*/function () {
         });
       } else {
         this._setFillColor(color);
-
         this._drawCtx.fillRect(x, y, width, height);
-
         this._damage(x, y, width, height);
       }
     }
@@ -374,9 +351,7 @@ var Display = /*#__PURE__*/function () {
         this._drawCtx.webkitImageSmoothingEnabled = false;
         this._drawCtx.msImageSmoothingEnabled = false;
         this._drawCtx.imageSmoothingEnabled = false;
-
         this._drawCtx.drawImage(this._backbuffer, oldX, oldY, w, h, newX, newY, w, h);
-
         this._damage(newX, newY, w, h);
       }
     }
@@ -387,10 +362,8 @@ var Display = /*#__PURE__*/function () {
       if (width === 0 || height === 0) {
         return;
       }
-
       var img = new Image();
       img.src = "data: " + mime + ";base64," + _base["default"].encode(arr);
-
       this._renderQPush({
         'type': 'img',
         'img': img,
@@ -409,7 +382,6 @@ var Display = /*#__PURE__*/function () {
         // this probably isn't getting called *nearly* as much
         var newArr = new Uint8Array(width * height * 4);
         newArr.set(new Uint8Array(arr.buffer, 0, newArr.length));
-
         this._renderQPush({
           'type': 'blit',
           'data': newArr,
@@ -422,9 +394,7 @@ var Display = /*#__PURE__*/function () {
         // NB(directxman12): arr must be an Type Array view
         var data = new Uint8ClampedArray(arr.buffer, arr.byteOffset + offset, width * height * 4);
         var img = new ImageData(data, width, height);
-
         this._drawCtx.putImageData(img, x, y);
-
         this._damage(x, y, width, height);
       }
     }
@@ -432,43 +402,40 @@ var Display = /*#__PURE__*/function () {
     key: "drawImage",
     value: function drawImage(img, x, y) {
       this._drawCtx.drawImage(img, x, y);
-
       this._damage(x, y, img.width, img.height);
     }
   }, {
     key: "autoscale",
     value: function autoscale(containerWidth, containerHeight) {
       var scaleRatio;
-
       if (containerWidth === 0 || containerHeight === 0) {
         scaleRatio = 0;
       } else {
         var vp = this._viewportLoc;
         var targetAspectRatio = containerWidth / containerHeight;
         var fbAspectRatio = vp.w / vp.h;
-
         if (fbAspectRatio >= targetAspectRatio) {
           scaleRatio = containerWidth / vp.w;
         } else {
           scaleRatio = containerHeight / vp.h;
         }
       }
-
       this._rescale(scaleRatio);
-    } // ===== PRIVATE METHODS =====
+    }
 
+    // ===== PRIVATE METHODS =====
   }, {
     key: "_rescale",
     value: function _rescale(factor) {
       this._scale = factor;
-      var vp = this._viewportLoc; // NB(directxman12): If you set the width directly, or set the
+      var vp = this._viewportLoc;
+
+      // NB(directxman12): If you set the width directly, or set the
       //                   style width to a number, the canvas is cleared.
       //                   However, if you set the style width to a string
       //                   ('NNNpx'), the canvas is scaled without clearing.
-
       var width = factor * vp.w + 'px';
       var height = factor * vp.h + 'px';
-
       if (this._target.style.width !== width || this._target.style.height !== height) {
         this._target.style.width = width;
         this._target.style.height = height;
@@ -478,7 +445,6 @@ var Display = /*#__PURE__*/function () {
     key: "_setFillColor",
     value: function _setFillColor(color) {
       var newStyle = 'rgb(' + color[0] + ',' + color[1] + ',' + color[2] + ')';
-
       if (newStyle !== this._prevDrawStyle) {
         this._drawCtx.fillStyle = newStyle;
         this._prevDrawStyle = newStyle;
@@ -488,7 +454,6 @@ var Display = /*#__PURE__*/function () {
     key: "_renderQPush",
     value: function _renderQPush(action) {
       this._renderQ.push(action);
-
       if (this._renderQ.length === 1) {
         // If this can be rendered immediately it will be, otherwise
         // the scanner will wait for the relevant event
@@ -501,66 +466,53 @@ var Display = /*#__PURE__*/function () {
       // "this" is the object that is ready, not the
       // display object
       this.removeEventListener('load', this._noVNCDisplay._resumeRenderQ);
-
       this._noVNCDisplay._scanRenderQ();
     }
   }, {
     key: "_scanRenderQ",
     value: function _scanRenderQ() {
       var ready = true;
-
       while (ready && this._renderQ.length > 0) {
         var a = this._renderQ[0];
-
         switch (a.type) {
           case 'flip':
             this.flip(true);
             break;
-
           case 'copy':
             this.copyImage(a.oldX, a.oldY, a.x, a.y, a.width, a.height, true);
             break;
-
           case 'fill':
             this.fillRect(a.x, a.y, a.width, a.height, a.color, true);
             break;
-
           case 'blit':
             this.blitImage(a.x, a.y, a.width, a.height, a.data, 0, true);
             break;
-
           case 'img':
             if (a.img.complete) {
               if (a.img.width !== a.width || a.img.height !== a.height) {
                 Log.Error("Decoded image has incorrect dimensions. Got " + a.img.width + "x" + a.img.height + ". Expected " + a.width + "x" + a.height + ".");
                 return;
               }
-
               this.drawImage(a.img, a.x, a.y);
             } else {
               a.img._noVNCDisplay = this;
-              a.img.addEventListener('load', this._resumeRenderQ); // We need to wait for this image to 'load'
+              a.img.addEventListener('load', this._resumeRenderQ);
+              // We need to wait for this image to 'load'
               // to keep things in-order
-
               ready = false;
             }
-
             break;
         }
-
         if (ready) {
           this._renderQ.shift();
         }
       }
-
       if (this._renderQ.length === 0 && this._flushing) {
         this._flushing = false;
         this.onflush();
       }
     }
   }]);
-
   return Display;
 }();
-
 exports["default"] = Display;

package/lib/encodings.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.encodingName = encodingName;
 exports.encodings = void 0;
-
 /*
  * noVNC: HTML5 VNC client
  * Copyright (C) 2019 The noVNC Authors
@@ -13,13 +12,16 @@ exports.encodings = void 0;
  *
  * See README.md for usage and integration instructions.
  */
+
 var encodings = {
   encodingRaw: 0,
   encodingCopyRect: 1,
   encodingRRE: 2,
   encodingHextile: 5,
   encodingTight: 7,
+  encodingZRLE: 16,
   encodingTightPNG: -260,
+  encodingJPEG: 21,
   pseudoEncodingQualityLevel9: -23,
   pseudoEncodingQualityLevel0: -32,
   pseudoEncodingDesktopSize: -223,
@@ -37,27 +39,24 @@ var encodings = {
   pseudoEncodingExtendedClipboard: 0xc0a1e5ce
 };
 exports.encodings = encodings;
-
 function encodingName(num) {
   switch (num) {
     case encodings.encodingRaw:
       return "Raw";
-
     case encodings.encodingCopyRect:
       return "CopyRect";
-
     case encodings.encodingRRE:
       return "RRE";
-
     case encodings.encodingHextile:
       return "Hextile";
-
     case encodings.encodingTight:
       return "Tight";
-
+    case encodings.encodingZRLE:
+      return "ZRLE";
     case encodings.encodingTightPNG:
       return "TightPNG";
-
+    case encodings.encodingJPEG:
+      return "JPEG";
     default:
       return "[unknown encoding " + num + "]";
   }

package/lib/inflator.js

@@ -4,36 +4,26 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 var _inflate2 = require("../lib/vendor/pako/lib/zlib/inflate.js");
-
 var _zstream = _interopRequireDefault(require("../lib/vendor/pako/lib/zlib/zstream.js"));
-
 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; }
 var Inflate = /*#__PURE__*/function () {
   function Inflate() {
     _classCallCheck(this, Inflate);
-
     this.strm = new _zstream["default"]();
     this.chunkSize = 1024 * 10 * 10;
     this.strm.output = new Uint8Array(this.chunkSize);
     this.windowBits = 5;
     (0, _inflate2.inflateInit)(this.strm, this.windowBits);
   }
-
   _createClass(Inflate, [{
     key: "setInput",
     value: function setInput(data) {
       if (!data) {
         //FIXME: flush remaining data.
-
         /* eslint-disable camelcase */
         this.strm.input = null;
         this.strm.avail_in = 0;
@@ -55,23 +45,19 @@ var Inflate = /*#__PURE__*/function () {
         this.chunkSize = expected;
         this.strm.output = new Uint8Array(this.chunkSize);
       }
-      /* eslint-disable camelcase */
-
 
+      /* eslint-disable camelcase */
       this.strm.next_out = 0;
       this.strm.avail_out = expected;
       /* eslint-enable camelcase */
 
       var ret = (0, _inflate2.inflate)(this.strm, 0); // Flush argument not used.
-
       if (ret < 0) {
         throw new Error("zlib inflate failed");
       }
-
       if (this.strm.next_out != expected) {
         throw new Error("Incomplete zlib block");
       }
-
       return new Uint8Array(this.strm.output.buffer, 0, this.strm.next_out);
     }
   }, {
@@ -80,8 +66,6 @@ var Inflate = /*#__PURE__*/function () {
       (0, _inflate2.inflateReset)(this.strm);
     }
   }]);
-
   return Inflate;
 }();
-
 exports["default"] = Inflate;