@novnc/novnc 1.5.0-g7fcf9dc → 1.5.0-gbbb6a5b

package/README.md

@@ -66,7 +66,7 @@ profits such as:
   RSA-AES, Tight, VeNCrypt Plain, XVP, Apple's Diffie-Hellman,
   UltraVNC's MSLogonII
 * Supported VNC encodings: raw, copyrect, rre, hextile, tight, tightPNG,
-  ZRLE, JPEG
+  ZRLE, JPEG, Zlib
 * Supports scaling, clipping and resizing the desktop
 * Local cursor rendering
 * Clipboard copy/paste with full Unicode support

package/lib/decoders/zlib.js

@@ -0,0 +1,57 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+var _inflator = _interopRequireDefault(require("../inflator.js"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
+function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
+function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); } /*
+ * noVNC: HTML5 VNC client
+ * Copyright (C) 2024 The noVNC Authors
+ * Licensed under MPL 2.0 (see LICENSE.txt)
+ *
+ * See README.md for usage and integration instructions.
+ *
+ */
+var ZlibDecoder = exports["default"] = /*#__PURE__*/function () {
+  function ZlibDecoder() {
+    _classCallCheck(this, ZlibDecoder);
+    this._zlib = new _inflator["default"]();
+    this._length = 0;
+  }
+  return _createClass(ZlibDecoder, [{
+    key: "decodeRect",
+    value: function decodeRect(x, y, width, height, sock, display, depth) {
+      if (width === 0 || height === 0) {
+        return true;
+      }
+      if (this._length === 0) {
+        if (sock.rQwait("ZLIB", 4)) {
+          return false;
+        }
+        this._length = sock.rQshift32();
+      }
+      if (sock.rQwait("ZLIB", this._length)) {
+        return false;
+      }
+      var data = new Uint8Array(sock.rQshiftBytes(this._length, false));
+      this._length = 0;
+      this._zlib.setInput(data);
+      data = this._zlib.inflate(width * height * 4);
+      this._zlib.setInput(null);
+
+      // Max sure the image is fully opaque
+      for (var i = 0; i < width * height; i++) {
+        data[i * 4 + 3] = 255;
+      }
+      display.blitImage(x, y, width, height, data, 0);
+      return true;
+    }
+  }]);
+}();

package/lib/encodings.js

@@ -18,6 +18,7 @@ var encodings = exports.encodings = {
   encodingCopyRect: 1,
   encodingRRE: 2,
   encodingHextile: 5,
+  encodingZlib: 6,
   encodingTight: 7,
   encodingZRLE: 16,
   encodingTightPNG: -260,
@@ -49,6 +50,8 @@ function encodingName(num) {
       return "RRE";
     case encodings.encodingHextile:
       return "Hextile";
+    case encodings.encodingZlib:
+      return "Zlib";
     case encodings.encodingTight:
       return "Tight";
     case encodings.encodingZRLE:

package/lib/input/keyboard.js

@@ -203,7 +203,7 @@ var Keyboard = exports["default"] = /*#__PURE__*/function () {
       // Possible start of AltGr sequence? (see above)
       if (code === "ControlLeft" && browser.isWindows() && !("ControlLeft" in this._keyDownList)) {
         this._altGrArmed = true;
-        this._altGrTimeout = setTimeout(this._handleAltGrTimeout.bind(this), 100);
+        this._altGrTimeout = setTimeout(this._interruptAltGrSequence.bind(this), 100);
         this._altGrCtrlTime = e.timeStamp;
         return;
       }
@@ -217,11 +217,7 @@ var Keyboard = exports["default"] = /*#__PURE__*/function () {
 
       // We can't get a release in the middle of an AltGr sequence, so
       // abort that detection
-      if (this._altGrArmed) {
-        this._altGrArmed = false;
-        clearTimeout(this._altGrTimeout);
-        this._sendKeyEvent(_keysym["default"].XK_Control_L, "ControlLeft", true);
-      }
+      this._interruptAltGrSequence();
 
       // See comment in _handleKeyDown()
       if ((browser.isMac() || browser.isIOS()) && code === 'CapsLock') {
@@ -244,16 +240,21 @@ var Keyboard = exports["default"] = /*#__PURE__*/function () {
       }
     }
   }, {
-    key: "_handleAltGrTimeout",
-    value: function _handleAltGrTimeout() {
-      this._altGrArmed = false;
-      clearTimeout(this._altGrTimeout);
-      this._sendKeyEvent(_keysym["default"].XK_Control_L, "ControlLeft", true);
+    key: "_interruptAltGrSequence",
+    value: function _interruptAltGrSequence() {
+      if (this._altGrArmed) {
+        this._altGrArmed = false;
+        clearTimeout(this._altGrTimeout);
+        this._sendKeyEvent(_keysym["default"].XK_Control_L, "ControlLeft", true);
+      }
     }
   }, {
     key: "_allKeysUp",
     value: function _allKeysUp() {
       Log.Debug(">> Keyboard.allKeysUp");
+
+      // Prevent control key being processed after losing focus.
+      this._interruptAltGrSequence();
       for (var code in this._keyDownList) {
         this._sendKeyEvent(this._keyDownList[code], code, false);
       }

package/lib/rfb.js

@@ -28,6 +28,7 @@ var _raw = _interopRequireDefault(require("./decoders/raw.js"));
 var _copyrect = _interopRequireDefault(require("./decoders/copyrect.js"));
 var _rre = _interopRequireDefault(require("./decoders/rre.js"));
 var _hextile = _interopRequireDefault(require("./decoders/hextile.js"));
+var _zlib = _interopRequireDefault(require("./decoders/zlib.js"));
 var _tight = _interopRequireDefault(require("./decoders/tight.js"));
 var _tightpng = _interopRequireDefault(require("./decoders/tightpng.js"));
 var _zrle = _interopRequireDefault(require("./decoders/zrle.js"));
@@ -263,6 +264,7 @@ var RFB = exports["default"] = /*#__PURE__*/function (_EventTargetMixin) {
     _this._decoders[_encodings.encodings.encodingCopyRect] = new _copyrect["default"]();
     _this._decoders[_encodings.encodings.encodingRRE] = new _rre["default"]();
     _this._decoders[_encodings.encodings.encodingHextile] = new _hextile["default"]();
+    _this._decoders[_encodings.encodings.encodingZlib] = new _zlib["default"]();
     _this._decoders[_encodings.encodings.encodingTight] = new _tight["default"]();
     _this._decoders[_encodings.encodings.encodingTightPNG] = new _tightpng["default"]();
     _this._decoders[_encodings.encodings.encodingZRLE] = new _zrle["default"]();
@@ -2213,6 +2215,7 @@ var RFB = exports["default"] = /*#__PURE__*/function (_EventTargetMixin) {
         encs.push(_encodings.encodings.encodingJPEG);
         encs.push(_encodings.encodings.encodingHextile);
         encs.push(_encodings.encodings.encodingRRE);
+        encs.push(_encodings.encodings.encodingZlib);
       }
       encs.push(_encodings.encodings.encodingRaw);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@novnc/novnc",
-  "version": "1.5.0-g7fcf9dc",
+  "version": "1.5.0-gbbb6a5b",
   "description": "An HTML5 VNC client",
   "browser": "lib/rfb",
   "directories": {
@@ -55,7 +55,6 @@
     "karma-mocha-reporter": "latest",
     "karma-safari-launcher": "latest",
     "karma-script-launcher": "latest",
-    "karma-sinon-chai": "latest",
     "mocha": "latest",
     "node-getopt": "latest",
     "po2json": "latest",