@novnc/novnc 1.3.0 → 1.4.0-beta

package/lib/vendor/pako/lib/zlib/zstream.js

@@ -4,43 +4,27 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = ZStream;
-
 function ZStream() {
   /* next input byte */
   this.input = null; // JS specific, because we have no pointers
-
   this.next_in = 0;
   /* number of bytes available at input */
-
   this.avail_in = 0;
   /* total number of input bytes read so far */
-
   this.total_in = 0;
   /* next output byte should be put there */
-
   this.output = null; // JS specific, because we have no pointers
-
   this.next_out = 0;
   /* remaining free space at output */
-
   this.avail_out = 0;
   /* total number of bytes output so far */
-
   this.total_out = 0;
   /* last error message, NULL if no error */
-
-  this.msg = ''
-  /*Z_NULL*/
-  ;
+  this.msg = '' /*Z_NULL*/;
   /* not visible by applications */
-
   this.state = null;
   /* best guess about the data type: binary or text */
-
-  this.data_type = 2
-  /*Z_UNKNOWN*/
-  ;
+  this.data_type = 2 /*Z_UNKNOWN*/;
   /* adler32 value of the uncompressed data */
-
   this.adler = 0;
 }

package/lib/websock.js

@@ -1,43 +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); }
-
 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 _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); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 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 _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, _toPropertyKey(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; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 // this has performance issues in some versions Chromium, and
 // doesn't gain a tremendous amount of performance increase in Firefox
 // at the moment.  It may be valuable to turn it on in the future.
 var MAX_RQ_GROW_SIZE = 40 * 1024 * 1024; // 40 MiB
+
 // Constants pulled from RTCDataChannelState enum
 // https://developer.mozilla.org/en-US/docs/Web/API/RTCDataChannel/readyState#RTCDataChannelState_enum
-
 var DataChannel = {
   CONNECTING: "connecting",
   OPEN: "open",
@@ -49,28 +37,23 @@ var ReadyStates = {
   OPEN: [WebSocket.OPEN, DataChannel.OPEN],
   CLOSING: [WebSocket.CLOSING, DataChannel.CLOSING],
   CLOSED: [WebSocket.CLOSED, DataChannel.CLOSED]
-}; // Properties a raw channel must have, WebSocket and RTCDataChannel are two examples
+};
 
+// Properties a raw channel must have, WebSocket and RTCDataChannel are two examples
 var rawChannelProps = ["send", "close", "binaryType", "onerror", "onmessage", "onopen", "protocol", "readyState"];
-
 var Websock = /*#__PURE__*/function () {
   function Websock() {
     _classCallCheck(this, Websock);
-
     this._websocket = null; // WebSocket or RTCDataChannel object
 
     this._rQi = 0; // Receive queue index
-
     this._rQlen = 0; // Next write position in the receive queue
-
     this._rQbufferSize = 1024 * 1024 * 4; // Receive queue buffer size (4 MiB)
     // called in init: this._rQ = new Uint8Array(this._rQbufferSize);
-
     this._rQ = null; // Receive queue
 
     this._sQbufferSize = 1024 * 10; // 10 KiB
     // called in init: this._sQ = new Uint8Array(this._sQbufferSize);
-
     this._sQlen = 0;
     this._sQ = null; // Send queue
 
@@ -80,20 +63,17 @@ var Websock = /*#__PURE__*/function () {
       close: function close() {},
       error: function error() {}
     };
-  } // Getters and Setters
-
+  }
 
+  // Getters and Setters
   _createClass(Websock, [{
     key: "readyState",
     get: function get() {
       var subState;
-
       if (this._websocket === null) {
         return "unused";
       }
-
       subState = this._websocket.readyState;
-
       if (ReadyStates.CONNECTING.includes(subState)) {
         return "connecting";
       } else if (ReadyStates.OPEN.includes(subState)) {
@@ -103,7 +83,6 @@ var Websock = /*#__PURE__*/function () {
       } else if (ReadyStates.CLOSED.includes(subState)) {
         return "closed";
       }
-
       return "unknown";
     }
   }, {
@@ -123,8 +102,9 @@ var Websock = /*#__PURE__*/function () {
     },
     set: function set(val) {
       this._rQi = val;
-    } // Receive Queue
+    }
 
+    // Receive Queue
   }, {
     key: "rQlen",
     get: function get() {
@@ -154,17 +134,16 @@ var Websock = /*#__PURE__*/function () {
     key: "rQshift32",
     value: function rQshift32() {
       return this._rQshift(4);
-    } // TODO(directxman12): test performance with these vs a DataView
+    }
 
+    // TODO(directxman12): test performance with these vs a DataView
   }, {
     key: "_rQshift",
     value: function _rQshift(bytes) {
       var res = 0;
-
       for (var _byte = bytes - 1; _byte >= 0; _byte--) {
         res += this._rQ[this._rQi++] << _byte * 8;
       }
-
       return res;
     }
   }, {
@@ -173,14 +152,12 @@ var Websock = /*#__PURE__*/function () {
       if (typeof len === 'undefined') {
         len = this.rQlen;
       }
-
-      var str = ""; // Handle large arrays in steps to avoid long strings on the stack
-
+      var str = "";
+      // Handle large arrays in steps to avoid long strings on the stack
       for (var i = 0; i < len; i += 4096) {
         var part = this.rQshiftBytes(Math.min(4096, len - i));
         str += String.fromCharCode.apply(null, part);
       }
-
       return str;
     }
   }, {
@@ -189,7 +166,6 @@ var Websock = /*#__PURE__*/function () {
       if (typeof len === 'undefined') {
         len = this.rQlen;
       }
-
       this._rQi += len;
       return new Uint8Array(this._rQ.buffer, this._rQi - len, len);
     }
@@ -198,9 +174,8 @@ var Websock = /*#__PURE__*/function () {
     value: function rQshiftTo(target, len) {
       if (len === undefined) {
         len = this.rQlen;
-      } // TODO: make this just use set with views when using a ArrayBuffer to store the rQ
-
-
+      }
+      // TODO: make this just use set with views when using a ArrayBuffer to store the rQ
       target.set(new Uint8Array(this._rQ.buffer, this._rQi, len));
       this._rQi += len;
     }
@@ -209,10 +184,11 @@ var Websock = /*#__PURE__*/function () {
     value: function rQslice(start) {
       var end = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : this.rQlen;
       return new Uint8Array(this._rQ.buffer, this._rQi + start, end - start);
-    } // Check to see if we must wait for 'num' bytes (default to FBU.bytes)
+    }
+
+    // Check to see if we must wait for 'num' bytes (default to FBU.bytes)
     // to be available in the receive queue. Return true if we need to
     // wait (and possibly print a debug message), otherwise false.
-
   }, {
     key: "rQwait",
     value: function rQwait(msg, num, goback) {
@@ -221,22 +197,20 @@ var Websock = /*#__PURE__*/function () {
           if (this._rQi < goback) {
             throw new Error("rQwait cannot backup " + goback + " bytes");
           }
-
           this._rQi -= goback;
         }
-
         return true; // true means need more data
       }
 
       return false;
-    } // Send Queue
+    }
 
+    // Send Queue
   }, {
     key: "flush",
     value: function flush() {
       if (this._sQlen > 0 && this.readyState === 'open') {
         this._websocket.send(this._encodeMessage());
-
         this._sQlen = 0;
       }
     }
@@ -244,7 +218,6 @@ var Websock = /*#__PURE__*/function () {
     key: "send",
     value: function send(arr) {
       this._sQ.set(arr, this._sQlen);
-
       this._sQlen += arr.length;
       this.flush();
     }
@@ -254,8 +227,9 @@ var Websock = /*#__PURE__*/function () {
       this.send(str.split('').map(function (chr) {
         return chr.charCodeAt(0);
       }));
-    } // Event Handlers
+    }
 
+    // Event Handlers
   }, {
     key: "off",
     value: function off(evt) {
@@ -276,7 +250,6 @@ var Websock = /*#__PURE__*/function () {
     key: "init",
     value: function init() {
       this._allocateBuffers();
-
       this._rQi = 0;
       this._websocket = null;
     }
@@ -289,48 +262,35 @@ var Websock = /*#__PURE__*/function () {
     key: "attach",
     value: function attach(rawChannel) {
       var _this = this;
+      this.init();
 
-      this.init(); // Must get object and class methods to be compatible with the tests.
-
+      // Must get object and class methods to be compatible with the tests.
       var channelProps = [].concat(_toConsumableArray(Object.keys(rawChannel)), _toConsumableArray(Object.getOwnPropertyNames(Object.getPrototypeOf(rawChannel))));
-
       for (var i = 0; i < rawChannelProps.length; i++) {
         var prop = rawChannelProps[i];
-
         if (channelProps.indexOf(prop) < 0) {
           throw new Error('Raw channel missing property: ' + prop);
         }
       }
-
       this._websocket = rawChannel;
       this._websocket.binaryType = "arraybuffer";
       this._websocket.onmessage = this._recvMessage.bind(this);
-
       this._websocket.onopen = function () {
         Log.Debug('>> WebSock.onopen');
-
         if (_this._websocket.protocol) {
           Log.Info("Server choose sub-protocol: " + _this._websocket.protocol);
         }
-
         _this._eventHandlers.open();
-
         Log.Debug("<< WebSock.onopen");
       };
-
       this._websocket.onclose = function (e) {
         Log.Debug(">> WebSock.onclose");
-
         _this._eventHandlers.close(e);
-
         Log.Debug("<< WebSock.onclose");
       };
-
       this._websocket.onerror = function (e) {
         Log.Debug(">> WebSock.onerror: " + e);
-
         _this._eventHandlers.error(e);
-
         Log.Debug("<< WebSock.onerror: " + e);
       };
     }
@@ -340,26 +300,26 @@ var Websock = /*#__PURE__*/function () {
       if (this._websocket) {
         if (this.readyState === 'connecting' || this.readyState === 'open') {
           Log.Info("Closing WebSocket connection");
-
           this._websocket.close();
         }
-
         this._websocket.onmessage = function () {};
       }
-    } // private methods
+    }
 
+    // private methods
   }, {
     key: "_encodeMessage",
     value: function _encodeMessage() {
       // Put in a binary arraybuffer
       // according to the spec, you can send ArrayBufferViews with the send method
       return new Uint8Array(this._sQ.buffer, 0, this._sQlen);
-    } // We want to move all the unread data to the start of the queue,
+    }
+
+    // We want to move all the unread data to the start of the queue,
     // e.g. compacting.
     // The function also expands the receive que if needed, and for
     // performance reasons we combine these two actions to avoid
     // unneccessary copying.
-
   }, {
     key: "_expandCompactRQ",
     value: function _expandCompactRQ(minFit) {
@@ -367,56 +327,47 @@ var Websock = /*#__PURE__*/function () {
       // instead of resizing
       var requiredBufferSize = (this._rQlen - this._rQi + minFit) * 8;
       var resizeNeeded = this._rQbufferSize < requiredBufferSize;
-
       if (resizeNeeded) {
         // Make sure we always *at least* double the buffer size, and have at least space for 8x
         // the current amount of data
         this._rQbufferSize = Math.max(this._rQbufferSize * 2, requiredBufferSize);
-      } // we don't want to grow unboundedly
-
+      }
 
+      // we don't want to grow unboundedly
       if (this._rQbufferSize > MAX_RQ_GROW_SIZE) {
         this._rQbufferSize = MAX_RQ_GROW_SIZE;
-
         if (this._rQbufferSize - this.rQlen < minFit) {
           throw new Error("Receive Queue buffer exceeded " + MAX_RQ_GROW_SIZE + " bytes, and the new message could not fit");
         }
       }
-
       if (resizeNeeded) {
         var oldRQbuffer = this._rQ.buffer;
         this._rQ = new Uint8Array(this._rQbufferSize);
-
         this._rQ.set(new Uint8Array(oldRQbuffer, this._rQi, this._rQlen - this._rQi));
       } else {
         this._rQ.copyWithin(0, this._rQi, this._rQlen);
       }
-
       this._rQlen = this._rQlen - this._rQi;
       this._rQi = 0;
-    } // push arraybuffer values onto the end of the receive que
+    }
 
+    // push arraybuffer values onto the end of the receive que
   }, {
     key: "_DecodeMessage",
     value: function _DecodeMessage(data) {
       var u8 = new Uint8Array(data);
-
       if (u8.length > this._rQbufferSize - this._rQlen) {
         this._expandCompactRQ(u8.length);
       }
-
       this._rQ.set(u8, this._rQlen);
-
       this._rQlen += u8.length;
     }
   }, {
     key: "_recvMessage",
     value: function _recvMessage(e) {
       this._DecodeMessage(e.data);
-
       if (this.rQlen > 0) {
         this._eventHandlers.message();
-
         if (this._rQlen == this._rQi) {
           // All data has now been processed, this means we
           // can reset the receive queue.
@@ -428,8 +379,6 @@ var Websock = /*#__PURE__*/function () {
       }
     }
   }]);
-
   return Websock;
 }();
-
 exports["default"] = Websock;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@novnc/novnc",
-  "version": "1.3.0",
+  "version": "1.4.0-beta",
   "description": "An HTML5 VNC client",
   "browser": "lib/rfb",
   "directories": {
@@ -21,7 +21,7 @@
   "scripts": {
     "lint": "eslint app core po/po2js po/xgettext-html tests utils",
     "test": "karma start karma.conf.js",
-    "prepublish": "node ./utils/use_require.js --clean"
+    "prepublish": "node ./utils/convert.js --clean"
   },
   "repository": {
     "type": "git",
@@ -38,39 +38,36 @@
   },
   "homepage": "https://github.com/novnc/noVNC",
   "devDependencies": {
-    "@babel/core": "*",
-    "@babel/plugin-syntax-dynamic-import": "*",
-    "@babel/plugin-transform-modules-commonjs": "*",
-    "@babel/preset-env": "*",
-    "@babel/cli": "*",
-    "babel-plugin-import-redirect": "*",
-    "browserify": "*",
-    "babelify": "*",
-    "core-js": "*",
-    "chai": "*",
-    "commander": "*",
-    "es-module-loader": "*",
-    "eslint": "*",
-    "fs-extra": "*",
-    "jsdom": "*",
-    "karma": "*",
-    "karma-mocha": "*",
-    "karma-chrome-launcher": "*",
-    "@chiragrupani/karma-chromium-edge-launcher": "*",
-    "karma-firefox-launcher": "*",
-    "karma-ie-launcher": "*",
-    "karma-mocha-reporter": "*",
-    "karma-safari-launcher": "*",
-    "karma-script-launcher": "*",
-    "karma-sinon-chai": "*",
-    "mocha": "*",
-    "node-getopt": "*",
-    "po2json": "*",
-    "requirejs": "*",
-    "rollup": "*",
-    "rollup-plugin-node-resolve": "*",
-    "sinon": "*",
-    "sinon-chai": "*"
+    "@babel/core": "latest",
+    "@babel/plugin-syntax-dynamic-import": "latest",
+    "@babel/plugin-transform-modules-commonjs": "latest",
+    "@babel/preset-env": "latest",
+    "@babel/cli": "latest",
+    "babel-plugin-import-redirect": "latest",
+    "browserify": "latest",
+    "babelify": "latest",
+    "core-js": "latest",
+    "chai": "latest",
+    "commander": "latest",
+    "es-module-loader": "latest",
+    "eslint": "latest",
+    "fs-extra": "latest",
+    "jsdom": "latest",
+    "karma": "latest",
+    "karma-mocha": "latest",
+    "karma-chrome-launcher": "latest",
+    "@chiragrupani/karma-chromium-edge-launcher": "latest",
+    "karma-firefox-launcher": "latest",
+    "karma-ie-launcher": "latest",
+    "karma-mocha-reporter": "latest",
+    "karma-safari-launcher": "latest",
+    "karma-script-launcher": "latest",
+    "karma-sinon-chai": "latest",
+    "mocha": "latest",
+    "node-getopt": "latest",
+    "po2json": "latest",
+    "sinon": "latest",
+    "sinon-chai": "latest"
   },
   "dependencies": {},
   "keywords": [