RLGWebD: rlgterm.js comparison

comparison rlgterm.js @ 59:00b985b8ba6a

RLG-Web client: implement watching. It is now possible to watch games currently being played through RLG-Web, but not dgamelaunch. Also, there are some deficiencies, like getting chaos until an absolute cursor addressing happens.

author	John "Elwin" Edwards <elwin@sdf.org>
date	Tue, 19 Jun 2012 16:19:50 -0700
parents	7a50b4412fea
children	071ec6b1ec03

comparison

equal deleted inserted replaced

-:7a50b4412fea
+:00b985b8ba6a
 "name": "Super-Rogue",
 "uname": "srogue"
 }
 };
-/* Login name and key */
+var session = {
-var lname = null;
+/* The session id assigned by the server. */
-var lcred = null;
+id: null,
-/* The session id assigned by the server. */
+/* Login name and key */
-var sessid = null;
+lname: null,
+lcred: null,
+/* Whether the game is being played or just watched. */
+playing: false
+};
 function writeData(hexstr) {
 var codenum;
 var codes = [];
 var nc;
 }
 return havedata;
 }
 function getData() {
-if (sessid == null)
+if (session.id == null)
 return;
 var datareq = new XMLHttpRequest();
-var msg = JSON.stringify({"id": sessid, "t": "n"});
+var msg = JSON.stringify({"id": session.id, "t": "n"});
 datareq.onreadystatechange = function () {
 if (datareq.readyState == 4 && datareq.status == 200) {
 var wasdata = processMsg(datareq.responseText);
 if (wasdata != null) {
 if (wasdata)
 }
 }
 function sendback(str) {
 /* For responding to terminal queries. */
-var msgDict = {"id": sessid, "t": "d", "n": nsend++, "d": str};
+var msgDict = {"id": session.id, "t": "d", "n": nsend++, "d": str};
 var datareq = new XMLHttpRequest();
 datareq.onreadystatechange = postResponseHandler;
 datareq.open('POST', '/feed', true);
 datareq.send(JSON.stringify(msgDict));
 return;
 }
 function sendkey(ev) {
-if (sessid == null)
+if (!session.playing)
 return;
 var keynum = ev.keyCode;
 var code;
 if (keynum >= ev.DOM_VK_A && keynum <= ev.DOM_VK_Z) {
 /* Letters.  This assumes the codes are 65-90. */
 }
 else {
 debug(1, "Ignoring keycode " + keynum);
 return;
 }
-// Isn't this check redundant?
+ev.preventDefault();
-if (sessid != null)
-ev.preventDefault();
 var datareq = new XMLHttpRequest();
-var msgDict = {"id": sessid, "t": "d", "n": nsend++, "d": code};
+var msgDict = {"id": session.id, "t": "d", "n": nsend++, "d": code};
 datareq.onreadystatechange = postResponseHandler;
 datareq.open('POST', '/feed', true);
 datareq.send(JSON.stringify(msgDict));
 return;
 }
 var charshifts = { '-': "5f", '=': "2b", '[': "7b", ']': "7d", '\\': "7c",
 ';': "3a", '\'': "22", ',': "3c", '.': "3e", '/': "3f", '`': "7e"
 }
 function vkey(c) {
-if (sessid == null)
+if (!session.playing)
 return;
 var keystr;
 if (c.match(/^[a-z]$/)) {
 if (termemu.ctrlp()) {
 var n = c.charCodeAt(0) - 96;
 keystr = c.charCodeAt(0).toString(16);
 }
 else
 return;
 var datareq = new XMLHttpRequest();
-var msgDict = {"id": sessid, "t": "d", "n": nsend++, "d": keystr};
+var msgDict = {"id": session.id, "t": "d", "n": nsend++, "d": keystr};
 datareq.onreadystatechange = postResponseHandler;
 datareq.open('POST', '/feed', true);
 datareq.send(JSON.stringify(msgDict));
 return;
 }
 return;
 }
 function formlogin(ev) {
 ev.preventDefault();
-if (sessid != null)
+if (session.id != null)
 return;
 var loginmsg = {};
 loginmsg["name"] = document.getElementById("input_name").value;
 loginmsg["pw"] = document.getElementById("input_pw").value;
 var req = new XMLHttpRequest();
 if (req.readyState != 4 || req.status != 200)
 return;
 var reply = JSON.parse(req.responseText);
 if (reply.t == 'l') {
 /* Success */
-lcred = reply.k;
+session.lcred = reply.k;
-lname = reply.u;
+session.lname = reply.u;
 setTitle("Logged in as " + reply.u);
 debug(1, "Logged in as " + reply.u + " with id " + reply.k);
 setmode("choose");
 }
 else if (reply.t == 'E') {
 req.send(JSON.stringify(loginmsg));
 return;
 }
 function getcurrent() {
-if (sessid)
+if (session.id)
 return;
 var req = new XMLHttpRequest();
 req.onreadystatechange = function () {
 if (req.readyState != 4 || req.status != 200)
 return;
 if (!reply.s) {
 return;
 }
 var gamediv = document.getElementById("gametable");
 while (gamediv.children.length > 2)
-gamediv.removeChild(optdiv.children[2]);
+gamediv.removeChild(gamediv.children[2]);
 if (reply.g.length === 0) {
 gamediv.style.display = "none";
 document.getElementById("nogames").style.display = "block";
 }
 else {
 }
 for (var i = 0; i < reply.g.length; i++) {
 var row = document.createElement("div");
 var cell1 = document.createElement("div");
 var cell2 = document.createElement("div");
+var cell3 = document.createElement("div");
 cell1.appendChild(document.createTextNode(reply.g[i].p));
 cell2.appendChild(document.createTextNode(reply.g[i].g));
+var button = document.createElement("span");
+button.appendChild(document.createTextNode("Watch"));
+button.onclick = makeWatcher(reply.g[i].n);
+button.className = "ibutton";
+cell3.appendChild(button);
 row.appendChild(cell1);
 row.appendChild(cell2);
+row.appendChild(cell3);
 gamediv.appendChild(row);
 }
 };
 req.open('GET', '/status', true);
 req.send();
 return;
 }
 function getchoices() {
-if (sessid != null || !lcred)
+if (session.id != null || !session.lcred)
 return;
 var req = new XMLHttpRequest();
 req.onreadystatechange = function () {
 if (req.readyState != 4 || req.status != 200)
 return;
 reply = JSON.parse(req.responseText);
 } catch (e) {
 if (e instanceof SyntaxError)
 return;
 }
-if (!("name" in reply) || reply["name"] != lname || !("stat" in reply))
+if (!("name" in reply) || reply["name"] != session.lname ||
+!("stat" in reply))
 return;
 var optdiv = document.getElementById("opttable");
 /* Don't remove the first child, it's the header. */
 while (optdiv.childNodes.length > 1)
 optdiv.removeChild(optdiv.childNodes[1]);
 rowdiv.appendChild(gamediv);
 rowdiv.appendChild(actdiv);
 optdiv.appendChild(rowdiv);
 }
 };
-req.open('GET', '/pstatus/' + lname, true);
+req.open('GET', '/pstatus/' + session.lname, true);
 req.send();
 return;
 }
 /* This can't be in the loop in getchoices(), or the closure's scope will
 }
 return starter;
 }
 function startgame(game) {
-if (sessid != null || !lcred)
+if (session.id != null || !session.lcred)
 return;
 var smsg = {};
-smsg["key"] = lcred;
+smsg["key"] = session.lcred;
 smsg["game"] = game.uname;
 smsg["h"] = 24;
 smsg["w"] = 80;
 var req = new XMLHttpRequest();
 req.onreadystatechange = function () {
 if (req.readyState != 4 || req.status != 200)
 return;
 var reply = JSON.parse(req.responseText);
 if (reply.t == 's') {
 /* Success */
-sessid = reply.id;
+session.id = reply.id;
+session.playing = true;
 termemu.resize(reply.h, reply.w);
-setTitle("Playing as " + lname);
+setTitle("Playing as " + session.lname);
-debug(1, "Playing with id " + sessid);
+debug(1, "Playing with id " + session.id);
 setmode("play");
 getData();
 }
 else if (reply.t == 'E') {
 debug(1, "Could not start game: " + reply.s);
 req.open('POST', '/play', true);
 req.send(JSON.stringify(smsg));
 return;
 }
+function startwatching(gamenumber) {
+if (session.id != null)
+return;
+var wmsg = {"n": Number(gamenumber)};
+var req = new XMLHttpRequest();
+req.onreadystatechange = function () {
+if (req.readyState != 4 || req.status != 200)
+return;
+var reply = JSON.parse(req.responseText);
+if (reply.t == 'w') {
+/* Success */
+session.id = reply.id;
+session.playing = false;
+termemu.resize(reply.h, reply.w);
+setTitle("Watching");
+debug(1, "Watching with id " + session.id);
+setmode("play");
+getData();
+}
+else if (reply.t == 'E') {
+debug(1, "Could not watch game " + gamenumber + ": " + reply.s);
+}
+};
+req.open('POST', '/watch', true);
+req.send(JSON.stringify(wmsg));
+return;
+}
+function makeWatcher(n) {
+function watcher(ev) {
+startwatching(n);
+}
+return watcher;
+}
 function formreg(ev) {
 ev.preventDefault();
-if (sessid != null)
+if (session.id != null)
 return;
 var regmsg = {};
 regmsg["name"] = document.getElementById("regin_name").value;
 regmsg["pw"] = document.getElementById("regin_pw").value;
 regmsg["email"] = document.getElementById("regin_email").value;
 return;
 var reply = JSON.parse(req.responseText);
 if (reply.t == 'r') {
 /* Success */
 debug(1, "Registered account: " + reply.d);
-lcred = reply.k;
+session.lcred = reply.k;
-lname = reply.u;
+session.lname = reply.u;
-setTitle("Logged in as " + lname);
+setTitle("Logged in as " + session.lname);
-debug(1, "Logged in as " + lname + "with id " + lcred);
+debug(1, "Logged in as " + session.lname + "with id " + session.lcred);
 setmode("choose");
 }
 else if (reply.t == 'E') {
 debug(1, "Could not register: " + reply.s);
 document.getElementById("regin_name").value = "";
 req.send(JSON.stringify(regmsg));
 return;
 }
 function gameover() {
-if (sessid == null)
+if (session.id == null)
 return;
 /* TODO IFACE2 If the end was unexpected, tell player the game was saved. */
-sessid = null;
+session.id = null;
+session.playing = false;
 ajaxstate.clear();
 setTitle("Game over.");
 nsend = 0;
 nrecv = 0;
 msgQ = [];
-setmode("choose");
+if (session.lcred != null)
+setmode("choose");
+else
+setmode("login");
 return;
 }
 function logout() {
-lcred = null;
+session.lcred = null;
-lname = null;
+session.lname = null;
 setmode("login");
 }
 function stop() {
-if (!sessid)
+if (!session.id)
 return;
 var req = new XMLHttpRequest();
 req.onreadystatechange = function () {
 if (req.readyState == 4 && req.status == 200) {
 processMsg(req.responseText);
 return;
 }
 };
 req.open('POST', '/feed', true);
-req.send(JSON.stringify({"id": sessid, "t": "q"}));
+req.send(JSON.stringify({"id": session.id, "t": "q"}));
 return;
 }
 function setmode(mode, ev) {
 if (ev)