RLGWebD: shterm.js comparison

comparison shterm.js @ 13:bf7c26d0b66d

webtty: switch upward protocol to JSON Switch the client-to-server messages from the HTML forms format to JSON (for the webtty app). Message numbers are sent but not yet used.

author	John "Elwin" Edwards <elwin@sdf.org>
date	Sun, 13 May 2012 20:50:13 -0700
parents	9e1d83f50c9e
children	155f3c104759

comparison

equal deleted inserted replaced

-:9e1d83f50c9e
+:bf7c26d0b66d
 /* shterm.js: browser-side JavaScript to handle I/O for termemu.js when it
 * is running a shell via the webtty.js server.
 */
+/* The number of the next packet to send. */
+var nsend = 0;
 // 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};
 var datareq = new XMLHttpRequest();
 datareq.onreadystatechange = postResponseHandler;
 datareq.open('POST', '/feed', true);
-datareq.send("keys=" + str);
+datareq.send(JSON.stringify(formdata));
 return;
 }
 function sendkey(ev) {
 var keynum = ev.keyCode;
 debug(1, "Ignoring keycode " + keynum);
 return;
 }
 if (termemu.alive)
 ev.preventDefault();
+var formdata = {"t": "d", "n": nsend++, "d": code};
 var datareq = new XMLHttpRequest();
 datareq.onreadystatechange = postResponseHandler;
 datareq.open('POST', '/feed', true);
-datareq.send("keys=" + code);
+datareq.send(JSON.stringify(formdata));
 //dkey(code);
 return;
 }
 var charshifts = { '-': "5f", '=': "2b", '[': "7b", ']': "7d", '\\': "7c",
 keystr = c.charCodeAt(0).toString(16);
 }
 else
 return;
 //writeData("Sending " + keystr);
+var formdata = {"t": "d", "n": nsend++, "d": code};
 var datareq = new XMLHttpRequest();
 datareq.onreadystatechange = postResponseHandler;
 datareq.open('POST', '/feed', true);
-datareq.send("keys=" + keystr);
+datareq.send(JSON.stringify(formdata));
 return;
 }
 function setup() {
 keyHexCodes.init();
 }
 function login(h, w) {
 if (termemu.alive)
 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);
 if (logindict.login) {
 /* Success */
 termemu.resize(logindict.h, logindict.w);
 termemu.alive = true;
+nsend = 0;
 	setTitle("Logged in");
 debug(1, "Logged in with id " + logindict.id);
 getData();
 return;
 }
 return;
 }
 };
 req.open('POST', '/login', true);
-req.send("login=login&h=" + String(h) + "&w=" + String(w));
+req.send(JSON.stringify(params));
+//req.send("login=login&h=" + String(h) + "&w=" + String(w));
 return;
 }
 function stop() {
 var req = new XMLHttpRequest();
 termemu.alive = false;
 return;
 }
 };
 req.open('POST', '/feed', true);
-req.send("quit=quit");
+req.send(JSON.stringify({"t": "q", "n": nsend++}));
 return;
 }
 function setTitle(tstr) {
 var titlespan = document.getElementById("ttitle");