diff --git a/include/websock.js b/include/websock.js
index 94eb21a..825e453 100644
--- a/include/websock.js
+++ b/include/websock.js
@@ -189,7 +189,7 @@ function send(arr) {
function send_string(str) {
//Util.Debug(">> send_string: " + str);
- api.send_array(str.split('').map(
+ api.send(str.split('').map(
function (chr) { return chr.charCodeAt(0); } ) );
}
@@ -296,7 +296,7 @@ function constructor() {
api.rQwait = rQwait;
api.flush = flush;
- api.send_array = send_array;
+ api.send = send;
api.send_string = send_string;
api.recv_message = recv_message;
diff --git a/include/wstelnet.js b/include/wstelnet.js
index 2f4ab0e..8e64d51 100644
--- a/include/wstelnet.js
+++ b/include/wstelnet.js
@@ -46,14 +46,14 @@ Array.prototype.pushStr = function (str) {
function do_send() {
if (sQ.length > 0) {
Util.Debug("Sending " + sQ);
- ws.send(Base64.encode(sQ));
+ ws.send(sQ);
sQ = [];
}
}
-function do_recv(e) {
+function do_recv() {
//console.log(">> do_recv");
- var arr = Base64.decode(e.data), str = "",
+ var arr = ws.rQshiftBytes(ws.rQlen()), str = "",
chr, cmd, code, value;
Util.Debug("Received array '" + arr + "'");
@@ -162,26 +162,8 @@ that.connect = function(host, port, encrypt) {
}
uri = scheme + host + ":" + port;
Util.Info("connecting to " + uri);
- ws = new WebSocket(uri);
- ws.onmessage = do_recv;
-
- ws.onopen = function(e) {
- Util.Info(">> WebSockets.onopen");
- vt100.curs_set(true, true);
- connect_callback();
- Util.Info("<< WebSockets.onopen");
- };
- ws.onclose = function(e) {
- Util.Info(">> WebSockets.onclose");
- that.disconnect();
- Util.Info("<< WebSockets.onclose");
- };
- ws.onerror = function(e) {
- Util.Info(">> WebSockets.onerror");
- that.disconnect();
- Util.Info("<< WebSockets.onerror");
- };
+ ws.open(uri);
Util.Debug("<< connect");
}
@@ -199,6 +181,27 @@ that.disconnect = function() {
function constructor() {
+ /* Initialize Websock object */
+ ws = new Websock();
+
+ ws.on('message', do_recv);
+ ws.on('open', function(e) {
+ Util.Info(">> WebSockets.onopen");
+ vt100.curs_set(true, true);
+ connect_callback();
+ Util.Info("<< WebSockets.onopen");
+ });
+ ws.on('close', function(e) {
+ Util.Info(">> WebSockets.onclose");
+ that.disconnect();
+ Util.Info("<< WebSockets.onclose");
+ });
+ ws.on('error', function(e) {
+ Util.Info(">> WebSockets.onerror");
+ that.disconnect();
+ Util.Info("<< WebSockets.onerror");
+ });
+
/* Initialize the terminal emulator/renderer */
vt100 = new VT100(80, 24, target);
diff --git a/wstelnet.html b/wstelnet.html
index f257a2b..9f12a05 100644
--- a/wstelnet.html
+++ b/wstelnet.html
@@ -3,6 +3,7 @@
WebSockets Telnet
+
@@ -58,25 +59,8 @@
$D('connectButton').onclick = connect;
}
- /* 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 = "