jcarr
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #488 from kanaka/feature/more-perf-improvements 

Performance Improvements
This commit is contained in:
Solly 2015-08-14 11:56:57 -04:00
parent a825582196 f00193e08f
commit abf2b09ea7
26 changed files with 3316 additions and 1056 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -1,3 +0,0 @@
[submodule "include/web-socket-js-project"]
path = include/web-socket-js-project
url = https://github.com/gimite/web-socket-js.git

7
LICENSE.txt
View File

@ -51,15 +51,15 @@ licenses (all MPL 2.0 compatible):
include/jsunzip.js : zlib/libpng license include/jsunzip.js : zlib/libpng license
include/web-socket-js/ : New BSD license (3-clause). Source code at
http://github.com/gimite/web-socket-js
include/chrome-app/tcp-stream.js include/chrome-app/tcp-stream.js
: Apache 2.0 license : Apache 2.0 license
utils/websockify utils/websockify
utils/websocket.py : LGPL 3 utils/websocket.py : LGPL 3
utils/inflator.partial.js
include/inflator.js : MIT (for pako)
The following license texts are included: The following license texts are included:
docs/LICENSE.MPL-2.0 docs/LICENSE.MPL-2.0
@ -70,6 +70,7 @@ The following license texts are included:
docs/LICENSE.BSD-2-Clause (Simplified BSD / FreeBSD) docs/LICENSE.BSD-2-Clause (Simplified BSD / FreeBSD)
docs/LICENSE.zlib docs/LICENSE.zlib
docs/LICENSE.Apache-2.0 docs/LICENSE.Apache-2.0
docs/LICENSE.pako
Or alternatively the license texts may be found here: Or alternatively the license texts may be found here:

10
README.md
View File

@ -69,11 +69,7 @@ See more screenshots <a href="http://kanaka.github.com/noVNC/screenshots.html">h
* HTML5 Canvas (with createImageData): Chrome, Firefox 3.6+, iOS * HTML5 Canvas (with createImageData): Chrome, Firefox 3.6+, iOS
Safari, Opera 11+, Internet Explorer 9+, etc. Safari, Opera 11+, Internet Explorer 9+, etc.
* HTML5 WebSockets: For browsers that do not have builtin * HTML5 WebSockets and Typed Arrays
WebSockets support, the project includes
<a href="http://github.com/gimite/web-socket-js">web-socket-js</a>,
a WebSockets emulator using Adobe Flash. iOS 4.2+ has built-in
WebSocket support.
* Fast Javascript Engine: this is not strictly a requirement, but * Fast Javascript Engine: this is not strictly a requirement, but
without a fast Javascript engine, noVNC might be painfully slow. without a fast Javascript engine, noVNC might be painfully slow.
@ -130,9 +126,7 @@ use a WebSockets to TCP socket proxy. There is a python proxy included
* tight encoding : Michael Tinglof (Mercuri.ca) * tight encoding : Michael Tinglof (Mercuri.ca)
* Included libraries: * Included libraries:
* web-socket-js : Hiroshi Ichikawa (github.com/gimite/web-socket-js)
* as3crypto : Henri Torgemane (code.google.com/p/as3crypto) * as3crypto : Henri Torgemane (code.google.com/p/as3crypto)
* base64 : Martijn Pieters (Digital Creations 2), Samuel Sieb (sieb.net) * base64 : Martijn Pieters (Digital Creations 2), Samuel Sieb (sieb.net)
* jsunzip : Erik Moller (github.com/operasoftware/jsunzip),
* tinflate : Joergen Ibsen (ibsensoftware.com)
* DES : Dave Zimmerman (Widget Workshop), Jef Poskanzer (ACME Labs) * DES : Dave Zimmerman (Widget Workshop), Jef Poskanzer (ACME Labs)
* Pako : Vitaly Puzrin (https://github.com/nodeca/pako)

21
docs/LICENSE.pako Normal file
View File

@ -0,0 +1,21 @@
(The MIT License)
Copyright (C) 2014 by Vitaly Puzrin
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

20
docs/notes
View File

@ -1,17 +1,5 @@
Some implementation notes: Rebuilding inflator.js
There is an included flash object (web-socket-js) that is used to - Download pako from npm
emulate websocket support on browsers without websocket support - Install browserify using npm
(currently only Chrome has WebSocket support). - browserify utils/inflator.partial.js -o include/inflator.js
Javascript doesn't have a bytearray type, so what you get out of
a WebSocket object is just Javascript strings. Javascript has UTF-16
unicode strings and anything sent through the WebSocket gets converted
to UTF-8 and vice-versa. So, one additional (and necessary) function
of websockify is base64 encoding/decoding what is sent to/from the
browser.
Building web-socket-js emulator:
cd include/web-socket-js/flash-src
mxmlc -static-link-runtime-shared-libraries WebSocketMain.as

108
include/display.js
View File

@ -15,6 +15,14 @@ var Display;
(function () { (function () {
"use strict"; "use strict";
var SUPPORTS_IMAGEDATA_CONSTRUCTOR = false;
try {
new ImageData(new Uint8ClampedArray(1), 1, 1);
SUPPORTS_IMAGEDATA_CONSTRUCTOR = true;
} catch (ex) {
// ignore failure
}
Display = function (defaults) { Display = function (defaults) {
this._drawCtx = null; this._drawCtx = null;
this._c_forceCanvas = false; this._c_forceCanvas = false;
@ -351,18 +359,41 @@ var Display;
this._renderQ = []; this._renderQ = [];
}, },
fillRect: function (x, y, width, height, color) { fillRect: function (x, y, width, height, color, from_queue) {
if (this._renderQ.length !== 0 && !from_queue) {
this.renderQ_push({
'type': 'fill',
'x': x,
'y': y,
'width': width,
'height': height,
'color': color
});
} else {
this._setFillColor(color); this._setFillColor(color);
this._drawCtx.fillRect(x - this._viewportLoc.x, y - this._viewportLoc.y, width, height); this._drawCtx.fillRect(x - this._viewportLoc.x, y - this._viewportLoc.y, width, height);
}
}, },
copyImage: function (old_x, old_y, new_x, new_y, w, h) { copyImage: function (old_x, old_y, new_x, new_y, w, h, from_queue) {
if (this._renderQ.length !== 0 && !from_queue) {
this.renderQ_push({
'type': 'copy',
'old_x': old_x,
'old_y': old_y,
'x': new_x,
'y': new_y,
'width': w,
'height': h,
});
} else {
var x1 = old_x - this._viewportLoc.x; var x1 = old_x - this._viewportLoc.x;
var y1 = old_y - this._viewportLoc.y; var y1 = old_y - this._viewportLoc.y;
var x2 = new_x - this._viewportLoc.x; var x2 = new_x - this._viewportLoc.x;
var y2 = new_y - this._viewportLoc.y; var y2 = new_y - this._viewportLoc.y;
this._drawCtx.drawImage(this._target, x1, y1, w, h, x2, y2, w, h); this._drawCtx.drawImage(this._target, x1, y1, w, h, x2, y2, w, h);
}
}, },
// start updating a tile // start updating a tile
@ -394,7 +425,7 @@ var Display;
data[i + 3] = 255; data[i + 3] = 255;
} }
} else { } else {
this.fillRect(x, y, width, height, color); this.fillRect(x, y, width, height, color, true);
} }
}, },
@ -425,7 +456,7 @@ var Display;
} }
} }
} else { } else {
this.fillRect(this._tile_x + x, this._tile_y + y, w, h, color); this.fillRect(this._tile_x + x, this._tile_y + y, w, h, color, true);
} }
}, },
@ -438,16 +469,34 @@ var Display;
// else: No-op -- already done by setSubTile // else: No-op -- already done by setSubTile
}, },
blitImage: function (x, y, width, height, arr, offset) { blitImage: function (x, y, width, height, arr, offset, from_queue) {
if (this._true_color) { if (this._renderQ.length !== 0 && !from_queue) {
this.renderQ_push({
'type': 'blit',
'data': arr,
'x': x,
'y': y,
'width': width,
'height': height,
});
} else if (this._true_color) {
this._bgrxImageData(x, y, this._viewportLoc.x, this._viewportLoc.y, width, height, arr, offset); this._bgrxImageData(x, y, this._viewportLoc.x, this._viewportLoc.y, width, height, arr, offset);
} else { } else {
this._cmapImageData(x, y, this._viewportLoc.x, this._viewportLoc.y, width, height, arr, offset); this._cmapImageData(x, y, this._viewportLoc.x, this._viewportLoc.y, width, height, arr, offset);
} }
}, },
blitRgbImage: function (x, y , width, height, arr, offset) { blitRgbImage: function (x, y , width, height, arr, offset, from_queue) {
if (this._true_color) { if (this._renderQ.length !== 0 && !from_queue) {
this.renderQ_push({
'type': 'blitRgb',
'data': arr,
'x': x,
'y': y,
'width': width,
'height': height,
});
} else if (this._true_color) {
this._rgbImageData(x, y, this._viewportLoc.x, this._viewportLoc.y, width, height, arr, offset); this._rgbImageData(x, y, this._viewportLoc.x, this._viewportLoc.y, width, height, arr, offset);
} else { } else {
// probably wrong? // probably wrong?
@ -455,6 +504,26 @@ var Display;
} }
}, },
blitRgbxImage: function (x, y, width, height, arr, offset, from_queue) {
if (this._renderQ.length !== 0 && !from_queue) {
// NB(directxman12): it's technically more performant here to use preallocated arrays, but it
// but it's a lot of extra work for not a lot of payoff -- if we're using the render queue,
// this probably isn't getting called *nearly* as much
var new_arr = new Uint8Array(width * height * 4);
new_arr.set(new Uint8Array(arr.buffer, 0, new_arr.length));
this.renderQ_push({
'type': 'blitRgbx',
'data': new_arr,
'x': x,
'y': y,
'width': width,
'height': height,
});
} else {
this._rgbxImageData(x, y, this._viewportLoc.x, this._viewportLoc.y, width, height, arr, offset);
}
},
blitStringImage: function (str, x, y) { blitStringImage: function (str, x, y) {
var img = new Image(); var img = new Image();
img.onload = function () { img.onload = function () {
@ -632,6 +701,18 @@ var Display;
this._drawCtx.putImageData(img, x - vx, y - vy); this._drawCtx.putImageData(img, x - vx, y - vy);
}, },
_rgbxImageData: function (x, y, vx, vy, width, height, arr, offset) {
// NB(directxman12): arr must be an Type Array view
var img;
if (SUPPORTS_IMAGEDATA_CONSTRUCTOR) {
img = new ImageData(new Uint8ClampedArray(arr.buffer, arr.byteOffset, width * height * 4), width, height);
} else {
img = this._drawCtx.createImageData(width, height);
img.data.set(new Uint8ClampedArray(arr.buffer, arr.byteOffset, width * height * 4));
}
this._drawCtx.putImageData(img, x - vx, y - vy);
},
_cmapImageData: function (x, y, vx, vy, width, height, arr, offset) { _cmapImageData: function (x, y, vx, vy, width, height, arr, offset) {
var img = this._drawCtx.createImageData(width, height); var img = this._drawCtx.createImageData(width, height);
var data = img.data; var data = img.data;
@ -652,16 +733,19 @@ var Display;
var a = this._renderQ[0]; var a = this._renderQ[0];
switch (a.type) { switch (a.type) {
case 'copy': case 'copy':
this.copyImage(a.old_x, a.old_y, a.x, a.y, a.width, a.height); this.copyImage(a.old_x, a.old_y, a.x, a.y, a.width, a.height, true);
break; break;
case 'fill': case 'fill':
this.fillRect(a.x, a.y, a.width, a.height, a.color); this.fillRect(a.x, a.y, a.width, a.height, a.color, true);
break; break;
case 'blit': case 'blit':
this.blitImage(a.x, a.y, a.width, a.height, a.data, 0); this.blitImage(a.x, a.y, a.width, a.height, a.data, 0, true);
break; break;
case 'blitRgb': case 'blitRgb':
this.blitRgbImage(a.x, a.y, a.width, a.height, a.data, 0); this.blitRgbImage(a.x, a.y, a.width, a.height, a.data, 0, true);
break;
case 'blitRgbx':
this.blitRgbxImage(a.x, a.y, a.width, a.height, a.data, 0, true);
break; break;
case 'img': case 'img':
if (a.img.complete) { if (a.img.complete) {

2409
include/inflator.js Normal file
View File

File diff suppressed because it is too large Load Diff

28
include/playback.js
View File

@ -12,19 +12,37 @@ var rfb, mode, test_state, frame_idx, frame_length,
iteration, iterations, istart_time, iteration, iterations, istart_time,
// Pre-declarations for jslint // Pre-declarations for jslint
send_array, next_iteration, queue_next_packet, do_packet; send_array, next_iteration, queue_next_packet, do_packet, enable_test_mode;
// Override send_array // Override send_array
send_array = function (arr) { send_array = function (arr) {
// Stub out send_array // Stub out send_array
}; };
enable_test_mode = function () {
rfb._sock._mode = VNC_frame_encoding;
rfb._sock.send = send_array;
rfb._sock.close = function () {};
rfb._sock.flush = function () {};
rfb._checkEvents = function () {};
rfb.connect = function (host, port, password, path) {
this._rfb_host = host;
this._rfb_port = port;
this._rfb_password = (password !== undefined) ? password : "";
this._rfb_path = (path !== undefined) ? path : "";
this._sock.init('binary', 'ws');
this._updateState('ProtocolVersion', "Starting VNC handshake");
};
};
next_iteration = function () { next_iteration = function () {
rfb = new RFB({'target': $D('VNC_canvas'),
'onUpdateState': updateState});
enable_test_mode();
if (iteration === 0) { if (iteration === 0) {
frame_length = VNC_frame_data.length; frame_length = VNC_frame_data.length;
test_state = 'running'; test_state = 'running';
} else {
rfb.disconnect();
} }
if (test_state !== 'running') { return; } if (test_state !== 'running') { return; }
@ -91,9 +109,9 @@ do_packet = function () {
for (var i = 0; i < frame.length - start; i++) { for (var i = 0; i < frame.length - start; i++) {
u8[i] = frame.charCodeAt(start + i); u8[i] = frame.charCodeAt(start + i);
} }
rfb.recv_message({'data' : u8}); rfb._sock._recv_message({'data' : u8});
} else { } else {
rfb.recv_message({'data' : frame.slice(start)}); rfb._sock._recv_message({'data' : frame.slice(start)});
} }
frame_idx += 1; frame_idx += 1;

526
include/rfb.js
View File

@ -92,6 +92,9 @@ var RFB;
this._fb_height = 0; this._fb_height = 0;
this._fb_name = ""; this._fb_name = "";
this._destBuff = null;
this._paletteBuff = new Uint8Array(1024); // 256 * 4 (max palette size * max bytes-per-pixel)
this._rre_chunk_sz = 100; this._rre_chunk_sz = 100;
this._timing = { this._timing = {
@ -128,7 +131,7 @@ var RFB;
'view_only': false, // Disable client mouse/keyboard 'view_only': false, // Disable client mouse/keyboard
'xvp_password_sep': '@', // Separator for XVP password fields 'xvp_password_sep': '@', // Separator for XVP password fields
'disconnectTimeout': 3, // Time (s) to wait for disconnection 'disconnectTimeout': 3, // Time (s) to wait for disconnection
'wsProtocols': ['binary', 'base64'], // Protocols to use in the WebSocket connection 'wsProtocols': ['binary'], // Protocols to use in the WebSocket connection
'repeaterID': '', // [UltraVNC] RepeaterID to connect to 'repeaterID': '', // [UltraVNC] RepeaterID to connect to
'viewportDrag': false, // Move the viewport on mouse drags 'viewportDrag': false, // Move the viewport on mouse drags
@ -217,16 +220,8 @@ var RFB;
Util.Info("Using native WebSockets"); Util.Info("Using native WebSockets");
this._updateState('loaded', 'noVNC ready: native WebSockets, ' + rmode); this._updateState('loaded', 'noVNC ready: native WebSockets, ' + rmode);
} else { } else {
Util.Warn("Using web-socket-js bridge. Flash version: " + Util.Flash.version);
if (!Util.Flash || Util.Flash.version < 9) {
this._cleanupSocket('fatal'); this._cleanupSocket('fatal');
throw new Exception("WebSockets or <a href='http://get.adobe.com/flashplayer'>Adobe Flash</a> is required"); throw new Error("WebSocket support is required to use noVNC");
} else if (document.location.href.substr(0, 7) === 'file://') {
this._cleanupSocket('fatal');
throw new Exception("'file://' URL is incompatible with Adobe Flash");
} else {
this._updateState('loaded', 'noVNC ready: WebSockets emulation, ' + rmode);
}
} }
Util.Debug("<< RFB.constructor"); Util.Debug("<< RFB.constructor");
@ -264,14 +259,14 @@ var RFB;
if (this._rfb_state !== 'normal' || this._view_only) { return false; } if (this._rfb_state !== 'normal' || this._view_only) { return false; }
Util.Info("Sending Ctrl-Alt-Del"); Util.Info("Sending Ctrl-Alt-Del");
var arr = []; RFB.messages.keyEvent(this._sock, XK_Control_L, 1);
arr = arr.concat(RFB.messages.keyEvent(XK_Control_L, 1)); RFB.messages.keyEvent(this._sock, XK_Alt_L, 1);
arr = arr.concat(RFB.messages.keyEvent(XK_Alt_L, 1)); RFB.messages.keyEvent(this._sock, XK_Delete, 1);
arr = arr.concat(RFB.messages.keyEvent(XK_Delete, 1)); RFB.messages.keyEvent(this._sock, XK_Delete, 0);
arr = arr.concat(RFB.messages.keyEvent(XK_Delete, 0)); RFB.messages.keyEvent(this._sock, XK_Alt_L, 0);
arr = arr.concat(RFB.messages.keyEvent(XK_Alt_L, 0)); RFB.messages.keyEvent(this._sock, XK_Control_L, 0);
arr = arr.concat(RFB.messages.keyEvent(XK_Control_L, 0));
this._sock.send(arr); this._sock.flush();
}, },
xvpOp: function (ver, op) { xvpOp: function (ver, op) {
@ -297,21 +292,22 @@ var RFB;
// followed by an up key. // followed by an up key.
sendKey: function (code, down) { sendKey: function (code, down) {
if (this._rfb_state !== "normal" || this._view_only) { return false; } if (this._rfb_state !== "normal" || this._view_only) { return false; }
var arr = [];
if (typeof down !== 'undefined') { if (typeof down !== 'undefined') {
Util.Info("Sending key code (" + (down ? "down" : "up") + "): " + code); Util.Info("Sending key code (" + (down ? "down" : "up") + "): " + code);
arr = arr.concat(RFB.messages.keyEvent(code, down ? 1 : 0)); RFB.messages.keyEvent(this._sock, code, down ? 1 : 0);
} else { } else {
Util.Info("Sending key code (down + up): " + code); Util.Info("Sending key code (down + up): " + code);
arr = arr.concat(RFB.messages.keyEvent(code, 1)); RFB.messages.keyEvent(this._sock, code, 1);
arr = arr.concat(RFB.messages.keyEvent(code, 0)); RFB.messages.keyEvent(this._sock, code, 0);
} }
this._sock.send(arr);
this._sock.flush();
}, },
clipboardPasteFrom: function (text) { clipboardPasteFrom: function (text) {
if (this._rfb_state !== 'normal') { return; } if (this._rfb_state !== 'normal') { return; }
this._sock.send(RFB.messages.clientCutText(text)); RFB.messages.clientCutText(this._sock, text);
this._sock.flush();
}, },
setDesktopSize: function (width, height) { setDesktopSize: function (width, height) {
@ -362,8 +358,6 @@ var RFB;
_init_vars: function () { _init_vars: function () {
// reset state // reset state
this._sock.init();
this._FBU.rects = 0; this._FBU.rects = 0;
this._FBU.subrects = 0; // RRE and HEXTILE this._FBU.subrects = 0; // RRE and HEXTILE
this._FBU.lines = 0; // RAW this._FBU.lines = 0; // RAW
@ -380,8 +374,9 @@ var RFB;
} }
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
this._FBU.zlibs[i] = new TINF(); //this._FBU.zlibs[i] = new TINF();
this._FBU.zlibs[i].init(); //this._FBU.zlibs[i].init();
this._FBU.zlibs[i] = new inflator.Inflate();
} }
}, },
@ -578,16 +573,10 @@ var RFB;
} }
}, },
_checkEvents: function () {
if (this._rfb_state === 'normal' && !this._viewportDragging && this._mouse_arr.length > 0) {
this._sock.send(this._mouse_arr);
this._mouse_arr = [];
}
},
_handleKeyPress: function (keysym, down) { _handleKeyPress: function (keysym, down) {
if (this._view_only) { return; } // View only, skip keyboard, events if (this._view_only) { return; } // View only, skip keyboard, events
this._sock.send(RFB.messages.keyEvent(keysym, down)); RFB.messages.keyEvent(this._sock, keysym, down);
this._sock.flush();
}, },
_handleMouseButton: function (x, y, down, bmask) { _handleMouseButton: function (x, y, down, bmask) {
@ -611,10 +600,8 @@ var RFB;
if (this._view_only) { return; } // View only, skip mouse events if (this._view_only) { return; } // View only, skip mouse events
this._mouse_arr = this._mouse_arr.concat( if (this._rfb_state !== "normal") { return; }
RFB.messages.pointerEvent(this._display.absX(x), this._display.absY(y), this._mouse_buttonMask)); RFB.messages.pointerEvent(this._sock, this._display.absX(x), this._display.absY(y), this._mouse_buttonMask);
this._sock.send(this._mouse_arr);
this._mouse_arr = [];
}, },
_handleMouseMove: function (x, y) { _handleMouseMove: function (x, y) {
@ -631,10 +618,8 @@ var RFB;
if (this._view_only) { return; } // View only, skip mouse events if (this._view_only) { return; } // View only, skip mouse events
this._mouse_arr = this._mouse_arr.concat( if (this._rfb_state !== "normal") { return; }
RFB.messages.pointerEvent(this._display.absX(x), this._display.absY(y), this._mouse_buttonMask)); RFB.messages.pointerEvent(this._sock, this._display.absX(x), this._display.absY(y), this._mouse_buttonMask);
this._checkEvents();
}, },
// Message Handlers // Message Handlers
@ -758,7 +743,8 @@ var RFB;
if (this._sock.rQwait("auth challenge", 16)) { return false; } if (this._sock.rQwait("auth challenge", 16)) { return false; }
var challenge = this._sock.rQshiftBytes(16); // TODO(directxman12): make genDES not require an Array
var challenge = Array.prototype.slice.call(this._sock.rQshiftBytes(16));
var response = RFB.genDES(this._rfb_password, challenge); var response = RFB.genDES(this._rfb_password, challenge);
this._sock.send(response); this._sock.send(response);
this._updateState("SecurityResult"); this._updateState("SecurityResult");
@ -900,6 +886,7 @@ var RFB;
/* Screen size */ /* Screen size */
this._fb_width = this._sock.rQshift16(); this._fb_width = this._sock.rQshift16();
this._fb_height = this._sock.rQshift16(); this._fb_height = this._sock.rQshift16();
this._destBuff = new Uint8Array(this._fb_width * this._fb_height * 4);
/* PIXEL_FORMAT */ /* PIXEL_FORMAT */
var bpp = this._sock.rQshift8(); var bpp = this._sock.rQshift8();
@ -995,18 +982,13 @@ var RFB;
this._fb_depth = 1; this._fb_depth = 1;
} }
var response = RFB.messages.pixelFormat(this._fb_Bpp, this._fb_depth, this._true_color); RFB.messages.pixelFormat(this._sock, this._fb_Bpp, this._fb_depth, this._true_color);
response = response.concat( RFB.messages.clientEncodings(this._sock, this._encodings, this._local_cursor, this._true_color);
RFB.messages.clientEncodings(this._encodings, this._local_cursor, this._true_color)); RFB.messages.fbUpdateRequests(this._sock, this._display.getCleanDirtyReset(), this._fb_width, this._fb_height);
response = response.concat(
RFB.messages.fbUpdateRequests(this._display.getCleanDirtyReset(),
this._fb_width, this._fb_height));
this._timing.fbu_rt_start = (new Date()).getTime(); this._timing.fbu_rt_start = (new Date()).getTime();
this._timing.pixels = 0; this._timing.pixels = 0;
this._sock.send(response); this._sock.flush();
this._checkEvents();
if (this._encrypt) { if (this._encrypt) {
this._updateState('normal', 'Connected (encrypted) to: ' + this._fb_name); this._updateState('normal', 'Connected (encrypted) to: ' + this._fb_name);
@ -1108,8 +1090,8 @@ var RFB;
case 0: // FramebufferUpdate case 0: // FramebufferUpdate
var ret = this._framebufferUpdate(); var ret = this._framebufferUpdate();
if (ret) { if (ret) {
this._sock.send(RFB.messages.fbUpdateRequests(this._display.getCleanDirtyReset(), RFB.messages.fbUpdateRequests(this._sock, this._display.getCleanDirtyReset(), this._fb_width, this._fb_height);
this._fb_width, this._fb_height)); this._sock.flush();
} }
return ret; return ret;
@ -1181,7 +1163,14 @@ var RFB;
this._timing.last_fbu = (new Date()).getTime(); this._timing.last_fbu = (new Date()).getTime();
var handler = this._encHandlers[this._FBU.encoding];
try {
//ret = this._encHandlers[this._FBU.encoding]();
ret = handler();
} catch (ex) {
console.log("missed " + this._FBU.encoding + ": " + handler);
ret = this._encHandlers[this._FBU.encoding](); ret = this._encHandlers[this._FBU.encoding]();
}
now = (new Date()).getTime(); now = (new Date()).getTime();
this._timing.cur_fbu += (now - this._timing.last_fbu); this._timing.cur_fbu += (now - this._timing.last_fbu);
@ -1276,64 +1265,111 @@ var RFB;
// Class Methods // Class Methods
RFB.messages = { RFB.messages = {
keyEvent: function (keysym, down) { keyEvent: function (sock, keysym, down) {
var arr = [4]; var buff = sock._sQ;
arr.push8(down); var offset = sock._sQlen;
arr.push16(0);
arr.push32(keysym); buff[offset] = 4; // msg-type
return arr; buff[offset + 1] = down;
buff[offset + 2] = 0;
buff[offset + 3] = 0;
buff[offset + 4] = (keysym >> 24);
buff[offset + 5] = (keysym >> 16);
buff[offset + 6] = (keysym >> 8);
buff[offset + 7] = keysym;
sock._sQlen += 8;
}, },
pointerEvent: function (x, y, mask) { pointerEvent: function (sock, x, y, mask) {
var arr = [5]; // msg-type var buff = sock._sQ;
arr.push8(mask); var offset = sock._sQlen;
arr.push16(x);
arr.push16(y); buff[offset] = 5; // msg-type
return arr;
buff[offset + 1] = mask;
buff[offset + 2] = x >> 8;
buff[offset + 3] = x;
buff[offset + 4] = y >> 8;
buff[offset + 5] = y;
sock._sQlen += 6;
}, },
// TODO(directxman12): make this unicode compatible? // TODO(directxman12): make this unicode compatible?
clientCutText: function (text) { clientCutText: function (sock, text) {
var arr = [6]; // msg-type var buff = sock._sQ;
arr.push8(0); // padding var offset = sock._sQlen;
arr.push8(0); // padding
arr.push8(0); // padding buff[offset] = 6; // msg-type
arr.push32(text.length);
buff[offset + 1] = 0; // padding
buff[offset + 2] = 0; // padding
buff[offset + 3] = 0; // padding
var n = text.length; var n = text.length;
buff[offset + 4] = n >> 24;
buff[offset + 5] = n >> 16;
buff[offset + 6] = n >> 8;
buff[offset + 7] = n;
for (var i = 0; i < n; i++) { for (var i = 0; i < n; i++) {
arr.push(text.charCodeAt(i)); buff[offset + 8 + i] = text.charCodeAt(i);
} }
return arr; sock._sQlen += 8 + n;
}, },
pixelFormat: function (bpp, depth, true_color) { pixelFormat: function (sock, bpp, depth, true_color) {
var arr = [0]; // msg-type var buff = sock._sQ;
arr.push8(0); // padding var offset = sock._sQlen;
arr.push8(0); // padding
arr.push8(0); // padding
arr.push8(bpp * 8); // bits-per-pixel buff[offset] = 0; // msg-type
arr.push8(depth * 8); // depth
arr.push8(0); // little-endian
arr.push8(true_color ? 1 : 0); // true-color
arr.push16(255); // red-max buff[offset + 1] = 0; // padding
arr.push16(255); // green-max buff[offset + 2] = 0; // padding
arr.push16(255); // blue-max buff[offset + 3] = 0; // padding
arr.push8(16); // red-shift
arr.push8(8); // green-shift
arr.push8(0); // blue-shift
arr.push8(0); // padding buff[offset + 4] = bpp * 8; // bits-per-pixel
arr.push8(0); // padding buff[offset + 5] = depth * 8; // depth
arr.push8(0); // padding buff[offset + 6] = 0; // little-endian
return arr; buff[offset + 7] = true_color ? 1 : 0; // true-color
buff[offset + 8] = 0; // red-max
buff[offset + 9] = 255; // red-max
buff[offset + 10] = 0; // green-max
buff[offset + 11] = 255; // green-max
buff[offset + 12] = 0; // blue-max
buff[offset + 13] = 255; // blue-max
buff[offset + 14] = 16; // red-shift
buff[offset + 15] = 8; // green-shift
buff[offset + 16] = 0; // blue-shift
buff[offset + 17] = 0; // padding
buff[offset + 18] = 0; // padding
buff[offset + 19] = 0; // padding
sock._sQlen += 20;
}, },
clientEncodings: function (encodings, local_cursor, true_color) { clientEncodings: function (sock, encodings, local_cursor, true_color) {
var i, encList = []; var buff = sock._sQ;
var offset = sock._sQlen;
buff[offset] = 2; // msg-type
buff[offset + 1] = 0; // padding
// offset + 2 and offset + 3 are encoding count
var i, j = offset + 4, cnt = 0;
for (i = 0; i < encodings.length; i++) { for (i = 0; i < encodings.length; i++) {
if (encodings[i][0] === "Cursor" && !local_cursor) { if (encodings[i][0] === "Cursor" && !local_cursor) {
Util.Debug("Skipping Cursor pseudo-encoding"); Util.Debug("Skipping Cursor pseudo-encoding");
@ -1341,23 +1377,25 @@ var RFB;
// TODO: remove this when we have tight+non-true-color // TODO: remove this when we have tight+non-true-color
Util.Warn("Skipping tight as it is only supported with true color"); Util.Warn("Skipping tight as it is only supported with true color");
} else { } else {
encList.push(encodings[i][1]); var enc = encodings[i][1];
buff[j] = enc >> 24;
buff[j + 1] = enc >> 16;
buff[j + 2] = enc >> 8;
buff[j + 3] = enc;
j += 4;
cnt++;
} }
} }
var arr = [2]; // msg-type buff[offset + 2] = cnt >> 8;
arr.push8(0); // padding buff[offset + 3] = cnt;
arr.push16(encList.length); // encoding count sock._sQlen += j - offset;
for (i = 0; i < encList.length; i++) {
arr.push32(encList[i]);
}
return arr;
}, },
fbUpdateRequests: function (cleanDirty, fb_width, fb_height) { fbUpdateRequests: function (sock, cleanDirty, fb_width, fb_height) {
var arr = []; var offsetIncrement = 0;
var cb = cleanDirty.cleanBox; var cb = cleanDirty.cleanBox;
var w, h; var w, h;
@ -1365,7 +1403,7 @@ var RFB;
w = typeof cb.w === "undefined" ? fb_width : cb.w; w = typeof cb.w === "undefined" ? fb_width : cb.w;
h = typeof cb.h === "undefined" ? fb_height : cb.h; h = typeof cb.h === "undefined" ? fb_height : cb.h;
// Request incremental for clean box // Request incremental for clean box
arr = arr.concat(RFB.messages.fbUpdateRequest(1, cb.x, cb.y, w, h)); RFB.messages.fbUpdateRequest(sock, 1, cb.x, cb.y, w, h);
} }
for (var i = 0; i < cleanDirty.dirtyBoxes.length; i++) { for (var i = 0; i < cleanDirty.dirtyBoxes.length; i++) {
@ -1373,24 +1411,33 @@ var RFB;
// Force all (non-incremental) for dirty box // Force all (non-incremental) for dirty box
w = typeof db.w === "undefined" ? fb_width : db.w; w = typeof db.w === "undefined" ? fb_width : db.w;
h = typeof db.h === "undefined" ? fb_height : db.h; h = typeof db.h === "undefined" ? fb_height : db.h;
arr = arr.concat(RFB.messages.fbUpdateRequest(0, db.x, db.y, w, h)); RFB.messages.fbUpdateRequest(sock, 0, db.x, db.y, w, h);
} }
return arr;
}, },
fbUpdateRequest: function (incremental, x, y, w, h) { fbUpdateRequest: function (sock, incremental, x, y, w, h) {
var buff = sock._sQ;
var offset = sock._sQlen;
if (typeof(x) === "undefined") { x = 0; } if (typeof(x) === "undefined") { x = 0; }
if (typeof(y) === "undefined") { y = 0; } if (typeof(y) === "undefined") { y = 0; }
var arr = [3]; // msg-type buff[offset] = 3; // msg-type
arr.push8(incremental); buff[offset + 1] = incremental;
arr.push16(x);
arr.push16(y);
arr.push16(w);
arr.push16(h);
return arr; buff[offset + 2] = (x >> 8) & 0xFF;
buff[offset + 3] = x & 0xFF;
buff[offset + 4] = (y >> 8) & 0xFF;
buff[offset + 5] = y & 0xFF;
buff[offset + 6] = (w >> 8) & 0xFF;
buff[offset + 7] = w & 0xFF;
buff[offset + 8] = (h >> 8) & 0xFF;
buff[offset + 9] = h & 0xFF;
sock._sQlen += 10;
} }
}; };
@ -1436,15 +1483,10 @@ var RFB;
COPYRECT: function () { COPYRECT: function () {
this._FBU.bytes = 4; this._FBU.bytes = 4;
if (this._sock.rQwait("COPYRECT", 4)) { return false; } if (this._sock.rQwait("COPYRECT", 4)) { return false; }
this._display.renderQ_push({ this._display.copyImage(this._sock.rQshift16(), this._sock.rQshift16(),
'type': 'copy', this._FBU.x, this._FBU.y, this._FBU.width,
'old_x': this._sock.rQshift16(), this._FBU.height);
'old_y': this._sock.rQshift16(),
'x': this._FBU.x,
'y': this._FBU.y,
'width': this._FBU.width,
'height': this._FBU.height
});
this._FBU.rects--; this._FBU.rects--;
this._FBU.bytes = 0; this._FBU.bytes = 0;
return true; return true;
@ -1549,11 +1591,21 @@ var RFB;
rQi += this._FBU.bytes - 1; rQi += this._FBU.bytes - 1;
} else { } else {
if (this._FBU.subencoding & 0x02) { // Background if (this._FBU.subencoding & 0x02) { // Background
this._FBU.background = rQ.slice(rQi, rQi + this._fb_Bpp); if (this._fb_Bpp == 1) {
this._FBU.background = rQ[rQi];
} else {
// fb_Bpp is 4
this._FBU.background = [rQ[rQi], rQ[rQi + 1], rQ[rQi + 2], rQ[rQi + 3]];
}
rQi += this._fb_Bpp; rQi += this._fb_Bpp;
} }
if (this._FBU.subencoding & 0x04) { // Foreground if (this._FBU.subencoding & 0x04) { // Foreground
this._FBU.foreground = rQ.slice(rQi, rQi + this._fb_Bpp); if (this._fb_Bpp == 1) {
this._FBU.foreground = rQ[rQi];
} else {
// this._fb_Bpp is 4
this._FBU.foreground = [rQ[rQi], rQ[rQi + 1], rQ[rQi + 2], rQ[rQi + 3]];
}
rQi += this._fb_Bpp; rQi += this._fb_Bpp;
} }
@ -1565,7 +1617,12 @@ var RFB;
for (var s = 0; s < subrects; s++) { for (var s = 0; s < subrects; s++) {
var color; var color;
if (this._FBU.subencoding & 0x10) { // SubrectsColoured if (this._FBU.subencoding & 0x10) { // SubrectsColoured
color = rQ.slice(rQi, rQi + this._fb_Bpp); if (this._fb_Bpp === 1) {
color = rQ[rQi];
} else {
// _fb_Bpp is 4
color = [rQ[rQi], rQ[rQi + 1], rQ[rQi + 2], rQ[rQi + 3]];
}
rQi += this._fb_Bpp; rQi += this._fb_Bpp;
} else { } else {
color = this._FBU.foreground; color = this._FBU.foreground;
@ -1639,53 +1696,87 @@ var RFB;
} }
} }
var uncompressed = this._FBU.zlibs[streamId].uncompress(data, 0); //var uncompressed = this._FBU.zlibs[streamId].uncompress(data, 0);
if (uncompressed.status !== 0) { var uncompressed = this._FBU.zlibs[streamId].inflate(data, true);
/*if (uncompressed.status !== 0) {
Util.Error("Invalid data in zlib stream"); Util.Error("Invalid data in zlib stream");
} }*/
return uncompressed.data; //return uncompressed.data;
return uncompressed;
}.bind(this); }.bind(this);
var indexedToRGB = function (data, numColors, palette, width, height) { var indexedToRGBX2Color = function (data, palette, width, height) {
// Convert indexed (palette based) image data to RGB // Convert indexed (palette based) image data to RGB
// TODO: reduce number of calculations inside loop // TODO: reduce number of calculations inside loop
var dest = []; var dest = this._destBuff;
var x, y, dp, sp;
if (numColors === 2) {
var w = Math.floor((width + 7) / 8); var w = Math.floor((width + 7) / 8);
var w1 = Math.floor(width / 8); var w1 = Math.floor(width / 8);
for (y = 0; y < height; y++) { /*for (var y = 0; y < height; y++) {
var b; var b, x, dp, sp;
var yoffset = y * width;
var ybitoffset = y * w;
var xoffset, targetbyte;
for (x = 0; x < w1; x++) {
xoffset = yoffset + x * 8;
targetbyte = data[ybitoffset + x];
for (b = 7; b >= 0; b--) {
dp = (xoffset + 7 - b) * 3;
sp = (targetbyte >> b & 1) * 3;
dest[dp] = palette[sp];
dest[dp + 1] = palette[sp + 1];
dest[dp + 2] = palette[sp + 2];
}
}
xoffset = yoffset + x * 8;
targetbyte = data[ybitoffset + x];
for (b = 7; b >= 8 - width % 8; b--) {
dp = (xoffset + 7 - b) * 3;
sp = (targetbyte >> b & 1) * 3;
dest[dp] = palette[sp];
dest[dp + 1] = palette[sp + 1];
dest[dp + 2] = palette[sp + 2];
}
}*/
for (var y = 0; y < height; y++) {
var b, x, dp, sp;
for (x = 0; x < w1; x++) { for (x = 0; x < w1; x++) {
for (b = 7; b >= 0; b--) { for (b = 7; b >= 0; b--) {
dp = (y * width + x * 8 + 7 - b) * 3; dp = (y * width + x * 8 + 7 - b) * 4;
sp = (data[y * w + x] >> b & 1) * 3; sp = (data[y * w + x] >> b & 1) * 3;
dest[dp] = palette[sp]; dest[dp] = palette[sp];
dest[dp + 1] = palette[sp + 1]; dest[dp + 1] = palette[sp + 1];
dest[dp + 2] = palette[sp + 2]; dest[dp + 2] = palette[sp + 2];
dest[dp + 3] = 255;
} }
} }
for (b = 7; b >= 8 - width % 8; b--) { for (b = 7; b >= 8 - width % 8; b--) {
dp = (y * width + x * 8 + 7 - b) * 3; dp = (y * width + x * 8 + 7 - b) * 4;
sp = (data[y * w + x] >> b & 1) * 3; sp = (data[y * w + x] >> b & 1) * 3;
dest[dp] = palette[sp]; dest[dp] = palette[sp];
dest[dp + 1] = palette[sp + 1]; dest[dp + 1] = palette[sp + 1];
dest[dp + 2] = palette[sp + 2]; dest[dp + 2] = palette[sp + 2];
dest[dp + 3] = 255;
} }
} }
} else {
for (y = 0; y < height; y++) { return dest;
for (x = 0; x < width; x++) { }.bind(this);
dp = (y * width + x) * 3;
sp = data[y * width + x] * 3; var indexedToRGBX = function (data, palette, width, height) {
dest[dp] = palette[sp]; // Convert indexed (palette based) image data to RGB
dest[dp + 1] = palette[sp + 1]; var dest = this._destBuff;
dest[dp + 2] = palette[sp + 2]; var total = width * height * 4;
} for (var i = 0, j = 0; i < total; i += 4, j++) {
} var sp = data[j] * 3;
dest[i] = palette[sp];
dest[i + 1] = palette[sp + 1];
dest[i + 2] = palette[sp + 2];
dest[i + 3] = 255;
} }
return dest; return dest;
@ -1693,7 +1784,8 @@ var RFB;
var rQ = this._sock.get_rQ(); var rQ = this._sock.get_rQ();
var rQi = this._sock.get_rQi(); var rQi = this._sock.get_rQi();
var cmode, clength, data; var cmode, data;
var cl_header, cl_data;
var handlePalette = function () { var handlePalette = function () {
var numColors = rQ[rQi + 2] + 1; var numColors = rQ[rQi + 2] + 1;
@ -1706,37 +1798,51 @@ var RFB;
var raw = false; var raw = false;
if (rowSize * this._FBU.height < 12) { if (rowSize * this._FBU.height < 12) {
raw = true; raw = true;
clength = [0, rowSize * this._FBU.height]; cl_header = 0;
cl_data = rowSize * this._FBU.height;
//clength = [0, rowSize * this._FBU.height];
} else { } else {
clength = RFB.encodingHandlers.getTightCLength(this._sock.rQslice(3 + paletteSize, // begin inline getTightCLength (returning two-item arrays is bad for performance with GC)
3 + paletteSize + 3)); var cl_offset = rQi + 3 + paletteSize;
cl_header = 1;
cl_data = 0;
cl_data += rQ[cl_offset] & 0x7f;
if (rQ[cl_offset] & 0x80) {
cl_header++;
cl_data += (rQ[cl_offset + 1] & 0x7f) << 7;
if (rQ[cl_offset + 1] & 0x80) {
cl_header++;
cl_data += rQ[cl_offset + 2] << 14;
}
}
// end inline getTightCLength
} }
this._FBU.bytes += clength[0] + clength[1]; this._FBU.bytes += cl_header + cl_data;
if (this._sock.rQwait("TIGHT " + cmode, this._FBU.bytes)) { return false; } if (this._sock.rQwait("TIGHT " + cmode, this._FBU.bytes)) { return false; }
// Shift ctl, filter id, num colors, palette entries, and clength off // Shift ctl, filter id, num colors, palette entries, and clength off
this._sock.rQskipBytes(3); this._sock.rQskipBytes(3);
var palette = this._sock.rQshiftBytes(paletteSize); //var palette = this._sock.rQshiftBytes(paletteSize);
this._sock.rQskipBytes(clength[0]); this._sock.rQshiftTo(this._paletteBuff, paletteSize);
this._sock.rQskipBytes(cl_header);
if (raw) { if (raw) {
data = this._sock.rQshiftBytes(clength[1]); data = this._sock.rQshiftBytes(cl_data);
} else { } else {
data = decompress(this._sock.rQshiftBytes(clength[1])); data = decompress(this._sock.rQshiftBytes(cl_data));
} }
// Convert indexed (palette based) image data to RGB // Convert indexed (palette based) image data to RGB
var rgb = indexedToRGB(data, numColors, palette, this._FBU.width, this._FBU.height); var rgbx;
if (numColors == 2) {
rgbx = indexedToRGBX2Color(data, this._paletteBuff, this._FBU.width, this._FBU.height);
this._display.blitRgbxImage(this._FBU.x, this._FBU.y, this._FBU.width, this._FBU.height, rgbx, 0, false);
} else {
rgbx = indexedToRGBX(data, this._paletteBuff, this._FBU.width, this._FBU.height);
this._display.blitRgbxImage(this._FBU.x, this._FBU.y, this._FBU.width, this._FBU.height, rgbx, 0, false);
}
this._display.renderQ_push({
'type': 'blitRgb',
'data': rgb,
'x': this._FBU.x,
'y': this._FBU.y,
'width': this._FBU.width,
'height': this._FBU.height
});
return true; return true;
}.bind(this); }.bind(this);
@ -1746,30 +1852,37 @@ var RFB;
var uncompressedSize = this._FBU.width * this._FBU.height * this._fb_depth; var uncompressedSize = this._FBU.width * this._FBU.height * this._fb_depth;
if (uncompressedSize < 12) { if (uncompressedSize < 12) {
raw = true; raw = true;
clength = [0, uncompressedSize]; cl_header = 0;
cl_data = uncompressedSize;
} else { } else {
clength = RFB.encodingHandlers.getTightCLength(this._sock.rQslice(1, 4)); // begin inline getTightCLength (returning two-item arrays is for peformance with GC)
var cl_offset = rQi + 1;
cl_header = 1;
cl_data = 0;
cl_data += rQ[cl_offset] & 0x7f;
if (rQ[cl_offset] & 0x80) {
cl_header++;
cl_data += (rQ[cl_offset + 1] & 0x7f) << 7;
if (rQ[cl_offset + 1] & 0x80) {
cl_header++;
cl_data += rQ[cl_offset + 2] << 14;
} }
this._FBU.bytes = 1 + clength[0] + clength[1]; }
// end inline getTightCLength
}
this._FBU.bytes = 1 + cl_header + cl_data;
if (this._sock.rQwait("TIGHT " + cmode, this._FBU.bytes)) { return false; } if (this._sock.rQwait("TIGHT " + cmode, this._FBU.bytes)) { return false; }
// Shift ctl, clength off // Shift ctl, clength off
this._sock.rQshiftBytes(1 + clength[0]); this._sock.rQshiftBytes(1 + cl_header);
if (raw) { if (raw) {
data = this._sock.rQshiftBytes(clength[1]); data = this._sock.rQshiftBytes(cl_data);
} else { } else {
data = decompress(this._sock.rQshiftBytes(clength[1])); data = decompress(this._sock.rQshiftBytes(cl_data));
} }
this._display.renderQ_push({ this._display.blitRgbImage(this._FBU.x, this._FBU.y, this._FBU.width, this._FBU.height, data, 0, false);
'type': 'blitRgb',
'data': data,
'x': this._FBU.x,
'y': this._FBU.y,
'width': this._FBU.width,
'height': this._FBU.height
});
return true; return true;
}.bind(this); }.bind(this);
@ -1817,28 +1930,34 @@ var RFB;
// Determine FBU.bytes // Determine FBU.bytes
switch (cmode) { switch (cmode) {
case "fill": case "fill":
this._sock.rQskip8(); // shift off ctl // skip ctl byte
var color = this._sock.rQshiftBytes(this._fb_depth); this._display.fillRect(this._FBU.x, this._FBU.y, this._FBU.width, this._FBU.height, [rQ[rQi + 3], rQ[rQi + 2], rQ[rQi + 1]], false);
this._display.renderQ_push({ this._sock.rQskipBytes(4);
'type': 'fill',
'x': this._FBU.x,
'y': this._FBU.y,
'width': this._FBU.width,
'height': this._FBU.height,
'color': [color[2], color[1], color[0]]
});
break; break;
case "png": case "png":
case "jpeg": case "jpeg":
clength = RFB.encodingHandlers.getTightCLength(this._sock.rQslice(1, 4)); // begin inline getTightCLength (returning two-item arrays is for peformance with GC)
this._FBU.bytes = 1 + clength[0] + clength[1]; // ctl + clength size + jpeg-data var cl_offset = rQi + 1;
cl_header = 1;
cl_data = 0;
cl_data += rQ[cl_offset] & 0x7f;
if (rQ[cl_offset] & 0x80) {
cl_header++;
cl_data += (rQ[cl_offset + 1] & 0x7f) << 7;
if (rQ[cl_offset + 1] & 0x80) {
cl_header++;
cl_data += rQ[cl_offset + 2] << 14;
}
}
// end inline getTightCLength
this._FBU.bytes = 1 + cl_header + cl_data; // ctl + clength size + jpeg-data
if (this._sock.rQwait("TIGHT " + cmode, this._FBU.bytes)) { return false; } if (this._sock.rQwait("TIGHT " + cmode, this._FBU.bytes)) { return false; }
// We have everything, render it // We have everything, render it
this._sock.rQskipBytes(1 + clength[0]); // shift off clt + compact length this._sock.rQskipBytes(1 + cl_header); // shift off clt + compact length
var img = new Image(); var img = new Image();
img.src = "data: image/" + cmode + img.src = "data: image/" + cmode +
RFB.extract_data_uri(this._sock.rQshiftBytes(clength[1])); RFB.extract_data_uri(this._sock.rQshiftBytes(cl_data));
this._display.renderQ_push({ this._display.renderQ_push({
'type': 'img', 'type': 'img',
'img': img, 'img': img,
@ -1881,6 +2000,7 @@ var RFB;
handle_FB_resize: function () { handle_FB_resize: function () {
this._fb_width = this._FBU.width; this._fb_width = this._FBU.width;
this._fb_height = this._FBU.height; this._fb_height = this._FBU.height;
this._destBuff = new Uint8Array(this._fb_width * this._fb_height * 4);
this._display.resize(this._fb_width, this._fb_height); this._display.resize(this._fb_width, this._fb_height);
this._onFBResize(this, this._fb_width, this._fb_height); this._onFBResize(this, this._fb_width, this._fb_height);
this._timing.fbu_rt_start = (new Date()).getTime(); this._timing.fbu_rt_start = (new Date()).getTime();
@ -1903,9 +2023,9 @@ var RFB;
this._sock.rQskipBytes(1); // number-of-screens this._sock.rQskipBytes(1); // number-of-screens
this._sock.rQskipBytes(3); // padding this._sock.rQskipBytes(3); // padding
for (var i=0; i<number_of_screens; i += 1) { for (var i = 0; i < number_of_screens; i += 1) {
// Save the id and flags of the first screen // Save the id and flags of the first screen
if (i == 0) { if (i === 0) {
this._screen_id = this._sock.rQshiftBytes(4); // id this._screen_id = this._sock.rQshiftBytes(4); // id
this._sock.rQskipBytes(2); // x-position this._sock.rQskipBytes(2); // x-position
this._sock.rQskipBytes(2); // y-position this._sock.rQskipBytes(2); // y-position
@ -1926,7 +2046,7 @@ var RFB;
*/ */
// We need to handle errors when we requested the resize. // We need to handle errors when we requested the resize.
if (this._FBU.x == 1 && this._FBU.y != 0) { if (this._FBU.x === 1 && this._FBU.y !== 0) {
var msg = ""; var msg = "";
// The y-position indicates the status code from the server // The y-position indicates the status code from the server
switch (this._FBU.y) { switch (this._FBU.y) {

2
include/ui.js
View File

@ -21,7 +21,7 @@ var UI;
window.onscriptsload = function () { UI.load(); }; window.onscriptsload = function () { UI.load(); };
Util.load_scripts(["webutil.js", "base64.js", "websock.js", "des.js", Util.load_scripts(["webutil.js", "base64.js", "websock.js", "des.js",
"keysymdef.js", "keyboard.js", "input.js", "display.js", "keysymdef.js", "keyboard.js", "input.js", "display.js",
"jsunzip.js", "rfb.js", "keysym.js"]); "rfb.js", "keysym.js", "inflator.js"]);
UI = { UI = {

1
include/web-socket-js-project

@ -1 +0,0 @@
Subproject commit c0855c6caec589c33acc22b6ee5e562287e65f3d

109
include/web-socket-js/README.txt
View File

@ -1,109 +0,0 @@
* How to try
Assuming you have Web server (e.g. Apache) running at http://example.com/ .
- Download web_socket.rb from:
http://github.com/gimite/web-socket-ruby/tree/master
- Run sample Web Socket server (echo server) in example.com with: (#1)
$ ruby web-socket-ruby/samples/echo_server.rb example.com 10081
- If your server already provides socket policy file at port 843, modify the file to allow access to port 10081. Otherwise you can skip this step. See below for details.
- Publish the web-socket-js directory with your Web server (e.g. put it in ~/public_html).
- Change ws://localhost:10081 to ws://example.com:10081 in sample.html.
- Open sample.html in your browser.
- After "onopen" is shown, input something, click [Send] and confirm echo back.
#1: First argument of echo_server.rb means that it accepts Web Socket connection from HTML pages in example.com.
* Troubleshooting
If it doesn't work, try these:
1. Try Chrome and Firefox 3.x.
- It doesn't work on Chrome:
-- It's likely an issue of your code or the server. Debug your code as usual e.g. using console.log.
- It works on Chrome but it doesn't work on Firefox:
-- It's likely an issue of web-socket-js specific configuration (e.g. 3 and 4 below).
- It works on both Chrome and Firefox, but it doesn't work on your browser:
-- Check "Supported environment" section below. Your browser may not be supported by web-socket-js.
2. Add this line before your code:
WEB_SOCKET_DEBUG = true;
and use Developer Tools (Chrome/Safari) or Firebug (Firefox) to see if console.log outputs any errors.
3. Make sure you do NOT open your HTML page as local file e.g. file:///.../sample.html. web-socket-js doesn't work on local file. Open it via Web server e.g. http:///.../sample.html.
4. If you are NOT using web-socket-ruby as your WebSocket server, you need to place Flash socket policy file on your server. See "Flash socket policy file" section below for details.
5. Check if sample.html bundled with web-socket-js works.
6. Make sure the port used for WebSocket (10081 in example above) is not blocked by your server/client's firewall.
7. Install debugger version of Flash Player available here to see Flash errors:
http://www.adobe.com/support/flashplayer/downloads.html
* Supported environments
It should work on:
- Google Chrome 4 or later (just uses native implementation)
- Firefox 3.x, Internet Explorer 8 + Flash Player 9 or later
It may or may not work on other browsers such as Safari, Opera or IE 6. Patch for these browsers are appreciated, but I will not work on fixing issues specific to these browsers by myself.
* Flash socket policy file
This implementation uses Flash's socket, which means that your server must provide Flash socket policy file to declare the server accepts connections from Flash.
If you use web-socket-ruby available at
http://github.com/gimite/web-socket-ruby/tree/master
, you don't need anything special, because web-socket-ruby handles Flash socket policy file request. But if you already provide socket policy file at port 843, you need to modify the file to allow access to Web Socket port, because it precedes what web-socket-ruby provides.
If you use other Web Socket server implementation, you need to provide socket policy file yourself. See
http://www.lightsphere.com/dev/articles/flash_socket_policy.html
for details and sample script to run socket policy file server. node.js implementation is available here:
http://github.com/LearnBoost/Socket.IO-node/blob/master/lib/socket.io/transports/flashsocket.js
Actually, it's still better to provide socket policy file at port 843 even if you use web-socket-ruby. Flash always try to connect to port 843 first, so providing the file at port 843 makes startup faster.
* Cookie considerations
Cookie is sent if Web Socket host is the same as the origin of JavaScript. Otherwise it is not sent, because I don't know way to send right Cookie (which is Cookie of the host of Web Socket, I heard).
Note that it's technically possible that client sends arbitrary string as Cookie and any other headers (by modifying this library for example) once you place Flash socket policy file in your server. So don't trust Cookie and other headers if you allow connection from untrusted origin.
* Proxy considerations
The WebSocket spec (http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol) specifies instructions for User Agents to support proxied connections by implementing the HTTP CONNECT method.
The AS3 Socket class doesn't implement this mechanism, which renders it useless for the scenarios where the user trying to open a socket is behind a proxy.
The class RFC2817Socket (by Christian Cantrell) effectively lets us implement this, as long as the proxy settings are known and provided by the interface that instantiates the WebSocket. As such, if you want to support proxied conncetions, you'll have to supply this information to the WebSocket constructor when Flash is being used. One way to go about it would be to ask the user for proxy settings information if the initial connection fails.
* How to host HTML file and SWF file in different domains
By default, HTML file and SWF file must be in the same domain. You can follow steps below to allow hosting them in different domain.
WARNING: If you use the method below, HTML files in ANY domains can send arbitrary TCP data to your WebSocket server, regardless of configuration in Flash socket policy file. Arbitrary TCP data means that they can even fake request headers including Origin and Cookie.
- Unzip WebSocketMainInsecure.zip to extract WebSocketMainInsecure.swf.
- Put WebSocketMainInsecure.swf on your server, instead of WebSocketMain.swf.
- In JavaScript, set WEB_SOCKET_SWF_LOCATION to URL of your WebSocketMainInsecure.swf.
* How to build WebSocketMain.swf
Install Flex 4 SDK:
http://opensource.adobe.com/wiki/display/flexsdk/Download+Flex+4
$ cd flash-src
$ ./build.sh
* License
New BSD License.

BIN
include/web-socket-js/WebSocketMain.swf
View File

Binary file not shown.

4
include/web-socket-js/swfobject.js
View File

File diff suppressed because one or more lines are too long

391
include/web-socket-js/web_socket.js
View File

@ -1,391 +0,0 @@
// Copyright: Hiroshi Ichikawa <http://gimite.net/en/>
// License: New BSD License
// Reference: http://dev.w3.org/html5/websockets/
// Reference: http://tools.ietf.org/html/rfc6455
(function() {
if (window.WEB_SOCKET_FORCE_FLASH) {
// Keeps going.
} else if (window.WebSocket) {
return;
} else if (window.MozWebSocket) {
// Firefox.
window.WebSocket = MozWebSocket;
return;
}
var logger;
if (window.WEB_SOCKET_LOGGER) {
logger = WEB_SOCKET_LOGGER;
} else if (window.console && window.console.log && window.console.error) {
// In some environment, console is defined but console.log or console.error is missing.
logger = window.console;
} else {
logger = {log: function(){ }, error: function(){ }};
}
// swfobject.hasFlashPlayerVersion("10.0.0") doesn't work with Gnash.
if (swfobject.getFlashPlayerVersion().major < 10) {
logger.error("Flash Player >= 10.0.0 is required.");
return;
}
if (location.protocol == "file:") {
logger.error(
"WARNING: web-socket-js doesn't work in file:///... URL " +
"unless you set Flash Security Settings properly. " +
"Open the page via Web server i.e. http://...");
}
/**
* Our own implementation of WebSocket class using Flash.
* @param {string} url
* @param {array or string} protocols
* @param {string} proxyHost
* @param {int} proxyPort
* @param {string} headers
*/
window.WebSocket = function(url, protocols, proxyHost, proxyPort, headers) {
var self = this;
self.__id = WebSocket.__nextId++;
WebSocket.__instances[self.__id] = self;
self.readyState = WebSocket.CONNECTING;
self.bufferedAmount = 0;
self.__events = {};
if (!protocols) {
protocols = [];
} else if (typeof protocols == "string") {
protocols = [protocols];
}
// Uses setTimeout() to make sure __createFlash() runs after the caller sets ws.onopen etc.
// Otherwise, when onopen fires immediately, onopen is called before it is set.
self.__createTask = setTimeout(function() {
WebSocket.__addTask(function() {
self.__createTask = null;
WebSocket.__flash.create(
self.__id, url, protocols, proxyHost || null, proxyPort || 0, headers || null);
});
}, 0);
};
/**
* Send data to the web socket.
* @param {string} data The data to send to the socket.
* @return {boolean} True for success, false for failure.
*/
WebSocket.prototype.send = function(data) {
if (this.readyState == WebSocket.CONNECTING) {
throw "INVALID_STATE_ERR: Web Socket connection has not been established";
}
// We use encodeURIComponent() here, because FABridge doesn't work if
// the argument includes some characters. We don't use escape() here
// because of this:
// https://developer.mozilla.org/en/Core_JavaScript_1.5_Guide/Functions#escape_and_unescape_Functions
// But it looks decodeURIComponent(encodeURIComponent(s)) doesn't
// preserve all Unicode characters either e.g. "\uffff" in Firefox.
// Note by wtritch: Hopefully this will not be necessary using ExternalInterface. Will require
// additional testing.
var result = WebSocket.__flash.send(this.__id, encodeURIComponent(data));
if (result < 0) { // success
return true;
} else {
this.bufferedAmount += result;
return false;
}
};
/**
* Close this web socket gracefully.
*/
WebSocket.prototype.close = function() {
if (this.__createTask) {
clearTimeout(this.__createTask);
this.__createTask = null;
this.readyState = WebSocket.CLOSED;
return;
}
if (this.readyState == WebSocket.CLOSED || this.readyState == WebSocket.CLOSING) {
return;
}
this.readyState = WebSocket.CLOSING;
WebSocket.__flash.close(this.__id);
};
/**
* Implementation of {@link <a href="http://www.w3.org/TR/DOM-Level-2-Events/events.html#Events-registration">DOM 2 EventTarget Interface</a>}
*
* @param {string} type
* @param {function} listener
* @param {boolean} useCapture
* @return void
*/
WebSocket.prototype.addEventListener = function(type, listener, useCapture) {
if (!(type in this.__events)) {
this.__events[type] = [];
}
this.__events[type].push(listener);
};
/**
* Implementation of {@link <a href="http://www.w3.org/TR/DOM-Level-2-Events/events.html#Events-registration">DOM 2 EventTarget Interface</a>}
*
* @param {string} type
* @param {function} listener
* @param {boolean} useCapture
* @return void
*/
WebSocket.prototype.removeEventListener = function(type, listener, useCapture) {
if (!(type in this.__events)) return;
var events = this.__events[type];
for (var i = events.length - 1; i >= 0; --i) {
if (events[i] === listener) {
events.splice(i, 1);
break;
}
}
};
/**
* Implementation of {@link <a href="http://www.w3.org/TR/DOM-Level-2-Events/events.html#Events-registration">DOM 2 EventTarget Interface</a>}
*
* @param {Event} event
* @return void
*/
WebSocket.prototype.dispatchEvent = function(event) {
var events = this.__events[event.type] || [];
for (var i = 0; i < events.length; ++i) {
events[i](event);
}
var handler = this["on" + event.type];
if (handler) handler.apply(this, [event]);
};
/**
* Handles an event from Flash.
* @param {Object} flashEvent
*/
WebSocket.prototype.__handleEvent = function(flashEvent) {
if ("readyState" in flashEvent) {
this.readyState = flashEvent.readyState;
}
if ("protocol" in flashEvent) {
this.protocol = flashEvent.protocol;
}
var jsEvent;
if (flashEvent.type == "open" || flashEvent.type == "error") {
jsEvent = this.__createSimpleEvent(flashEvent.type);
} else if (flashEvent.type == "close") {
jsEvent = this.__createSimpleEvent("close");
jsEvent.wasClean = flashEvent.wasClean ? true : false;
jsEvent.code = flashEvent.code;
jsEvent.reason = flashEvent.reason;
} else if (flashEvent.type == "message") {
var data = decodeURIComponent(flashEvent.message);
jsEvent = this.__createMessageEvent("message", data);
} else {
throw "unknown event type: " + flashEvent.type;
}
this.dispatchEvent(jsEvent);
};
WebSocket.prototype.__createSimpleEvent = function(type) {
if (document.createEvent && window.Event) {
var event = document.createEvent("Event");
event.initEvent(type, false, false);
return event;
} else {
return {type: type, bubbles: false, cancelable: false};
}
};
WebSocket.prototype.__createMessageEvent = function(type, data) {
if (document.createEvent && window.MessageEvent && !window.opera) {
var event = document.createEvent("MessageEvent");
event.initMessageEvent("message", false, false, data, null, null, window, null);
return event;
} else {
// IE and Opera, the latter one truncates the data parameter after any 0x00 bytes.
return {type: type, data: data, bubbles: false, cancelable: false};
}
};
/**
* Define the WebSocket readyState enumeration.
*/
WebSocket.CONNECTING = 0;
WebSocket.OPEN = 1;
WebSocket.CLOSING = 2;
WebSocket.CLOSED = 3;
// Field to check implementation of WebSocket.
WebSocket.__isFlashImplementation = true;
WebSocket.__initialized = false;
WebSocket.__flash = null;
WebSocket.__instances = {};
WebSocket.__tasks = [];
WebSocket.__nextId = 0;
/**
* Load a new flash security policy file.
* @param {string} url
*/
WebSocket.loadFlashPolicyFile = function(url){
WebSocket.__addTask(function() {
WebSocket.__flash.loadManualPolicyFile(url);
});
};
/**
* Loads WebSocketMain.swf and creates WebSocketMain object in Flash.
*/
WebSocket.__initialize = function() {
if (WebSocket.__initialized) return;
WebSocket.__initialized = true;
if (WebSocket.__swfLocation) {
// For backword compatibility.
window.WEB_SOCKET_SWF_LOCATION = WebSocket.__swfLocation;
}
if (!window.WEB_SOCKET_SWF_LOCATION) {
logger.error("[WebSocket] set WEB_SOCKET_SWF_LOCATION to location of WebSocketMain.swf");
return;
}
if (!window.WEB_SOCKET_SUPPRESS_CROSS_DOMAIN_SWF_ERROR &&
!WEB_SOCKET_SWF_LOCATION.match(/(^|\/)WebSocketMainInsecure\.swf(\?.*)?$/) &&
WEB_SOCKET_SWF_LOCATION.match(/^\w+:\/\/([^\/]+)/)) {
var swfHost = RegExp.$1;
if (location.host != swfHost) {
logger.error(
"[WebSocket] You must host HTML and WebSocketMain.swf in the same host " +
"('" + location.host + "' != '" + swfHost + "'). " +
"See also 'How to host HTML file and SWF file in different domains' section " +
"in README.md. If you use WebSocketMainInsecure.swf, you can suppress this message " +
"by WEB_SOCKET_SUPPRESS_CROSS_DOMAIN_SWF_ERROR = true;");
}
}
var container = document.createElement("div");
container.id = "webSocketContainer";
// Hides Flash box. We cannot use display: none or visibility: hidden because it prevents
// Flash from loading at least in IE. So we move it out of the screen at (-100, -100).
// But this even doesn't work with Flash Lite (e.g. in Droid Incredible). So with Flash
// Lite, we put it at (0, 0). This shows 1x1 box visible at left-top corner but this is
// the best we can do as far as we know now.
container.style.position = "absolute";
if (WebSocket.__isFlashLite()) {
container.style.left = "0px";
container.style.top = "0px";
} else {
container.style.left = "-100px";
container.style.top = "-100px";
}
var holder = document.createElement("div");
holder.id = "webSocketFlash";
container.appendChild(holder);
document.body.appendChild(container);
// See this article for hasPriority:
// http://help.adobe.com/en_US/as3/mobile/WS4bebcd66a74275c36cfb8137124318eebc6-7ffd.html
swfobject.embedSWF(
WEB_SOCKET_SWF_LOCATION,
"webSocketFlash",
"1" /* width */,
"1" /* height */,
"10.0.0" /* SWF version */,
null,
null,
{hasPriority: true, swliveconnect : true, allowScriptAccess: "always"},
null,
function(e) {
if (!e.success) {
logger.error("[WebSocket] swfobject.embedSWF failed");
}
}
);
};
/**
* Called by Flash to notify JS that it's fully loaded and ready
* for communication.
*/
WebSocket.__onFlashInitialized = function() {
// We need to set a timeout here to avoid round-trip calls
// to flash during the initialization process.
setTimeout(function() {
WebSocket.__flash = document.getElementById("webSocketFlash");
WebSocket.__flash.setCallerUrl(location.href);
WebSocket.__flash.setDebug(!!window.WEB_SOCKET_DEBUG);
for (var i = 0; i < WebSocket.__tasks.length; ++i) {
WebSocket.__tasks[i]();
}
WebSocket.__tasks = [];
}, 0);
};
/**
* Called by Flash to notify WebSockets events are fired.
*/
WebSocket.__onFlashEvent = function() {
setTimeout(function() {
try {
// Gets events using receiveEvents() instead of getting it from event object
// of Flash event. This is to make sure to keep message order.
// It seems sometimes Flash events don't arrive in the same order as they are sent.
var events = WebSocket.__flash.receiveEvents();
for (var i = 0; i < events.length; ++i) {
WebSocket.__instances[events[i].webSocketId].__handleEvent(events[i]);
}
} catch (e) {
logger.error(e);
}
}, 0);
return true;
};
// Called by Flash.
WebSocket.__log = function(message) {
logger.log(decodeURIComponent(message));
};
// Called by Flash.
WebSocket.__error = function(message) {
logger.error(decodeURIComponent(message));
};
WebSocket.__addTask = function(task) {
if (WebSocket.__flash) {
task();
} else {
WebSocket.__tasks.push(task);
}
};
/**
* Test if the browser is running flash lite.
* @return {boolean} True if flash lite is running, false otherwise.
*/
WebSocket.__isFlashLite = function() {
if (!window.navigator || !window.navigator.mimeTypes) {
return false;
}
var mimeType = window.navigator.mimeTypes["application/x-shockwave-flash"];
if (!mimeType || !mimeType.enabledPlugin || !mimeType.enabledPlugin.filename) {
return false;
}
return mimeType.enabledPlugin.filename.match(/flashlite/i) ? true : false;
};
if (!window.WEB_SOCKET_DISABLE_AUTO_INITIALIZATION) {
// NOTE:
// This fires immediately if web_socket.js is dynamically loaded after
// the document is loaded.
swfobject.addDomLoadEvent(function() {
WebSocket.__initialize();
});
}
})();

174
include/websock.js
View File

@ -15,7 +15,7 @@
*/ */
/*jslint browser: true, bitwise: true */ /*jslint browser: true, bitwise: true */
/*global Util, Base64 */ /*global Util*/
// Load Flash WebSocket emulator if needed // Load Flash WebSocket emulator if needed
@ -34,29 +34,26 @@ if (window.WebSocket && !window.WEB_SOCKET_FORCE_FLASH) {
/* no builtin WebSocket so load web_socket.js */ /* no builtin WebSocket so load web_socket.js */
Websock_native = false; Websock_native = false;
(function () {
window.WEB_SOCKET_SWF_LOCATION = Util.get_include_uri() +
"web-socket-js/WebSocketMain.swf";
if (Util.Engine.trident) {
Util.Debug("Forcing uncached load of WebSocketMain.swf");
window.WEB_SOCKET_SWF_LOCATION += "?" + Math.random();
}
Util.load_scripts(["web-socket-js/swfobject.js",
"web-socket-js/web_socket.js"]);
})();
} }
function Websock() { function Websock() {
"use strict"; "use strict";
this._websocket = null; // WebSocket object this._websocket = null; // WebSocket object
this._rQ = []; // Receive queue
this._rQi = 0; // Receive queue index
this._rQmax = 10000; // Max receive queue size before compacting
this._sQ = []; // Send queue
this._mode = 'base64'; // Current WebSocket mode: 'binary', 'base64' 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)
this._rQmax = this._rQbufferSize / 8;
// 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
this._mode = 'binary'; // Current WebSocket mode: 'binary', 'base64'
this.maxBufferedAmount = 200; this.maxBufferedAmount = 200;
this._eventHandlers = { this._eventHandlers = {
@ -69,6 +66,22 @@ function Websock() {
(function () { (function () {
"use strict"; "use strict";
var typedArrayToString = (function () {
// This is only for PhantomJS, which doesn't like apply-ing
// with Typed Arrays
try {
var arr = new Uint8Array([1, 2, 3]);
String.fromCharCode.apply(null, arr);
return function (a) { return String.fromCharCode.apply(null, a); };
} catch (ex) {
return function (a) {
return String.fromCharCode.apply(
null, Array.prototype.slice.call(a));
};
}
})();
Websock.prototype = { Websock.prototype = {
// Getters and Setters // Getters and Setters
get_sQ: function () { get_sQ: function () {
@ -89,7 +102,7 @@ function Websock() {
// Receive Queue // Receive Queue
rQlen: function () { rQlen: function () {
return this._rQ.length - this._rQi; return this._rQlen - this._rQi;
}, },
rQpeek8: function () { rQpeek8: function () {
@ -108,15 +121,7 @@ function Websock() {
this._rQi += num; this._rQi += num;
}, },
rQunshift8: function (num) { // TODO(directxman12): test performance with these vs a DataView
if (this._rQi === 0) {
this._rQ.unshift(num);
} else {
this._rQi--;
this._rQ[this._rQi] = num;
}
},
rQshift16: function () { rQshift16: function () {
return (this._rQ[this._rQi++] << 8) + return (this._rQ[this._rQi++] << 8) +
this._rQ[this._rQi++]; this._rQ[this._rQi++];
@ -131,22 +136,29 @@ function Websock() {
rQshiftStr: function (len) { rQshiftStr: function (len) {
if (typeof(len) === 'undefined') { len = this.rQlen(); } if (typeof(len) === 'undefined') { len = this.rQlen(); }
var arr = this._rQ.slice(this._rQi, this._rQi + len); var arr = new Uint8Array(this._rQ.buffer, this._rQi, len);
this._rQi += len; this._rQi += len;
return String.fromCharCode.apply(null, arr); return typedArrayToString(arr);
}, },
rQshiftBytes: function (len) { rQshiftBytes: function (len) {
if (typeof(len) === 'undefined') { len = this.rQlen(); } if (typeof(len) === 'undefined') { len = this.rQlen(); }
this._rQi += len; this._rQi += len;
return this._rQ.slice(this._rQi - len, this._rQi); return new Uint8Array(this._rQ.buffer, this._rQi - len, len);
},
rQshiftTo: function (target, len) {
if (len === undefined) { len = this.rQlen(); }
// 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;
}, },
rQslice: function (start, end) { rQslice: function (start, end) {
if (end) { if (end) {
return this._rQ.slice(this._rQi + start, this._rQi + end); return new Uint8Array(this._rQ.buffer, this._rQi + start, end - start);
} else { } else {
return this._rQ.slice(this._rQi + start); return new Uint8Array(this._rQ.buffer, this._rQi + start, this._rQlen - this._rQi - start);
} }
}, },
@ -154,7 +166,7 @@ function Websock() {
// to be available in the receive queue. Return true if we need to // to be available in the receive queue. Return true if we need to
// wait (and possibly print a debug message), otherwise false. // wait (and possibly print a debug message), otherwise false.
rQwait: function (msg, num, goback) { rQwait: function (msg, num, goback) {
var rQlen = this._rQ.length - this._rQi; // Skip rQlen() function call var rQlen = this._rQlen - this._rQi; // Skip rQlen() function call
if (rQlen < num) { if (rQlen < num) {
if (goback) { if (goback) {
if (this._rQi < goback) { if (this._rQi < goback) {
@ -175,9 +187,9 @@ function Websock() {
} }
if (this._websocket.bufferedAmount < this.maxBufferedAmount) { if (this._websocket.bufferedAmount < this.maxBufferedAmount) {
if (this._sQ.length > 0) { if (this._sQlen > 0) {
this._websocket.send(this._encode_message()); this._websocket.send(this._encode_message());
this._sQ = []; this._sQlen = 0;
} }
return true; return true;
@ -189,7 +201,8 @@ function Websock() {
}, },
send: function (arr) { send: function (arr) {
this._sQ = this._sQ.concat(arr); this._sQ.set(arr, this._sQlen);
this._sQlen += arr.length;
return this.flush(); return this.flush();
}, },
@ -208,10 +221,14 @@ function Websock() {
this._eventHandlers[evt] = handler; this._eventHandlers[evt] = handler;
}, },
_allocate_buffers: function () {
this._rQ = new Uint8Array(this._rQbufferSize);
this._sQ = new Uint8Array(this._sQbufferSize);
},
init: function (protocols, ws_schema) { init: function (protocols, ws_schema) {
this._rQ = []; this._allocate_buffers();
this._rQi = 0; this._rQi = 0;
this._sQ = [];
this._websocket = null; this._websocket = null;
// Check for full typed array support // Check for full typed array support
@ -238,35 +255,21 @@ function Websock() {
// Default protocols if not specified // Default protocols if not specified
if (typeof(protocols) === "undefined") { if (typeof(protocols) === "undefined") {
if (wsbt) { protocols = 'binary';
protocols = ['binary', 'base64'];
} else {
protocols = 'base64';
} }
if (Array.isArray(protocols) && protocols.indexOf('binary') > -1) {
protocols = 'binary';
} }
if (!wsbt) { if (!wsbt) {
if (protocols === 'binary') { throw new Error("noVNC no longer supports base64 WebSockets. " +
throw new Error('WebSocket binary sub-protocol requested but not supported'); "Please use a browser which supports binary WebSockets.");
} }
if (typeof(protocols) === 'object') { if (protocols != 'binary') {
var new_protocols = []; throw new Error("noVNC no longer supports base64 WebSockets. Please " +
"use the binary subprotocol instead.");
for (var i = 0; i < protocols.length; i++) {
if (protocols[i] === 'binary') {
Util.Error('Skipping unsupported WebSocket binary sub-protocol');
} else {
new_protocols.push(protocols[i]);
}
}
if (new_protocols.length > 0) {
protocols = new_protocols;
} else {
throw new Error("Only WebSocket binary sub-protocol was requested and is not supported.");
}
}
} }
return protocols; return protocols;
@ -289,9 +292,16 @@ function Websock() {
this._mode = this._websocket.protocol; this._mode = this._websocket.protocol;
Util.Info("Server choose sub-protocol: " + this._websocket.protocol); Util.Info("Server choose sub-protocol: " + this._websocket.protocol);
} else { } else {
this._mode = 'base64'; this._mode = 'binary';
Util.Error('Server select no sub-protocol!: ' + this._websocket.protocol); Util.Error('Server select no sub-protocol!: ' + this._websocket.protocol);
} }
if (this._mode != 'binary') {
throw new Error("noVNC no longer supports base64 WebSockets. Please " +
"use the binary subprotocol instead.");
}
this._eventHandlers.open(); this._eventHandlers.open();
Util.Debug("<< WebSock.onopen"); Util.Debug("<< WebSock.onopen");
}).bind(this); }).bind(this);
@ -321,26 +331,16 @@ function Websock() {
// private methods // private methods
_encode_message: function () { _encode_message: function () {
if (this._mode === 'binary') {
// Put in a binary arraybuffer // Put in a binary arraybuffer
return (new Uint8Array(this._sQ)).buffer; // according to the spec, you can send ArrayBufferViews with the send method
} else { return new Uint8Array(this._sQ.buffer, 0, this._sQlen);
// base64 encode
return Base64.encode(this._sQ);
}
}, },
_decode_message: function (data) { _decode_message: function (data) {
if (this._mode === 'binary') {
// push arraybuffer values onto the end // push arraybuffer values onto the end
var u8 = new Uint8Array(data); var u8 = new Uint8Array(data);
for (var i = 0; i < u8.length; i++) { this._rQ.set(u8, this._rQlen);
this._rQ.push(u8[i]); this._rQlen += u8.length;
}
} else {
// base64 decode and concat to end
this._rQ = this._rQ.concat(Base64.decode(data, 0));
}
}, },
_recv_message: function (e) { _recv_message: function (e) {
@ -349,8 +349,26 @@ function Websock() {
if (this.rQlen() > 0) { if (this.rQlen() > 0) {
this._eventHandlers.message(); this._eventHandlers.message();
// Compact the receive queue // Compact the receive queue
if (this._rQ.length > this._rQmax) { if (this._rQlen == this._rQi) {
this._rQ = this._rQ.slice(this._rQi); this._rQlen = 0;
this._rQi = 0;
} else if (this._rQlen > this._rQmax) {
if (this._rQlen - this._rQi > 0.5 * this._rQbufferSize) {
var old_rQbuffer = this._rQ.buffer;
this._rQbufferSize *= 2;
this._rQmax = this._rQbufferSize / 8;
this._rQ = new Uint8Array(this._rQbufferSize);
this._rQ.set(new Uint8Array(old_rQbuffer, this._rQi));
} else {
if (this._rQ.copyWithin) {
// Firefox only, ATM
this._rQ.copyWithin(0, this._rQi);
} else {
this._rQ.set(new Uint8Array(this._rQ.buffer, this._rQi));
}
}
this._rQlen = this._rQlen - this._rQi;
this._rQi = 0; this._rQi = 0;
} }
} else { } else {

2
karma.conf.js
View File

@ -119,9 +119,9 @@ module.exports = function(config) {
'include/input.js', 'include/input.js',
'include/websock.js', 'include/websock.js',
'include/rfb.js', 'include/rfb.js',
'include/jsunzip.js',
'include/des.js', 'include/des.js',
'include/display.js', 'include/display.js',
'include/inflator.js',
'tests/test.*.js' 'tests/test.*.js'
], ],

77
tests/assertions.js
View File

@ -5,7 +5,17 @@ chai.use(function (_chai, utils) {
var data_cl = obj._drawCtx.getImageData(0, 0, obj._viewportLoc.w, obj._viewportLoc.h).data; var data_cl = obj._drawCtx.getImageData(0, 0, obj._viewportLoc.w, obj._viewportLoc.h).data;
// NB(directxman12): PhantomJS 1.x doesn't implement Uint8ClampedArray, so work around that // NB(directxman12): PhantomJS 1.x doesn't implement Uint8ClampedArray, so work around that
var data = new Uint8Array(data_cl); var data = new Uint8Array(data_cl);
this.assert(utils.eql(data, target_data), var same = true;
for (var i = 0; i < obj.length; i++) {
if (data[i] != target_data[i]) {
same = false;
break;
}
}
if (!same) {
console.log("expected data: %o, actual data: %o", target_data, data);
}
this.assert(same,
"expected #{this} to have displayed the image #{exp}, but instead it displayed #{act}", "expected #{this} to have displayed the image #{exp}, but instead it displayed #{act}",
"expected #{this} not to have displayed the image #{act}", "expected #{this} not to have displayed the image #{act}",
target_data, target_data,
@ -14,11 +24,70 @@ chai.use(function (_chai, utils) {
_chai.Assertion.addMethod('sent', function (target_data) { _chai.Assertion.addMethod('sent', function (target_data) {
var obj = this._obj; var obj = this._obj;
obj.inspect = function () {
var res = { _websocket: obj._websocket, rQi: obj._rQi, _rQ: new Uint8Array(obj._rQ.buffer, 0, obj._rQlen),
_sQ: new Uint8Array(obj._sQ.buffer, 0, obj._sQlen) };
res.prototype = obj;
return res;
};
var data = obj._websocket._get_sent_data(); var data = obj._websocket._get_sent_data();
this.assert(utils.eql(data, target_data), var same = true;
for (var i = 0; i < obj.length; i++) {
if (data[i] != target_data[i]) {
same = false;
break;
}
}
if (!same) {
console.log("expected data: %o, actual data: %o", target_data, data);
}
this.assert(same,
"expected #{this} to have sent the data #{exp}, but it actually sent #{act}", "expected #{this} to have sent the data #{exp}, but it actually sent #{act}",
"expected #{this} not to have sent the data #{act}", "expected #{this} not to have sent the data #{act}",
target_data, Array.prototype.slice.call(target_data),
data); Array.prototype.slice.call(data));
});
_chai.Assertion.addProperty('array', function () {
utils.flag(this, 'array', true);
});
_chai.Assertion.overwriteMethod('equal', function (_super) {
return function assertArrayEqual(target) {
if (utils.flag(this, 'array')) {
var obj = this._obj;
var i;
var same = true;
if (utils.flag(this, 'deep')) {
for (i = 0; i < obj.length; i++) {
if (!utils.eql(obj[i], target[i])) {
same = false;
break;
}
}
this.assert(same,
"expected #{this} to have elements deeply equal to #{exp}",
"expected #{this} not to have elements deeply equal to #{exp}",
Array.prototype.slice.call(target));
} else {
for (i = 0; i < obj.length; i++) {
if (obj[i] != target[i]) {
same = false;
break;
}
}
this.assert(same,
"expected #{this} to have elements equal to #{exp}",
"expected #{this} not to have elements equal to #{exp}",
Array.prototype.slice.call(target));
}
} else {
_super.apply(this, arguments);
}
};
}); });
}); });

9
tests/fake.websocket.js
View File

@ -51,14 +51,9 @@ var FakeWebSocket;
}, },
_get_sent_data: function () { _get_sent_data: function () {
var arr = []; var res = new Uint8Array(this._send_queue.buffer, 0, this.bufferedAmount);
for (var i = 0; i < this.bufferedAmount; i++) {
arr[i] = this._send_queue[i];
}
this.bufferedAmount = 0; this.bufferedAmount = 0;
return res;
return arr;
}, },
_open: function (data) { _open: function (data) {

14
tests/run_from_console.casper.js
View File

@ -15,7 +15,19 @@ var casper_opts = {
} }
}; };
var provide_emitter = function(file_paths) { var provide_emitter = function(file_paths, debug_port) {
if (debug_port) {
casper_opts.child['remote-debugger-port'] = debug_port;
var debug_url = ('https://localhost:' + debug_port +
'/webkit/inspector/inspector.html?page=');
console.info('[remote-debugger] Navigate to ' + debug_url + '1 and ' +
'run `__run();` in the console to continue loading.' +
'\n[remote-debugger] Navigate to ' + debug_url + '2 to ' +
'view the actual page source.\n' +
'[remote-debugger] Use the `debugger;` statement to ' +
'trigger an initial breakpoint.');
}
var spooky = new Spooky(casper_opts, function(err) { var spooky = new Spooky(casper_opts, function(err) {
if (err) { if (err) {
if (err.stack) console.warn(err.stack); if (err.stack) console.warn(err.stack);

23
tests/run_from_console.js
View File

@ -20,6 +20,7 @@ program
.option('--output-html', 'Instead of running the tests, just output the generated HTML source to STDOUT (should be used with .js tests)') .option('--output-html', 'Instead of running the tests, just output the generated HTML source to STDOUT (should be used with .js tests)')
.option('-d, --debug', 'Show debug output (the "console" event) from the provider') .option('-d, --debug', 'Show debug output (the "console" event) from the provider')
.option('-r, --relative', 'Use relative paths in the generated HTML file') .option('-r, --relative', 'Use relative paths in the generated HTML file')
.option('--debugger <port>', 'Enable the remote debugger for CasperJS')
.parse(process.argv); .parse(process.argv);
if (program.tests.length === 0) { if (program.tests.length === 0) {
@ -202,7 +203,7 @@ if (!program.outputHtml && !program.generateHtml) {
.write("\n"); .write("\n");
//console.log("Running tests %s using provider %s", program.tests.join(', '), prov.name); //console.log("Running tests %s using provider %s", program.tests.join(', '), prov.name);
var provider = prov.provide_emitter(file_paths); var provider = prov.provide_emitter(file_paths, program.debugger);
provider.on('test_ready', function(test_json) { provider.on('test_ready', function(test_json) {
console.log(''); console.log('');
@ -249,6 +250,24 @@ if (!program.outputHtml && !program.generateHtml) {
console.log(''); console.log('');
if (test_json.num_fails > 0 || program.printAll) { if (test_json.num_fails > 0 || program.printAll) {
var extract_error_lines = function (err) {
// the split is to avoid a weird thing where in PhantomJS where we get a stack trace too
var err_lines = err.split('\n');
if (err_lines.length == 1) {
return err_lines[0];
} else {
var ind;
for (ind = 0; ind < err_lines.length; ind++) {
var at_ind = err_lines[ind].trim().indexOf('at ');
if (at_ind === 0) {
break;
}
}
return err_lines.slice(0, ind).join('\n');
}
};
var traverse_tree = function(indentation, node) { var traverse_tree = function(indentation, node) {
if (node.type == 'suite') { if (node.type == 'suite') {
if (!node.has_subfailures && !program.printAll) return; if (!node.has_subfailures && !program.printAll) return;
@ -280,7 +299,7 @@ if (!program.outputHtml && !program.generateHtml) {
cursor.magenta(); cursor.magenta();
console.log('- failed: '+node.text+test_json.replay); console.log('- failed: '+node.text+test_json.replay);
cursor.red(); cursor.red();
console.log(' '+node.error.split("\n")[0]); // the split is to avoid a weird thing where in PhantomJS where we get a stack trace too console.log(' '+extract_error_lines(node.error));
cursor.reset(); cursor.reset();
console.log(''); console.log('');
} }

207
tests/test.rfb.js
View File

@ -1,4 +1,4 @@
// requires local modules: util, base64, websock, rfb, keyboard, keysym, keysymdef, input, jsunzip, des, display // requires local modules: util, websock, rfb, keyboard, keysym, keysymdef, input, inflator, des, display
// requires test modules: fake.websocket, assertions // requires test modules: fake.websocket, assertions
/* jshint expr: true */ /* jshint expr: true */
var assert = chai.assert; var assert = chai.assert;
@ -18,6 +18,27 @@ describe('Remote Frame Buffer Protocol Client', function() {
before(FakeWebSocket.replace); before(FakeWebSocket.replace);
after(FakeWebSocket.restore); after(FakeWebSocket.restore);
before(function () {
this.clock = sinon.useFakeTimers();
// Use a single set of buffers instead of reallocating to
// speed up tests
var sock = new Websock();
var _sQ = new Uint8Array(sock._sQbufferSize);
var rQ = new Uint8Array(sock._rQbufferSize);
Websock.prototype._old_allocate_buffers = Websock.prototype._allocate_buffers;
Websock.prototype._allocate_buffers = function () {
this._sQ = _sQ;
this._rQ = rQ;
};
});
after(function () {
Websock.prototype._allocate_buffers = Websock.prototype._old_allocate_buffers;
this.clock.restore();
});
describe('Public API Basic Behavior', function () { describe('Public API Basic Behavior', function () {
var client; var client;
beforeEach(function () { beforeEach(function () {
@ -105,34 +126,34 @@ describe('Remote Frame Buffer Protocol Client', function() {
client._sock = new Websock(); client._sock = new Websock();
client._sock.open('ws://', 'binary'); client._sock.open('ws://', 'binary');
client._sock._websocket._open(); client._sock._websocket._open();
sinon.spy(client._sock, 'send'); sinon.spy(client._sock, 'flush');
client._rfb_state = "normal"; client._rfb_state = "normal";
client._view_only = false; client._view_only = false;
}); });
it('should sent ctrl[down]-alt[down]-del[down] then del[up]-alt[up]-ctrl[up]', function () { it('should sent ctrl[down]-alt[down]-del[down] then del[up]-alt[up]-ctrl[up]', function () {
var expected = []; var expected = {_sQ: new Uint8Array(48), _sQlen: 0};
expected = expected.concat(RFB.messages.keyEvent(0xFFE3, 1)); RFB.messages.keyEvent(expected, 0xFFE3, 1);
expected = expected.concat(RFB.messages.keyEvent(0xFFE9, 1)); RFB.messages.keyEvent(expected, 0xFFE9, 1);
expected = expected.concat(RFB.messages.keyEvent(0xFFFF, 1)); RFB.messages.keyEvent(expected, 0xFFFF, 1);
expected = expected.concat(RFB.messages.keyEvent(0xFFFF, 0)); RFB.messages.keyEvent(expected, 0xFFFF, 0);
expected = expected.concat(RFB.messages.keyEvent(0xFFE9, 0)); RFB.messages.keyEvent(expected, 0xFFE9, 0);
expected = expected.concat(RFB.messages.keyEvent(0xFFE3, 0)); RFB.messages.keyEvent(expected, 0xFFE3, 0);
client.sendCtrlAltDel(); client.sendCtrlAltDel();
expect(client._sock).to.have.sent(expected); expect(client._sock).to.have.sent(expected._sQ);
}); });
it('should not send the keys if we are not in a normal state', function () { it('should not send the keys if we are not in a normal state', function () {
client._rfb_state = "broken"; client._rfb_state = "broken";
client.sendCtrlAltDel(); client.sendCtrlAltDel();
expect(client._sock.send).to.not.have.been.called; expect(client._sock.flush).to.not.have.been.called;
}); });
it('should not send the keys if we are set as view_only', function () { it('should not send the keys if we are set as view_only', function () {
client._view_only = true; client._view_only = true;
client.sendCtrlAltDel(); client.sendCtrlAltDel();
expect(client._sock.send).to.not.have.been.called; expect(client._sock.flush).to.not.have.been.called;
}); });
}); });
@ -141,34 +162,36 @@ describe('Remote Frame Buffer Protocol Client', function() {
client._sock = new Websock(); client._sock = new Websock();
client._sock.open('ws://', 'binary'); client._sock.open('ws://', 'binary');
client._sock._websocket._open(); client._sock._websocket._open();
sinon.spy(client._sock, 'send'); sinon.spy(client._sock, 'flush');
client._rfb_state = "normal"; client._rfb_state = "normal";
client._view_only = false; client._view_only = false;
}); });
it('should send a single key with the given code and state (down = true)', function () { it('should send a single key with the given code and state (down = true)', function () {
var expected = RFB.messages.keyEvent(123, 1); var expected = {_sQ: new Uint8Array(8), _sQlen: 0};
RFB.messages.keyEvent(expected, 123, 1);
client.sendKey(123, true); client.sendKey(123, true);
expect(client._sock).to.have.sent(expected); expect(client._sock).to.have.sent(expected._sQ);
}); });
it('should send both a down and up event if the state is not specified', function () { it('should send both a down and up event if the state is not specified', function () {
var expected = RFB.messages.keyEvent(123, 1); var expected = {_sQ: new Uint8Array(16), _sQlen: 0};
expected = expected.concat(RFB.messages.keyEvent(123, 0)); RFB.messages.keyEvent(expected, 123, 1);
RFB.messages.keyEvent(expected, 123, 0);
client.sendKey(123); client.sendKey(123);
expect(client._sock).to.have.sent(expected); expect(client._sock).to.have.sent(expected._sQ);
}); });
it('should not send the key if we are not in a normal state', function () { it('should not send the key if we are not in a normal state', function () {
client._rfb_state = "broken"; client._rfb_state = "broken";
client.sendKey(123); client.sendKey(123);
expect(client._sock.send).to.not.have.been.called; expect(client._sock.flush).to.not.have.been.called;
}); });
it('should not send the key if we are set as view_only', function () { it('should not send the key if we are set as view_only', function () {
client._view_only = true; client._view_only = true;
client.sendKey(123); client.sendKey(123);
expect(client._sock.send).to.not.have.been.called; expect(client._sock.flush).to.not.have.been.called;
}); });
}); });
@ -177,21 +200,22 @@ describe('Remote Frame Buffer Protocol Client', function() {
client._sock = new Websock(); client._sock = new Websock();
client._sock.open('ws://', 'binary'); client._sock.open('ws://', 'binary');
client._sock._websocket._open(); client._sock._websocket._open();
sinon.spy(client._sock, 'send'); sinon.spy(client._sock, 'flush');
client._rfb_state = "normal"; client._rfb_state = "normal";
client._view_only = false; client._view_only = false;
}); });
it('should send the given text in a paste event', function () { it('should send the given text in a paste event', function () {
var expected = RFB.messages.clientCutText('abc'); var expected = {_sQ: new Uint8Array(11), _sQlen: 0};
RFB.messages.clientCutText(expected, 'abc');
client.clipboardPasteFrom('abc'); client.clipboardPasteFrom('abc');
expect(client._sock).to.have.sent(expected); expect(client._sock).to.have.sent(expected._sQ);
}); });
it('should not send the text if we are not in a normal state', function () { it('should not send the text if we are not in a normal state', function () {
client._rfb_state = "broken"; client._rfb_state = "broken";
client.clipboardPasteFrom('abc'); client.clipboardPasteFrom('abc');
expect(client._sock.send).to.not.have.been.called; expect(client._sock.flush).to.not.have.been.called;
}); });
}); });
@ -200,7 +224,7 @@ describe('Remote Frame Buffer Protocol Client', function() {
client._sock = new Websock(); client._sock = new Websock();
client._sock.open('ws://', 'binary'); client._sock.open('ws://', 'binary');
client._sock._websocket._open(); client._sock._websocket._open();
sinon.spy(client._sock, 'send'); sinon.spy(client._sock, 'flush');
client._rfb_state = "normal"; client._rfb_state = "normal";
client._view_only = false; client._view_only = false;
client._supportsSetDesktopSize = true; client._supportsSetDesktopSize = true;
@ -221,19 +245,19 @@ describe('Remote Frame Buffer Protocol Client', function() {
expected.push32(0); // flags expected.push32(0); // flags
client.setDesktopSize(1, 2); client.setDesktopSize(1, 2);
expect(client._sock).to.have.sent(expected); expect(client._sock).to.have.sent(new Uint8Array(expected));
}); });
it('should not send the request if the client has not recieved a ExtendedDesktopSize rectangle', function () { it('should not send the request if the client has not recieved a ExtendedDesktopSize rectangle', function () {
client._supportsSetDesktopSize = false; client._supportsSetDesktopSize = false;
client.setDesktopSize(1,2); client.setDesktopSize(1,2);
expect(client._sock.send).to.not.have.been.called; expect(client._sock.flush).to.not.have.been.called;
}); });
it('should not send the request if we are not in a normal state', function () { it('should not send the request if we are not in a normal state', function () {
client._rfb_state = "broken"; client._rfb_state = "broken";
client.setDesktopSize(1,2); client.setDesktopSize(1,2);
expect(client._sock.send).to.not.have.been.called; expect(client._sock.flush).to.not.have.been.called;
}); });
}); });
@ -242,7 +266,7 @@ describe('Remote Frame Buffer Protocol Client', function() {
client._sock = new Websock(); client._sock = new Websock();
client._sock.open('ws://', 'binary'); client._sock.open('ws://', 'binary');
client._sock._websocket._open(); client._sock._websocket._open();
sinon.spy(client._sock, 'send'); sinon.spy(client._sock, 'flush');
client._rfb_state = "normal"; client._rfb_state = "normal";
client._view_only = false; client._view_only = false;
client._rfb_xvp_ver = 1; client._rfb_xvp_ver = 1;
@ -250,27 +274,27 @@ describe('Remote Frame Buffer Protocol Client', function() {
it('should send the shutdown signal on #xvpShutdown', function () { it('should send the shutdown signal on #xvpShutdown', function () {
client.xvpShutdown(); client.xvpShutdown();
expect(client._sock).to.have.sent([0xFA, 0x00, 0x01, 0x02]); expect(client._sock).to.have.sent(new Uint8Array([0xFA, 0x00, 0x01, 0x02]));
}); });
it('should send the reboot signal on #xvpReboot', function () { it('should send the reboot signal on #xvpReboot', function () {
client.xvpReboot(); client.xvpReboot();
expect(client._sock).to.have.sent([0xFA, 0x00, 0x01, 0x03]); expect(client._sock).to.have.sent(new Uint8Array([0xFA, 0x00, 0x01, 0x03]));
}); });
it('should send the reset signal on #xvpReset', function () { it('should send the reset signal on #xvpReset', function () {
client.xvpReset(); client.xvpReset();
expect(client._sock).to.have.sent([0xFA, 0x00, 0x01, 0x04]); expect(client._sock).to.have.sent(new Uint8Array([0xFA, 0x00, 0x01, 0x04]));
}); });
it('should support sending arbitrary XVP operations via #xvpOp', function () { it('should support sending arbitrary XVP operations via #xvpOp', function () {
client.xvpOp(1, 7); client.xvpOp(1, 7);
expect(client._sock).to.have.sent([0xFA, 0x00, 0x01, 0x07]); expect(client._sock).to.have.sent(new Uint8Array([0xFA, 0x00, 0x01, 0x07]));
}); });
it('should not send XVP operations with higher versions than we support', function () { it('should not send XVP operations with higher versions than we support', function () {
expect(client.xvpOp(2, 7)).to.be.false; expect(client.xvpOp(2, 7)).to.be.false;
expect(client._sock.send).to.not.have.been.called; expect(client._sock.flush).to.not.have.been.called;
}); });
}); });
}); });
@ -483,7 +507,7 @@ describe('Remote Frame Buffer Protocol Client', function() {
expect(client._rfb_version).to.equal(0); expect(client._rfb_version).to.equal(0);
var sent_data = client._sock._websocket._get_sent_data(); var sent_data = client._sock._websocket._get_sent_data();
expect(sent_data.slice(0, 5)).to.deep.equal([1, 2, 3, 4, 5]); expect(new Uint8Array(sent_data.buffer, 0, 5)).to.array.equal(new Uint8Array([1, 2, 3, 4, 5]));
}); });
it('should interpret version 003.003 as version 3.3', function () { it('should interpret version 003.003 as version 3.3', function () {
@ -540,7 +564,7 @@ describe('Remote Frame Buffer Protocol Client', function() {
send_ver('000.000', client); send_ver('000.000', client);
expect(client._rfb_version).to.equal(0); expect(client._rfb_version).to.equal(0);
var sent_data = client._sock._websocket._get_sent_data(); var sent_data = client._sock._websocket._get_sent_data();
expect(sent_data.slice(0, 5)).to.deep.equal([1, 2, 3, 4, 5]); expect(new Uint8Array(sent_data.buffer, 0, 5)).to.array.equal(new Uint8Array([1, 2, 3, 4, 5]));
expect(sent_data).to.have.length(250); expect(sent_data).to.have.length(250);
send_ver('003.008', client); send_ver('003.008', client);
@ -563,7 +587,7 @@ describe('Remote Frame Buffer Protocol Client', function() {
expected[i] = expected_str.charCodeAt(i); expected[i] = expected_str.charCodeAt(i);
} }
expect(client._sock).to.have.sent(expected); expect(client._sock).to.have.sent(new Uint8Array(expected));
}); });
it('should transition to the Security state on successful negotiation', function () { it('should transition to the Security state on successful negotiation', function () {
@ -596,7 +620,7 @@ describe('Remote Frame Buffer Protocol Client', function() {
var auth_schemes = [2, 1, 2]; var auth_schemes = [2, 1, 2];
client._sock._websocket._receive_data(auth_schemes); client._sock._websocket._receive_data(auth_schemes);
expect(client._rfb_auth_scheme).to.equal(2); expect(client._rfb_auth_scheme).to.equal(2);
expect(client._sock).to.have.sent([2]); expect(client._sock).to.have.sent(new Uint8Array([2]));
}); });
it('should fail if there are no supported schemes for versions >= 3.7', function () { it('should fail if there are no supported schemes for versions >= 3.7', function () {
@ -702,7 +726,7 @@ describe('Remote Frame Buffer Protocol Client', function() {
client._sock._websocket._receive_data(new Uint8Array(challenge)); client._sock._websocket._receive_data(new Uint8Array(challenge));
var des_pass = RFB.genDES('passwd', challenge); var des_pass = RFB.genDES('passwd', challenge);
expect(client._sock).to.have.sent(des_pass); expect(client._sock).to.have.sent(new Uint8Array(des_pass));
}); });
it('should transition to SecurityResult immediately after sending the password', function () { it('should transition to SecurityResult immediately after sending the password', function () {
@ -759,7 +783,7 @@ describe('Remote Frame Buffer Protocol Client', function() {
var expected = [22, 4, 6]; // auth selection, len user, len target var expected = [22, 4, 6]; // auth selection, len user, len target
for (var i = 0; i < 10; i++) { expected[i+3] = 'usertarget'.charCodeAt(i); } for (var i = 0; i < 10; i++) { expected[i+3] = 'usertarget'.charCodeAt(i); }
expect(client._sock).to.have.sent(expected); expect(client._sock).to.have.sent(new Uint8Array(expected));
}); });
}); });
@ -807,14 +831,14 @@ describe('Remote Frame Buffer Protocol Client', function() {
it('should choose the notunnel tunnel type', function () { it('should choose the notunnel tunnel type', function () {
send_num_str_pairs([[0, 'TGHT', 'NOTUNNEL'], [123, 'OTHR', 'SOMETHNG']], client); send_num_str_pairs([[0, 'TGHT', 'NOTUNNEL'], [123, 'OTHR', 'SOMETHNG']], client);
expect(client._sock).to.have.sent([0, 0, 0, 0]); expect(client._sock).to.have.sent(new Uint8Array([0, 0, 0, 0]));
}); });
it('should continue to sub-auth negotiation after tunnel negotiation', function () { it('should continue to sub-auth negotiation after tunnel negotiation', function () {
send_num_str_pairs([[0, 'TGHT', 'NOTUNNEL']], client); send_num_str_pairs([[0, 'TGHT', 'NOTUNNEL']], client);
client._sock._websocket._get_sent_data(); // skip the tunnel choice here client._sock._websocket._get_sent_data(); // skip the tunnel choice here
send_num_str_pairs([[1, 'STDV', 'NOAUTH__']], client); send_num_str_pairs([[1, 'STDV', 'NOAUTH__']], client);
expect(client._sock).to.have.sent([0, 0, 0, 1]); expect(client._sock).to.have.sent(new Uint8Array([0, 0, 0, 1]));
expect(client._rfb_state).to.equal('SecurityResult'); expect(client._rfb_state).to.equal('SecurityResult');
}); });
@ -830,7 +854,7 @@ describe('Remote Frame Buffer Protocol Client', function() {
it('should accept the "no auth" auth type and transition to SecurityResult', function () { it('should accept the "no auth" auth type and transition to SecurityResult', function () {
client._rfb_tightvnc = true; client._rfb_tightvnc = true;
send_num_str_pairs([[1, 'STDV', 'NOAUTH__']], client); send_num_str_pairs([[1, 'STDV', 'NOAUTH__']], client);
expect(client._sock).to.have.sent([0, 0, 0, 1]); expect(client._sock).to.have.sent(new Uint8Array([0, 0, 0, 1]));
expect(client._rfb_state).to.equal('SecurityResult'); expect(client._rfb_state).to.equal('SecurityResult');
}); });
@ -838,7 +862,7 @@ describe('Remote Frame Buffer Protocol Client', function() {
client._rfb_tightvnc = true; client._rfb_tightvnc = true;
client._negotiate_std_vnc_auth = sinon.spy(); client._negotiate_std_vnc_auth = sinon.spy();
send_num_str_pairs([[2, 'STDV', 'VNCAUTH__']], client); send_num_str_pairs([[2, 'STDV', 'VNCAUTH__']], client);
expect(client._sock).to.have.sent([0, 0, 0, 2]); expect(client._sock).to.have.sent(new Uint8Array([0, 0, 0, 2]));
expect(client._negotiate_std_vnc_auth).to.have.been.calledOnce; expect(client._negotiate_std_vnc_auth).to.have.been.calledOnce;
expect(client._rfb_auth_scheme).to.equal(2); expect(client._rfb_auth_scheme).to.equal(2);
}); });
@ -902,13 +926,13 @@ describe('Remote Frame Buffer Protocol Client', function() {
it('should send 1 if we are in shared mode', function () { it('should send 1 if we are in shared mode', function () {
client.set_shared(true); client.set_shared(true);
client._sock._websocket._receive_data(new Uint8Array([0, 0, 0, 0])); client._sock._websocket._receive_data(new Uint8Array([0, 0, 0, 0]));
expect(client._sock).to.have.sent([1]); expect(client._sock).to.have.sent(new Uint8Array([1]));
}); });
it('should send 0 if we are not in shared mode', function () { it('should send 0 if we are not in shared mode', function () {
client.set_shared(false); client.set_shared(false);
client._sock._websocket._receive_data(new Uint8Array([0, 0, 0, 0])); client._sock._websocket._receive_data(new Uint8Array([0, 0, 0, 0]));
expect(client._sock).to.have.sent([0]); expect(client._sock).to.have.sent(new Uint8Array([0]));
}); });
}); });
@ -1045,21 +1069,16 @@ describe('Remote Frame Buffer Protocol Client', function() {
it('should reply with the pixel format, client encodings, and initial update request', function () { it('should reply with the pixel format, client encodings, and initial update request', function () {
client.set_true_color(true); client.set_true_color(true);
client.set_local_cursor(false); client.set_local_cursor(false);
var expected = RFB.messages.pixelFormat(4, 3, true); // we skip the cursor encoding
expected = expected.concat(RFB.messages.clientEncodings(client._encodings, false, true)); var expected = {_sQ: new Uint8Array(34 + 4 * (client._encodings.length - 1)), _sQlen: 0};
RFB.messages.pixelFormat(expected, 4, 3, true);
RFB.messages.clientEncodings(expected, client._encodings, false, true);
var expected_cdr = { cleanBox: { x: 0, y: 0, w: 0, h: 0 }, var expected_cdr = { cleanBox: { x: 0, y: 0, w: 0, h: 0 },
dirtyBoxes: [ { x: 0, y: 0, w: 27, h: 32 } ] }; dirtyBoxes: [ { x: 0, y: 0, w: 27, h: 32 } ] };
expected = expected.concat(RFB.messages.fbUpdateRequests(expected_cdr, 27, 32)); RFB.messages.fbUpdateRequests(expected, expected_cdr, 27, 32);
send_server_init({ width: 27, height: 32 }, client); send_server_init({ width: 27, height: 32 }, client);
expect(client._sock).to.have.sent(expected); expect(client._sock).to.have.sent(expected._sQ);
});
it('should check for sending mouse events', function () {
// be lazy with our checking so we don't have to check through the whole sent buffer
sinon.spy(client, '_checkEvents');
send_server_init({}, client);
expect(client._checkEvents).to.have.been.calledOnce;
}); });
it('should transition to the "normal" state', function () { it('should transition to the "normal" state', function () {
@ -1142,14 +1161,15 @@ describe('Remote Frame Buffer Protocol Client', function() {
} }
it('should send an update request if there is sufficient data', function () { it('should send an update request if there is sufficient data', function () {
var expected_msg = {_sQ: new Uint8Array(10), _sQlen: 0};
var expected_cdr = { cleanBox: { x: 0, y: 0, w: 0, h: 0 }, var expected_cdr = { cleanBox: { x: 0, y: 0, w: 0, h: 0 },
dirtyBoxes: [ { x: 0, y: 0, w: 240, h: 20 } ] }; dirtyBoxes: [ { x: 0, y: 0, w: 240, h: 20 } ] };
var expected_msg = RFB.messages.fbUpdateRequests(expected_cdr, 240, 20); RFB.messages.fbUpdateRequests(expected_msg, expected_cdr, 240, 20);
client._framebufferUpdate = function () { return true; }; client._framebufferUpdate = function () { return true; };
client._sock._websocket._receive_data(new Uint8Array([0])); client._sock._websocket._receive_data(new Uint8Array([0]));
expect(client._sock).to.have.sent(expected_msg); expect(client._sock).to.have.sent(expected_msg._sQ);
}); });
it('should not send an update request if we need more data', function () { it('should not send an update request if we need more data', function () {
@ -1158,9 +1178,10 @@ describe('Remote Frame Buffer Protocol Client', function() {
}); });
it('should resume receiving an update if we previously did not have enough data', function () { it('should resume receiving an update if we previously did not have enough data', function () {
var expected_msg = {_sQ: new Uint8Array(10), _sQlen: 0};
var expected_cdr = { cleanBox: { x: 0, y: 0, w: 0, h: 0 }, var expected_cdr = { cleanBox: { x: 0, y: 0, w: 0, h: 0 },
dirtyBoxes: [ { x: 0, y: 0, w: 240, h: 20 } ] }; dirtyBoxes: [ { x: 0, y: 0, w: 240, h: 20 } ] };
var expected_msg = RFB.messages.fbUpdateRequests(expected_cdr, 240, 20); RFB.messages.fbUpdateRequests(expected_msg, expected_cdr, 240, 20);
// just enough to set FBU.rects // just enough to set FBU.rects
client._sock._websocket._receive_data(new Uint8Array([0, 0, 0, 3])); client._sock._websocket._receive_data(new Uint8Array([0, 0, 0, 3]));
@ -1169,7 +1190,7 @@ describe('Remote Frame Buffer Protocol Client', function() {
client._framebufferUpdate = function () { return true; }; // we magically have enough data client._framebufferUpdate = function () { return true; }; // we magically have enough data
// 247 should *not* be used as the message type here // 247 should *not* be used as the message type here
client._sock._websocket._receive_data(new Uint8Array([247])); client._sock._websocket._receive_data(new Uint8Array([247]));
expect(client._sock).to.have.sent(expected_msg); expect(client._sock).to.have.sent(expected_msg._sQ);
}); });
it('should parse out information from a header before any actual data comes in', function () { it('should parse out information from a header before any actual data comes in', function () {
@ -1691,58 +1712,61 @@ describe('Remote Frame Buffer Protocol Client', function() {
var client; var client;
beforeEach(function () { beforeEach(function () {
client = make_rfb(); client = make_rfb();
client._sock.send = sinon.spy(); client._sock = new Websock();
client._sock.open('ws://', 'binary');
client._sock._websocket._open();
sinon.spy(client._sock, 'flush');
client._rfb_state = 'normal'; client._rfb_state = 'normal';
}); });
it('should not send button messages in view-only mode', function () { it('should not send button messages in view-only mode', function () {
client._view_only = true; client._view_only = true;
client._mouse._onMouseButton(0, 0, 1, 0x001); client._mouse._onMouseButton(0, 0, 1, 0x001);
expect(client._sock.send).to.not.have.been.called; expect(client._sock.flush).to.not.have.been.called;
}); });
it('should not send movement messages in view-only mode', function () { it('should not send movement messages in view-only mode', function () {
client._view_only = true; client._view_only = true;
client._mouse._onMouseMove(0, 0); client._mouse._onMouseMove(0, 0);
expect(client._sock.send).to.not.have.been.called; expect(client._sock.flush).to.not.have.been.called;
}); });
it('should send a pointer event on mouse button presses', function () { it('should send a pointer event on mouse button presses', function () {
client._mouse._onMouseButton(10, 12, 1, 0x001); client._mouse._onMouseButton(10, 12, 1, 0x001);
expect(client._sock.send).to.have.been.calledOnce; var pointer_msg = {_sQ: new Uint8Array(6), _sQlen: 0};
var pointer_msg = RFB.messages.pointerEvent(10, 12, 0x001); RFB.messages.pointerEvent(pointer_msg, 10, 12, 0x001);
expect(client._sock.send).to.have.been.calledWith(pointer_msg); expect(client._sock).to.have.sent(pointer_msg._sQ);
}); });
it('should send a mask of 1 on mousedown', function () { it('should send a mask of 1 on mousedown', function () {
client._mouse._onMouseButton(10, 12, 1, 0x001); client._mouse._onMouseButton(10, 12, 1, 0x001);
expect(client._sock.send).to.have.been.calledOnce; var pointer_msg = {_sQ: new Uint8Array(6), _sQlen: 0};
var pointer_msg = RFB.messages.pointerEvent(10, 12, 0x001); RFB.messages.pointerEvent(pointer_msg, 0, 10, 12, 0x001);
expect(client._sock.send).to.have.been.calledWith(pointer_msg); expect(client._sock).to.have.sent(pointer_msg._sQ);
}); });
it('should send a mask of 0 on mouseup', function () { it('should send a mask of 0 on mouseup', function () {
client._mouse_buttonMask = 0x001; client._mouse_buttonMask = 0x001;
client._mouse._onMouseButton(10, 12, 0, 0x001); client._mouse._onMouseButton(10, 12, 0, 0x001);
expect(client._sock.send).to.have.been.calledOnce; var pointer_msg = {_sQ: new Uint8Array(6), _sQlen: 0};
var pointer_msg = RFB.messages.pointerEvent(10, 12, 0x000); RFB.messages.pointerEvent(pointer_msg, 10, 12, 0x000);
expect(client._sock.send).to.have.been.calledWith(pointer_msg); expect(client._sock).to.have.sent(pointer_msg._sQ);
}); });
it('should send a pointer event on mouse movement', function () { it('should send a pointer event on mouse movement', function () {
client._mouse._onMouseMove(10, 12); client._mouse._onMouseMove(10, 12);
expect(client._sock.send).to.have.been.calledOnce; var pointer_msg = {_sQ: new Uint8Array(6), _sQlen: 0};
var pointer_msg = RFB.messages.pointerEvent(10, 12, 0); RFB.messages.pointerEvent(pointer_msg, 10, 12, 0x000);
expect(client._sock.send).to.have.been.calledWith(pointer_msg); expect(client._sock).to.have.sent(pointer_msg._sQ);
}); });
it('should set the button mask so that future mouse movements use it', function () { it('should set the button mask so that future mouse movements use it', function () {
client._mouse._onMouseButton(10, 12, 1, 0x010); client._mouse._onMouseButton(10, 12, 1, 0x010);
client._sock.send = sinon.spy();
client._mouse._onMouseMove(13, 9); client._mouse._onMouseMove(13, 9);
expect(client._sock.send).to.have.been.calledOnce; var pointer_msg = {_sQ: new Uint8Array(12), _sQlen: 0};
var pointer_msg = RFB.messages.pointerEvent(13, 9, 0x010); RFB.messages.pointerEvent(pointer_msg, 10, 12, 0x010);
expect(client._sock.send).to.have.been.calledWith(pointer_msg); RFB.messages.pointerEvent(pointer_msg, 13, 9, 0x010);
expect(client._sock).to.have.sent(pointer_msg._sQ);
}); });
// NB(directxman12): we don't need to test not sending messages in // NB(directxman12): we don't need to test not sending messages in
@ -1753,13 +1777,13 @@ describe('Remote Frame Buffer Protocol Client', function() {
client._viewportDragging = true; client._viewportDragging = true;
client._display.viewportChangePos = sinon.spy(); client._display.viewportChangePos = sinon.spy();
client._mouse._onMouseMove(13, 9); client._mouse._onMouseMove(13, 9);
expect(client._sock.send).to.not.have.been.called; expect(client._sock.flush).to.not.have.been.called;
}); });
it('should not send button messages when initiating viewport dragging', function () { it('should not send button messages when initiating viewport dragging', function () {
client._viewportDrag = true; client._viewportDrag = true;
client._mouse._onMouseButton(13, 9, 0x001); client._mouse._onMouseButton(13, 9, 0x001);
expect(client._sock.send).to.not.have.been.called; expect(client._sock.flush).to.not.have.been.called;
}); });
it('should be initiate viewport dragging on a button down event, if enabled', function () { it('should be initiate viewport dragging on a button down event, if enabled', function () {
@ -1795,20 +1819,23 @@ describe('Remote Frame Buffer Protocol Client', function() {
var client; var client;
beforeEach(function () { beforeEach(function () {
client = make_rfb(); client = make_rfb();
client._sock.send = sinon.spy(); client._sock = new Websock();
client._sock.open('ws://', 'binary');
client._sock._websocket._open();
sinon.spy(client._sock, 'flush');
}); });
it('should send a key message on a key press', function () { it('should send a key message on a key press', function () {
client._keyboard._onKeyPress(1234, 1); client._keyboard._onKeyPress(1234, 1);
expect(client._sock.send).to.have.been.calledOnce; var key_msg = {_sQ: new Uint8Array(8), _sQlen: 0};
var key_msg = RFB.messages.keyEvent(1234, 1); RFB.messages.keyEvent(key_msg, 1234, 1);
expect(client._sock.send).to.have.been.calledWith(key_msg); expect(client._sock).to.have.sent(key_msg._sQ);
}); });
it('should not send messages in view-only mode', function () { it('should not send messages in view-only mode', function () {
client._view_only = true; client._view_only = true;
client._keyboard._onKeyPress(1234, 1); client._keyboard._onKeyPress(1234, 1);
expect(client._sock.send).to.not.have.been.called; expect(client._sock.flush).to.not.have.been.called;
}); });
}); });
@ -1826,7 +1853,7 @@ describe('Remote Frame Buffer Protocol Client', function() {
client.connect('host', 8675); client.connect('host', 8675);
client._rfb_state = 'normal'; client._rfb_state = 'normal';
client._normal_msg = sinon.spy(); client._normal_msg = sinon.spy();
client._sock._websocket._receive_data(Base64.encode([])); client._sock._websocket._receive_data(new Uint8Array([]));
expect(client._normal_msg).to.not.have.been.called; expect(client._normal_msg).to.not.have.been.called;
}); });
@ -1834,7 +1861,7 @@ describe('Remote Frame Buffer Protocol Client', function() {
client.connect('host', 8675); client.connect('host', 8675);
client._rfb_state = 'normal'; client._rfb_state = 'normal';
client._normal_msg = sinon.spy(); client._normal_msg = sinon.spy();
client._sock._websocket._receive_data(Base64.encode([1, 2, 3])); client._sock._websocket._receive_data(new Uint8Array([1, 2, 3]));
expect(client._normal_msg).to.have.been.calledOnce; expect(client._normal_msg).to.have.been.calledOnce;
}); });
@ -1842,7 +1869,7 @@ describe('Remote Frame Buffer Protocol Client', function() {
client.connect('host', 8675); client.connect('host', 8675);
client._rfb_state = 'ProtocolVersion'; client._rfb_state = 'ProtocolVersion';
client._init_msg = sinon.spy(); client._init_msg = sinon.spy();
client._sock._websocket._receive_data(Base64.encode([1, 2, 3])); client._sock._websocket._receive_data(new Uint8Array([1, 2, 3]));
expect(client._init_msg).to.have.been.calledOnce; expect(client._init_msg).to.have.been.calledOnce;
}); });

132
tests/test.websock.js
View File

@ -1,5 +1,5 @@
// requires local modules: websock, base64, util // requires local modules: websock, util
// requires test modules: fake.websocket // requires test modules: fake.websocket, assertions
/* jshint expr: true */ /* jshint expr: true */
var assert = chai.assert; var assert = chai.assert;
var expect = chai.expect; var expect = chai.expect;
@ -9,13 +9,14 @@ describe('Websock', function() {
describe('Queue methods', function () { describe('Queue methods', function () {
var sock; var sock;
var RQ_TEMPLATE = [0, 1, 2, 3, 4, 5, 6, 7]; var RQ_TEMPLATE = new Uint8Array([0, 1, 2, 3, 4, 5, 6, 7]);
beforeEach(function () { beforeEach(function () {
sock = new Websock(); sock = new Websock();
for (var i = RQ_TEMPLATE.length - 1; i >= 0; i--) { // skip init
sock.rQunshift8(RQ_TEMPLATE[i]); sock._allocate_buffers();
} sock._rQ.set(RQ_TEMPLATE);
sock._rQlen = RQ_TEMPLATE.length;
}); });
describe('rQlen', function () { describe('rQlen', function () {
it('should return the length of the receive queue', function () { it('should return the length of the receive queue', function () {
@ -49,14 +50,6 @@ describe('Websock', function() {
}); });
}); });
describe('rQunshift8', function () {
it('should place a byte at the front of the queue', function () {
sock.rQunshift8(255);
expect(sock.rQpeek8()).to.equal(255);
expect(sock.rQlen()).to.equal(RQ_TEMPLATE.length + 1);
});
});
describe('rQshift16', function () { describe('rQshift16', function () {
it('should pop two bytes from the receive queue and return a single number', function () { it('should pop two bytes from the receive queue and return a single number', function () {
var bef_len = sock.rQlen(); var bef_len = sock.rQlen();
@ -84,7 +77,7 @@ describe('Websock', function() {
var bef_rQi = sock.get_rQi(); var bef_rQi = sock.get_rQi();
var shifted = sock.rQshiftStr(3); var shifted = sock.rQshiftStr(3);
expect(shifted).to.be.a('string'); expect(shifted).to.be.a('string');
expect(shifted).to.equal(String.fromCharCode.apply(null, RQ_TEMPLATE.slice(bef_rQi, bef_rQi + 3))); expect(shifted).to.equal(String.fromCharCode.apply(null, Array.prototype.slice.call(new Uint8Array(RQ_TEMPLATE.buffer, bef_rQi, 3))));
expect(sock.rQlen()).to.equal(bef_len - 3); expect(sock.rQlen()).to.equal(bef_len - 3);
}); });
@ -99,8 +92,8 @@ describe('Websock', function() {
var bef_len = sock.rQlen(); var bef_len = sock.rQlen();
var bef_rQi = sock.get_rQi(); var bef_rQi = sock.get_rQi();
var shifted = sock.rQshiftBytes(3); var shifted = sock.rQshiftBytes(3);
expect(shifted).to.be.an.instanceof(Array); expect(shifted).to.be.an.instanceof(Uint8Array);
expect(shifted).to.deep.equal(RQ_TEMPLATE.slice(bef_rQi, bef_rQi + 3)); expect(shifted).to.array.equal(new Uint8Array(RQ_TEMPLATE.buffer, bef_rQi, 3));
expect(sock.rQlen()).to.equal(bef_len - 3); expect(sock.rQlen()).to.equal(bef_len - 3);
}); });
@ -123,19 +116,19 @@ describe('Websock', function() {
it('should return an array containing the given slice of the receive queue', function () { it('should return an array containing the given slice of the receive queue', function () {
var sl = sock.rQslice(0, 2); var sl = sock.rQslice(0, 2);
expect(sl).to.be.an.instanceof(Array); expect(sl).to.be.an.instanceof(Uint8Array);
expect(sl).to.deep.equal(RQ_TEMPLATE.slice(0, 2)); expect(sl).to.array.equal(new Uint8Array(RQ_TEMPLATE.buffer, 0, 2));
}); });
it('should use the rest of the receive queue if no end is given', function () { it('should use the rest of the receive queue if no end is given', function () {
var sl = sock.rQslice(1); var sl = sock.rQslice(1);
expect(sl).to.have.length(RQ_TEMPLATE.length - 1); expect(sl).to.have.length(RQ_TEMPLATE.length - 1);
expect(sl).to.deep.equal(RQ_TEMPLATE.slice(1)); expect(sl).to.array.equal(new Uint8Array(RQ_TEMPLATE.buffer, 1));
}); });
it('should take the current rQi in to account', function () { it('should take the current rQi in to account', function () {
sock.set_rQi(1); sock.set_rQi(1);
expect(sock.rQslice(0, 2)).to.deep.equal(RQ_TEMPLATE.slice(1, 3)); expect(sock.rQslice(0, 2)).to.array.equal(new Uint8Array(RQ_TEMPLATE.buffer, 1, 2));
}); });
}); });
@ -180,7 +173,8 @@ describe('Websock', function() {
it('should actually send on the websocket if the websocket does not have too much buffered', function () { it('should actually send on the websocket if the websocket does not have too much buffered', function () {
sock.maxBufferedAmount = 10; sock.maxBufferedAmount = 10;
sock._websocket.bufferedAmount = 8; sock._websocket.bufferedAmount = 8;
sock._sQ = [1, 2, 3]; sock._sQ = new Uint8Array([1, 2, 3]);
sock._sQlen = 3;
var encoded = sock._encode_message(); var encoded = sock._encode_message();
sock.flush(); sock.flush();
@ -196,7 +190,7 @@ describe('Websock', function() {
}); });
it('should not call send if we do not have anything queued up', function () { it('should not call send if we do not have anything queued up', function () {
sock._sQ = []; sock._sQlen = 0;
sock.maxBufferedAmount = 10; sock.maxBufferedAmount = 10;
sock._websocket.bufferedAmount = 8; sock._websocket.bufferedAmount = 8;
@ -222,7 +216,7 @@ describe('Websock', function() {
it('should add to the send queue', function () { it('should add to the send queue', function () {
sock.send([1, 2, 3]); sock.send([1, 2, 3]);
var sq = sock.get_sQ(); var sq = sock.get_sQ();
expect(sock.get_sQ().slice(sq.length - 3)).to.deep.equal([1, 2, 3]); expect(new Uint8Array(sq.buffer, sock._sQlen - 3, 3)).to.array.equal(new Uint8Array([1, 2, 3]));
}); });
it('should call flush', function () { it('should call flush', function () {
@ -257,6 +251,8 @@ describe('Websock', function() {
WebSocket.CONNECTING = old_WS.CONNECTING; WebSocket.CONNECTING = old_WS.CONNECTING;
WebSocket.CLOSING = old_WS.CLOSING; WebSocket.CLOSING = old_WS.CLOSING;
WebSocket.CLOSED = old_WS.CLOSED; WebSocket.CLOSED = old_WS.CLOSED;
WebSocket.prototype.binaryType = 'arraybuffer';
}); });
describe('opening', function () { describe('opening', function () {
@ -265,22 +261,14 @@ describe('Websock', function() {
}); });
it('should open the actual websocket', function () { it('should open the actual websocket', function () {
sock.open('ws://localhost:8675', 'base64'); sock.open('ws://localhost:8675', 'binary');
expect(WebSocket).to.have.been.calledWith('ws://localhost:8675', 'base64'); expect(WebSocket).to.have.been.calledWith('ws://localhost:8675', 'binary');
}); });
it('should fail if we try to use binary but do not support it', function () { it('should fail if we specify a protocol besides binary', function () {
expect(function () { sock.open('ws:///', 'binary'); }).to.throw(Error); expect(function () { sock.open('ws:///', 'base64'); }).to.throw(Error);
}); });
it('should fail if we specified an array with only binary and we do not support it', function () {
expect(function () { sock.open('ws:///', ['binary']); }).to.throw(Error);
});
it('should skip binary if we have multiple options for encoding and do not support binary', function () {
sock.open('ws:///', ['binary', 'base64']);
expect(WebSocket).to.have.been.calledWith('ws:///', ['base64']);
});
// it('should initialize the event handlers')? // it('should initialize the event handlers')?
}); });
@ -340,16 +328,15 @@ describe('Websock', function() {
expect(sock._recv_message).to.have.been.calledOnce; expect(sock._recv_message).to.have.been.calledOnce;
}); });
it('should copy the mode over upon opening', function () { it('should fail if a protocol besides binary is requested', function () {
sock._websocket.protocol = 'cheese'; sock._websocket.protocol = 'base64';
sock._websocket.onopen(); expect(sock._websocket.onopen).to.throw(Error);
expect(sock._mode).to.equal('cheese');
}); });
it('should assume base64 if no protocol was available on opening', function () { it('should assume binary if no protocol was available on opening', function () {
sock._websocket.protocol = null; sock._websocket.protocol = null;
sock._websocket.onopen(); sock._websocket.onopen();
expect(sock._mode).to.equal('base64'); expect(sock._mode).to.equal('binary');
}); });
it('should call the open event handler on opening', function () { it('should call the open event handler on opening', function () {
@ -377,13 +364,7 @@ describe('Websock', function() {
var sock; var sock;
beforeEach(function () { beforeEach(function () {
sock = new Websock(); sock = new Websock();
}); sock._allocate_buffers();
it('should support decoding base64 string data to add it to the receive queue', function () {
var msg = { data: Base64.encode([1, 2, 3]) };
sock._mode = 'base64';
sock._recv_message(msg);
expect(sock.rQshiftStr(3)).to.equal('\x01\x02\x03');
}); });
it('should support adding binary Uint8Array data to the receive queue', function () { it('should support adding binary Uint8Array data to the receive queue', function () {
@ -395,16 +376,16 @@ describe('Websock', function() {
it('should call the message event handler if present', function () { it('should call the message event handler if present', function () {
sock._eventHandlers.message = sinon.spy(); sock._eventHandlers.message = sinon.spy();
var msg = { data: Base64.encode([1, 2, 3]) }; var msg = { data: new Uint8Array([1, 2, 3]).buffer };
sock._mode = 'base64'; sock._mode = 'binary';
sock._recv_message(msg); sock._recv_message(msg);
expect(sock._eventHandlers.message).to.have.been.calledOnce; expect(sock._eventHandlers.message).to.have.been.calledOnce;
}); });
it('should not call the message event handler if there is nothing in the receive queue', function () { it('should not call the message event handler if there is nothing in the receive queue', function () {
sock._eventHandlers.message = sinon.spy(); sock._eventHandlers.message = sinon.spy();
var msg = { data: Base64.encode([]) }; var msg = { data: new Uint8Array([]).buffer };
sock._mode = 'base64'; sock._mode = 'binary';
sock._recv_message(msg); sock._recv_message(msg);
expect(sock._eventHandlers.message).not.to.have.been.called; expect(sock._eventHandlers.message).not.to.have.been.called;
}); });
@ -412,21 +393,22 @@ describe('Websock', function() {
it('should compact the receive queue', function () { it('should compact the receive queue', function () {
// NB(sross): while this is an internal implementation detail, it's important to // NB(sross): while this is an internal implementation detail, it's important to
// test, otherwise the receive queue could become very large very quickly // test, otherwise the receive queue could become very large very quickly
sock._rQ = [0, 1, 2, 3, 4, 5]; sock._rQ = new Uint8Array([0, 1, 2, 3, 4, 5, 0, 0, 0, 0]);
sock._rQlen = 6;
sock.set_rQi(6); sock.set_rQi(6);
sock._rQmax = 3; sock._rQmax = 3;
var msg = { data: Base64.encode([1, 2, 3]) }; var msg = { data: new Uint8Array([1, 2, 3]).buffer };
sock._mode = 'base64'; sock._mode = 'binary';
sock._recv_message(msg); sock._recv_message(msg);
expect(sock._rQ.length).to.equal(3); expect(sock._rQlen).to.equal(3);
expect(sock.get_rQi()).to.equal(0); expect(sock.get_rQi()).to.equal(0);
}); });
it('should call the error event handler on an exception', function () { it('should call the error event handler on an exception', function () {
sock._eventHandlers.error = sinon.spy(); sock._eventHandlers.error = sinon.spy();
sock._eventHandlers.message = sinon.stub().throws(); sock._eventHandlers.message = sinon.stub().throws();
var msg = { data: Base64.encode([1, 2, 3]) }; var msg = { data: new Uint8Array([1, 2, 3]).buffer };
sock._mode = 'base64'; sock._mode = 'binary';
sock._recv_message(msg); sock._recv_message(msg);
expect(sock._eventHandlers.error).to.have.been.calledOnce; expect(sock._eventHandlers.error).to.have.been.calledOnce;
}); });
@ -444,37 +426,17 @@ describe('Websock', function() {
sock._websocket._open(); sock._websocket._open();
}); });
it('should convert the send queue into an ArrayBuffer', function () { it('should only send the send queue up to the send queue length', function () {
sock._sQ = [1, 2, 3]; sock._sQ = new Uint8Array([1, 2, 3, 4, 5]);
var res = sock._encode_message(); // An ArrayBuffer sock._sQlen = 3;
expect(new Uint8Array(res)).to.deep.equal(new Uint8Array(res)); var res = sock._encode_message();
expect(res).to.array.equal(new Uint8Array([1, 2, 3]));
}); });
it('should properly pass the encoded data off to the actual WebSocket', function () { it('should properly pass the encoded data off to the actual WebSocket', function () {
sock.send([1, 2, 3]); sock.send([1, 2, 3]);
expect(sock._websocket._get_sent_data()).to.deep.equal([1, 2, 3]); expect(sock._websocket._get_sent_data()).to.array.equal(new Uint8Array([1, 2, 3]));
}); });
}); });
describe('as Base64 data', function () {
var sock;
beforeEach(function () {
sock = new Websock();
sock.open('ws://', 'base64');
sock._websocket._open();
});
it('should convert the send queue into a Base64-encoded string', function () {
sock._sQ = [1, 2, 3];
expect(sock._encode_message()).to.equal(Base64.encode([1, 2, 3]));
});
it('should properly pass the encoded data off to the actual WebSocket', function () {
sock.send([1, 2, 3]);
expect(sock._websocket._get_sent_data()).to.deep.equal([1, 2, 3]);
});
});
}); });
}); });

11
tests/vnc_playback.html
View File

@ -59,9 +59,9 @@
if (fname) { if (fname) {
message("Loading " + fname); message("Loading " + fname);
// Load supporting scripts // Load supporting scripts
Util.load_scripts(["base64.js", "websock.js", "des.js", Util.load_scripts(["base64.js", "websock.js", "des.js", "keysym.js",
"keysymdef.js", "keyboard.js", "input.js", "display.js", "keysymdef.js", "keyboard.js", "input.js", "display.js",
"jsunzip.js", "rfb.js", "playback.js", fname]); "rfb.js", "playback.js", "inflator.js", fname]);
} else { } else {
message("Must specify data=FOO in query string."); message("Must specify data=FOO in query string.");
@ -75,7 +75,6 @@
test_state = 'failed'; test_state = 'failed';
break; break;
case 'loaded': case 'loaded':
$D('startButton').disabled = false;
break; break;
} }
if (typeof msg !== 'undefined') { if (typeof msg !== 'undefined') {
@ -99,7 +98,8 @@
mode = 'realtime'; mode = 'realtime';
} }
recv_message = rfb.testMode(send_array, VNC_frame_encoding); //recv_message = rfb.testMode(send_array, VNC_frame_encoding);
next_iteration(); next_iteration();
} }
@ -130,9 +130,8 @@
} }
if (fname) { if (fname) {
message("VNC_frame_data.length: " + VNC_frame_data.length); message("VNC_frame_data.length: " + VNC_frame_data.length);
rfb = new RFB({'target': $D('VNC_canvas'),
'onUpdateState': updateState});
} }
$D('startButton').disabled = false;
} }
</script> </script>
</html> </html>

32
utils/inflator.partial.js Normal file
View File

@ -0,0 +1,32 @@
var zlib = require('./lib/zlib/inflate.js');
var ZStream = require('./lib/zlib/zstream.js');
var Inflate = function () {
this.strm = new ZStream();
this.chunkSize = 1024 * 10 * 10;
this.strm.output = new Uint8Array(this.chunkSize);
this.windowBits = 5;
zlib.inflateInit(this.strm, this.windowBits);
};
Inflate.prototype = {
inflate: function (data, flush) {
this.strm.input = data;
this.strm.avail_in = this.strm.input.length;
this.strm.next_in = 0;
this.strm.next_out = 0;
this.strm.avail_out = this.chunkSize;
zlib.inflate(this.strm, flush);
return new Uint8Array(this.strm.output.buffer, 0, this.strm.next_out);
},
reset: function () {
zlib.inflateReset(this.strm);
}
};
module.exports = {Inflate: Inflate};

2
vnc_auto.html
View File

@ -77,7 +77,7 @@
// Load supporting scripts // Load supporting scripts
Util.load_scripts(["webutil.js", "base64.js", "websock.js", "des.js", Util.load_scripts(["webutil.js", "base64.js", "websock.js", "des.js",
"keysymdef.js", "keyboard.js", "input.js", "display.js", "keysymdef.js", "keyboard.js", "input.js", "display.js",
"jsunzip.js", "rfb.js", "keysym.js"]); "inflator.js", "rfb.js", "keysym.js"]);
var rfb; var rfb;
var resizeTimeout; var resizeTimeout;