@novnc/novnc 1.3.0-g1d148a8 → 1.3.0-g2d559fb

package/core/display.js

@@ -224,6 +224,18 @@ export default class Display {
         this.viewportChangePos(0, 0);
     }
 
+    getImageData() {
+        return this._drawCtx.getImageData(0, 0, this.width, this.height);
+    }
+
+    toDataURL(type, encoderOptions) {
+        return this._backbuffer.toDataURL(type, encoderOptions);
+    }
+
+    toBlob(callback, type, quality) {
+        return this._backbuffer.toBlob(callback, type, quality);
+    }
+
     // Track what parts of the visible canvas that need updating
     _damage(x, y, w, h) {
         if (x < this._damageBounds.left) {

package/core/input/keyboard.js

@@ -153,6 +153,16 @@ export default class Keyboard {
             keysym = this._keyDownList[code];
         }
 
+        // macOS doesn't send proper key releases if a key is pressed
+        // while meta is held down
+        if ((browser.isMac() || browser.isIOS()) &&
+            (e.metaKey && code !== 'MetaLeft' && code !== 'MetaRight')) {
+            this._sendKeyEvent(keysym, code, true);
+            this._sendKeyEvent(keysym, code, false);
+            stopEvent(e);
+            return;
+        }
+
         // macOS doesn't send proper key events for modifiers, only
         // state change events. That gets extra confusing for CapsLock
         // which toggles on each press, but not on release. So pretend

package/core/rfb.js

@@ -490,16 +490,45 @@ export default class RFB extends EventTargetMixin {
             this._clipboardText = text;
             RFB.messages.extendedClipboardNotify(this._sock, [extendedClipboardFormatText]);
         } else {
-            let data = new Uint8Array(text.length);
-            for (let i = 0; i < text.length; i++) {
-                // FIXME: text can have values outside of Latin1/Uint8
-                data[i] = text.charCodeAt(i);
+            let length, i;
+            let data;
+
+            length = 0;
+            // eslint-disable-next-line no-unused-vars
+            for (let codePoint of text) {
+                length++;
+            }
+
+            data = new Uint8Array(length);
+
+            i = 0;
+            for (let codePoint of text) {
+                let code = codePoint.codePointAt(0);
+
+                /* Only ISO 8859-1 is supported */
+                if (code > 0xff) {
+                    code = 0x3f; // '?'
+                }
+
+                data[i++] = code;
             }
 
             RFB.messages.clientCutText(this._sock, data);
         }
     }
 
+    getImageData() {
+        return this._display.getImageData();
+    }
+
+    toDataURL(type, encoderOptions) {
+        return this._display.toDataURL(type, encoderOptions);
+    }
+
+    toBlob(callback, type, quality) {
+        return this._display.toBlob(callback, type, quality);
+    }
+
     // ===== PRIVATE METHODS =====
 
     _connect() {

package/docs/API.md

@@ -155,6 +155,15 @@ protocol stream.
 [`RFB.clipboardPasteFrom()`](#rfbclipboardpastefrom)
   - Send clipboard contents to server.
 
+[`RFB.getImageData()`](#rfbgetimagedata)
+  - Return the current content of the screen as an ImageData array.
+
+[`RFB.toDataURL()`](#rfbtodataurl)
+  - Return the current content of the screen as data-url encoded image file.
+
+[`RFB.toBlob()`](#rfbtoblob)
+  - Return the current content of the screen as Blob encoded image file.
+
 ### Details
 
 #### RFB()
@@ -423,3 +432,55 @@ to the remote server.
 
 **`text`**
   - A `DOMString` specifying the clipboard data to send.
+
+#### RFB.getImageData()
+
+The `RFB.getImageData()` method is used to return the current content of the
+screen encoded as [`ImageData`](https://developer.mozilla.org/en-US/docs/Web/API/ImageData).
+
+##### Syntax
+
+  RFB.getImageData();
+
+#### RFB.toDataURL()
+
+The `RFB.toDataURL()` method is used to return the current content of the
+screen encoded as a data URL that could for example be put in the `src` attribute
+of an `img` tag.
+
+##### Syntax
+
+  RFB.toDataURL();
+  RFB.toDataURL(type);
+  RFB.toDataURL(type, encoderOptions);
+
+###### Parameters
+
+**`type`** *Optional*
+  - A string indicating the requested MIME type of the image
+
+**`encoderOptions`** *Optional*
+  - A number between 0 and 1 indicating the image quality.
+
+#### RFB.toBlob()
+
+The `RFB.toBlob()` method is used to return the current content of the
+screen encoded as [`Blob`](https://developer.mozilla.org/en-US/docs/Web/API/Blob).
+
+##### Syntax
+
+  RFB.toDataURL(callback);
+  RFB.toDataURL(callback, type);
+  RFB.toDataURL(callback, type, quality);
+
+###### Parameters
+
+**`callback`**
+  - A callback function which will receive the resulting [`Blob`](https://developer.mozilla.org/en-US/docs/Web/API/Blob)
+    as the single argument
+
+**`type`** *Optional*
+  - A string indicating the requested MIME type of the image
+
+**`encoderOptions`** *Optional*
+  - A number between 0 and 1 indicating the image quality.

package/lib/base64.js

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

package/lib/decoders/copyrect.js

@@ -4,13 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
-
 /*
  * noVNC: HTML5 VNC client
  * Copyright (C) 2019 The noVNC Authors
@@ -23,27 +19,21 @@ var CopyRectDecoder = /*#__PURE__*/function () {
   function CopyRectDecoder() {
     _classCallCheck(this, CopyRectDecoder);
   }
-
   _createClass(CopyRectDecoder, [{
     key: "decodeRect",
     value: function decodeRect(x, y, width, height, sock, display, depth) {
       if (sock.rQwait("COPYRECT", 4)) {
         return false;
       }
-
       var deltaX = sock.rQshift16();
       var deltaY = sock.rQshift16();
-
       if (width === 0 || height === 0) {
         return true;
       }
-
       display.copyImage(deltaX, deltaY, x, y, width, height);
       return true;
     }
   }]);
-
   return CopyRectDecoder;
 }();
-
 exports["default"] = CopyRectDecoder;

package/lib/decoders/hextile.js

@@ -1,33 +1,23 @@
 "use strict";
 
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 var Log = _interopRequireWildcard(require("../util/logging.js"));
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
-
 var HextileDecoder = /*#__PURE__*/function () {
   function HextileDecoder() {
     _classCallCheck(this, HextileDecoder);
-
     this._tiles = 0;
     this._lastsubencoding = 0;
     this._tileBuffer = new Uint8Array(16 * 16 * 4);
   }
-
   _createClass(HextileDecoder, [{
     key: "decodeRect",
     value: function decodeRect(x, y, width, height, sock, display, depth) {
@@ -37,31 +27,27 @@ var HextileDecoder = /*#__PURE__*/function () {
         this._totalTiles = this._tilesX * this._tilesY;
         this._tiles = this._totalTiles;
       }
-
       while (this._tiles > 0) {
         var bytes = 1;
-
         if (sock.rQwait("HEXTILE", bytes)) {
           return false;
         }
-
         var rQ = sock.rQ;
         var rQi = sock.rQi;
         var subencoding = rQ[rQi]; // Peek
-
         if (subencoding > 30) {
           // Raw
           throw new Error("Illegal hextile subencoding (subencoding: " + subencoding + ")");
         }
-
         var currTile = this._totalTiles - this._tiles;
         var tileX = currTile % this._tilesX;
         var tileY = Math.floor(currTile / this._tilesX);
         var tx = x + tileX * 16;
         var ty = y + tileY * 16;
         var tw = Math.min(16, x + width - tx);
-        var th = Math.min(16, y + height - ty); // Figure out how much we are expecting
+        var th = Math.min(16, y + height - ty);
 
+        // Figure out how much we are expecting
         if (subencoding & 0x01) {
           // Raw
           bytes += tw * th * 4;
@@ -70,12 +56,10 @@ var HextileDecoder = /*#__PURE__*/function () {
             // Background
             bytes += 4;
           }
-
           if (subencoding & 0x04) {
             // Foreground
             bytes += 4;
           }
-
           if (subencoding & 0x08) {
             // AnySubrects
             bytes++; // Since we aren't shifting it off
@@ -83,9 +67,7 @@ var HextileDecoder = /*#__PURE__*/function () {
             if (sock.rQwait("HEXTILE", bytes)) {
               return false;
             }
-
             var subrects = rQ[rQi + bytes - 1]; // Peek
-
             if (subencoding & 0x10) {
               // SubrectsColoured
               bytes += subrects * (4 + 2);
@@ -94,14 +76,12 @@ var HextileDecoder = /*#__PURE__*/function () {
             }
           }
         }
-
         if (sock.rQwait("HEXTILE", bytes)) {
           return false;
-        } // We know the encoding and have a whole tile
-
+        }
 
+        // We know the encoding and have a whole tile
         rQi++;
-
         if (subencoding === 0) {
           if (this._lastsubencoding & 0x01) {
             // Weird: ignore blanks are RAW
@@ -111,12 +91,11 @@ var HextileDecoder = /*#__PURE__*/function () {
           }
         } else if (subencoding & 0x01) {
           // Raw
-          var pixels = tw * th; // Max sure the image is fully opaque
-
+          var pixels = tw * th;
+          // Max sure the image is fully opaque
           for (var i = 0; i < pixels; i++) {
             rQ[rQi + i * 4 + 3] = 255;
           }
-
           display.blitImage(tx, ty, tw, th, rQ, rQi);
           rQi += bytes - 1;
         } else {
@@ -125,23 +104,18 @@ var HextileDecoder = /*#__PURE__*/function () {
             this._background = [rQ[rQi], rQ[rQi + 1], rQ[rQi + 2], rQ[rQi + 3]];
             rQi += 4;
           }
-
           if (subencoding & 0x04) {
             // Foreground
             this._foreground = [rQ[rQi], rQ[rQi + 1], rQ[rQi + 2], rQ[rQi + 3]];
             rQi += 4;
           }
-
           this._startTile(tx, ty, tw, th, this._background);
-
           if (subencoding & 0x08) {
             // AnySubrects
             var _subrects = rQ[rQi];
             rQi++;
-
             for (var s = 0; s < _subrects; s++) {
               var color = void 0;
-
               if (subencoding & 0x10) {
                 // SubrectsColoured
                 color = [rQ[rQi], rQ[rQi + 1], rQ[rQi + 2], rQ[rQi + 3]];
@@ -149,7 +123,6 @@ var HextileDecoder = /*#__PURE__*/function () {
               } else {
                 color = this._foreground;
               }
-
               var xy = rQ[rQi];
               rQi++;
               var sx = xy >> 4;
@@ -158,22 +131,19 @@ var HextileDecoder = /*#__PURE__*/function () {
               rQi++;
               var sw = (wh >> 4) + 1;
               var sh = (wh & 0x0f) + 1;
-
               this._subTile(sx, sy, sw, sh, color);
             }
           }
-
           this._finishTile(display);
         }
-
         sock.rQi = rQi;
         this._lastsubencoding = subencoding;
         this._tiles--;
       }
-
       return true;
-    } // start updating a tile
+    }
 
+    // start updating a tile
   }, {
     key: "_startTile",
     value: function _startTile(x, y, width, height, color) {
@@ -185,15 +155,15 @@ var HextileDecoder = /*#__PURE__*/function () {
       var green = color[1];
       var blue = color[2];
       var data = this._tileBuffer;
-
       for (var i = 0; i < width * height * 4; i += 4) {
         data[i] = red;
         data[i + 1] = green;
         data[i + 2] = blue;
         data[i + 3] = 255;
       }
-    } // update sub-rectangle of the current tile
+    }
 
+    // update sub-rectangle of the current tile
   }, {
     key: "_subTile",
     value: function _subTile(x, y, w, h, color) {
@@ -204,7 +174,6 @@ var HextileDecoder = /*#__PURE__*/function () {
       var yend = y + h;
       var data = this._tileBuffer;
       var width = this._tileW;
-
       for (var j = y; j < yend; j++) {
         for (var i = x; i < xend; i++) {
           var p = (i + j * width) * 4;
@@ -214,16 +183,15 @@ var HextileDecoder = /*#__PURE__*/function () {
           data[p + 3] = 255;
         }
       }
-    } // draw the current tile to the screen
+    }
 
+    // draw the current tile to the screen
   }, {
     key: "_finishTile",
     value: function _finishTile(display) {
       display.blitImage(this._tileX, this._tileY, this._tileW, this._tileH, this._tileBuffer, 0);
     }
   }]);
-
   return HextileDecoder;
 }();
-
 exports["default"] = HextileDecoder;