crabapples
/
websockify
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch tests/echo.html to use websock.js.

This commit is contained in:
Joel Martin 2012-01-03 07:41:54 -07:00 committed by Cédric de Saint Martin
parent 9f0a08467a
commit 5ed64be820
2 changed files with 17 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
tests/echo.html
View File

@ -2,9 +2,10 @@
<head> <head>
<title>WebSockets Echo Test</title> <title>WebSockets Echo Test</title>
<script src="include/base64.js"></script>
<script src="include/util.js"></script> <script src="include/util.js"></script>
<script src="include/webutil.js"></script> <script src="include/webutil.js"></script>
<script src="include/base64.js"></script>
<script src="include/websock.js"></script>
<!-- Uncomment to activate firebug lite --> <!-- Uncomment to activate firebug lite -->
<!-- <!--
<script type='text/javascript' <script type='text/javascript'
@ -50,13 +51,8 @@
} }
function send_msg() { function send_msg() {
if (ws.bufferedAmount > 0) { var str = "Message #" + send_cnt;
console.log("Delaying send"); ws.send_string(str);
return;
}
var str = "Message #" + send_cnt, arr = [];
arr.pushStr(str)
ws.send(Base64.encode(arr));
message("Sent message: '" + str + "'"); message("Sent message: '" + str + "'");
send_cnt++; send_cnt++;
} }
@ -67,11 +63,6 @@
$D('errors').innerHTML = errors; $D('errors').innerHTML = errors;
} }
function init_ws() {
console.log(">> init_ws");
console.log("<< init_ws");
}
function connect() { function connect() {
var host = $D('host').value, var host = $D('host').value,
port = $D('port').value, port = $D('port').value,
@ -92,40 +83,38 @@
} }
uri = scheme + host + ":" + port; uri = scheme + host + ":" + port;
message("connecting to " + uri); message("connecting to " + uri);
ws = new WebSocket(uri, "base64");
ws.onmessage = function(e) { ws = new Websock();
ws.open(uri);
ws.on('message', function(e) {
//console.log(">> WebSockets.onmessage"); //console.log(">> WebSockets.onmessage");
var arr = Base64.decode(e.data), str = "", i; var str = ws.rQshiftStr();
for (i = 0; i < arr.length; i++) {
str = str + String.fromCharCode(arr[i]);
}
message("Received message '" + str + "'"); message("Received message '" + str + "'");
//console.log("<< WebSockets.onmessage"); //console.log("<< WebSockets.onmessage");
}; });
ws.onopen = function(e) { ws.on('open', function(e) {
console.log(">> WebSockets.onopen"); console.log(">> WebSockets.onopen");
echo_ref = setInterval(send_msg, echoDelay); echo_ref = setInterval(send_msg, echoDelay);
console.log("<< WebSockets.onopen"); console.log("<< WebSockets.onopen");
}; });
ws.onclose = function(e) { ws.on('close', function(e) {
console.log(">> WebSockets.onclose"); console.log(">> WebSockets.onclose");
if (echo_ref) { if (echo_ref) {
clearInterval(echo_ref); clearInterval(echo_ref);
echo_ref = null; echo_ref = null;
} }
console.log("<< WebSockets.onclose"); console.log("<< WebSockets.onclose");
}; });
ws.onerror = function(e) { ws.on('error', function(e) {
console.log(">> WebSockets.onerror"); console.log(">> WebSockets.onerror");
if (echo_ref) { if (echo_ref) {
clearInterval(echo_ref); clearInterval(echo_ref);
echo_ref = null; echo_ref = null;
} }
console.log("<< WebSockets.onerror"); console.log("<< WebSockets.onerror");
}; });
$D('connectButton').value = "Stop"; $D('connectButton').value = "Stop";
$D('connectButton').onclick = disconnect; $D('connectButton').onclick = disconnect;
@ -148,25 +137,8 @@
} }
/* If no builtin websockets then load web_socket.js */
if (window.WebSocket) {
VNC_native_ws = true;
} else {
VNC_native_ws = false;
console.log("Loading web-socket-js flash bridge");
var extra = "<script src='include/web-socket-js/swfobject.js'><\/script>";
extra += "<script src='include/web-socket-js/FABridge.js'><\/script>";
extra += "<script src='include/web-socket-js/web_socket.js'><\/script>";
document.write(extra);
}
window.onload = function() { window.onload = function() {
console.log("onload"); console.log("onload");
if (!VNC_native_ws) {
console.log("initializing web-socket-js flash bridge");
WebSocket.__swfLocation = "include/web-socket-js/WebSocketMain.swf";
WebSocket.__initialize();
}
var url = document.location.href; var url = document.location.href;
$D('host').value = (url.match(/host=([^&#]*)/) || ['',''])[1]; $D('host').value = (url.match(/host=([^&#]*)/) || ['',''])[1];
$D('port').value = (url.match(/port=([^&#]*)/) || ['',''])[1]; $D('port').value = (url.match(/port=([^&#]*)/) || ['',''])[1];

2
tests/echo.py
View File

@ -45,7 +45,7 @@ class WebSocketEcho(WebSocketServer):
if self.client in ins: if self.client in ins:
# Receive client data, decode it, and send it back # Receive client data, decode it, and send it back
frames, closed = self.recv_frames() frames, closed = self.recv_frames()
cqueue.extend(frames) cqueue.extend(["You said: " + f for f in frames])
if closed: if closed:
self.send_close() self.send_close()