RLGWebD: shterm.js comparison

comparison shterm.js @ 140:789c094675f4

WebTTY: use WebSockets when possible.

author	John "Elwin" Edwards
date	Mon, 22 Jul 2013 07:51:53 -0700
parents	a497ecd116d9
children	c4a32007d2dc

comparison

equal deleted inserted replaced

-:dcd07c1d846a
+:789c094675f4
 var isalive = false; // Whether the session is currently active.
 var nsend = 0; // The number of the next packet to send.
 var nrecv = 0; // The next packet expected.
 var msgQ = []; // Queue for out-of-order messages.
+var conn = null; // WebSocket
 // A state machine that keeps track of polling the server.
 var ajaxstate = {
 state: 0,
 timerID: null,
 }
 }
 function sendback(str) {
 /* For responding to terminal queries. */
-var formdata = {"t": "d", "n": nsend++, "d": str};
+if (conn) {
-var datareq = new XMLHttpRequest();
+var msgObj = {"t": "d", "d": str};
-datareq.onreadystatechange = postResponseHandler;
+conn.send(JSON.stringify(msgObj));
-datareq.open('POST', '/feed', true);
+}
-datareq.send(JSON.stringify(formdata));
+else {
+var formdata = {"t": "d", "n": nsend++, "d": str};
+var datareq = new XMLHttpRequest();
+datareq.onreadystatechange = postResponseHandler;
+datareq.open('POST', '/feed', true);
+datareq.send(JSON.stringify(formdata));
+}
 return;
 }
 function sendkey(ev) {
+if (!isalive)
+return;
 var keynum = ev.keyCode;
 var code;
 if (keynum >= 65 && keynum <= 90) {
 /* Letters. */
 if (ev.ctrlKey)
 }
 else {
 debug(1, "Ignoring keycode " + keynum);
 return;
 }
-if (isalive)
+ev.preventDefault();
-ev.preventDefault();
+if (conn) {
-var formdata = {"t": "d", "n": nsend++, "d": code};
+var msgObj = {"t": "d", "d": code};
-var datareq = new XMLHttpRequest();
+conn.send(JSON.stringify(msgObj));
-datareq.onreadystatechange = postResponseHandler;
+}
-datareq.open('POST', '/feed', true);
+else {
-datareq.send(JSON.stringify(formdata));
+var formdata = {"t": "d", "n": nsend++, "d": code};
+var datareq = new XMLHttpRequest();
+datareq.onreadystatechange = postResponseHandler;
+datareq.open('POST', '/feed', true);
+datareq.send(JSON.stringify(formdata));
+}
 //dkey(code);
 return;
 }
 var charshifts = { '-': "5f", '=': "2b", '[': "7b", ']': "7d", '\\': "7c",
 var kpkeys = { "KP1": "1b4f46", "KP2": "1b4f42", "KP3": "1b5b367e",
 "KP4": "1b4f44", "KP5": "1b5b45", "KP6": "1b4f43",
 "KP7": "1b4f48", "KP8": "1b4f41", "KP9": "1b5b357e" };
 function vkey(c) {
+if (!isalive)
+return;
 var keystr;
 if (c.match(/^[a-z]$/)) {
 if (termemu.ctrlp()) {
 var n = c.charCodeAt(0) - 96;
 keystr = n.toString(16);
 keystr = kpkeys[c];
 }
 else
 return;
 //writeData("Sending " + keystr);
-var formdata = {"t": "d", "n": nsend++, "d": keystr};
+if (conn) {
-var datareq = new XMLHttpRequest();
+var msgObj = {"t": "d", "d": keystr};
-datareq.onreadystatechange = postResponseHandler;
+conn.send(JSON.stringify(msgObj));
-datareq.open('POST', '/feed', true);
+}
-datareq.send(JSON.stringify(formdata));
+else {
+var formdata = {"t": "d", "n": nsend++, "d": keystr};
+var datareq = new XMLHttpRequest();
+datareq.onreadystatechange = postResponseHandler;
+datareq.open('POST', '/feed', true);
+datareq.send(JSON.stringify(formdata));
+}
 return;
 }
 function setup() {
 keyHexCodes.init();
 else
 keydiv.className = "key";
 return;
 }
+function loginWS(h, w) {
+if (conn)
+return;
+var sockurl = "ws://" + window.location.host + "/sock?w=" + w + "&h=" + h;
+conn = new WebSocket(sockurl);
+conn.onopen = function (event) {
+isalive = true;
+setTitle("Logged in");
+debug(1, "Logged in via WebSocket");
+}
+conn.onmessage = function (event) {
+var msgObj = JSON.parse(event.data);
+if (msgObj.t == 'l') {
+termemu.resize(msgObj.h, msgObj.w);
+}
+else if (msgObj.t == 'd') {
+debug(0, msgObj.d);
+writeData(msgObj.d);
+}
+else if (msgObj.t == 'q') {
+debug(0, "Quit message!");
+conn.close();
+}
+}
+conn.onclose = function (event) {
+conn = null;
+isalive = false;
+debug(1, "WebSocket connection closed.");
+setTitle("Not connected.");
+}
+}
 function login(h, w) {
 if (isalive)
 return;
+if (window.WebSocket) {
+loginWS(h, w);
+return;
+}
 params = {"login": true, "h": h, "w": w};
 var req = new XMLHttpRequest();
 req.onreadystatechange = function () {
 if (req.readyState == 4 && req.status == 200) {
 var logindict = JSON.parse(req.responseText);
 //req.send("login=login&h=" + String(h) + "&w=" + String(w));
 return;
 }
 function stop() {
+if (conn) {
+conn.close();
+return;
+}
 var req = new XMLHttpRequest();
 req.onreadystatechange = function () {
 if (req.readyState == 4 && req.status == 200) {
 /* Figure out whether or not it worked. */
 /* FIXME the server might respond with output. */