RLGWebD: rlgterm.js comparison

comparison rlgterm.js @ 58:7a50b4412fea

Move credentials into the drivers. The session id, or whether the session is currently active on the server, are better handled in the drivers than in termemu.js.

author	John "Elwin" Edwards <elwin@sdf.org>
date	Tue, 19 Jun 2012 13:40:30 -0700
parents	e7c864e80a79
children	00b985b8ba6a

comparison

equal deleted inserted replaced

-:e7c864e80a79
+:7a50b4412fea
 };
 /* Login name and key */
 var lname = null;
 var lcred = null;
+/* The session id assigned by the server. */
+var sessid = null;
 function writeData(hexstr) {
 var codenum;
 var codes = [];
 var nc;
 }
 return havedata;
 }
 function getData() {
-if (termemu.sessid == null)
+if (sessid == null)
 return;
 var datareq = new XMLHttpRequest();
-var msg = JSON.stringify({"id": termemu.sessid, "t": "n"});
+var msg = JSON.stringify({"id": sessid, "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": termemu.sessid, "t": "d", "n": nsend++, "d": str};
+var msgDict = {"id": sessid, "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 (termemu.sessid == null)
+if (sessid == null)
 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?
-if (termemu.sessid != null)
+if (sessid != null)
 ev.preventDefault();
 var datareq = new XMLHttpRequest();
-var msgDict = {"id": termemu.sessid, "t": "d", "n": nsend++, "d": code};
+var msgDict = {"id": sessid, "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 (termemu.sessid == null)
+if (sessid == null)
 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": termemu.sessid, "t": "d", "n": nsend++, "d": keystr};
+var msgDict = {"id": sessid, "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 (termemu.sessid != null)
+if (sessid != null)
 return;
 var loginmsg = {};
 loginmsg["name"] = document.getElementById("input_name").value;
 loginmsg["pw"] = document.getElementById("input_pw").value;
 var req = new XMLHttpRequest();
 req.send(JSON.stringify(loginmsg));
 return;
 }
 function getcurrent() {
-if (termemu.sessid)
+if (sessid)
 return;
 var req = new XMLHttpRequest();
 req.onreadystatechange = function () {
 if (req.readyState != 4 || req.status != 200)
 return;
 req.send();
 return;
 }
 function getchoices() {
-if (termemu.sessid != null || !lcred)
+if (sessid != null || !lcred)
 return;
 var req = new XMLHttpRequest();
 req.onreadystatechange = function () {
 if (req.readyState != 4 || req.status != 200)
 return;
 }
 return starter;
 }
 function startgame(game) {
-if (termemu.sessid != null || !lcred)
+if (sessid != null || !lcred)
 return;
 var smsg = {};
 smsg["key"] = lcred;
 smsg["game"] = game.uname;
 smsg["h"] = 24;
 if (req.readyState != 4 || req.status != 200)
 return;
 var reply = JSON.parse(req.responseText);
 if (reply.t == 's') {
 /* Success */
-termemu.sessid = reply.id;
+sessid = reply.id;
 termemu.resize(reply.h, reply.w);
 setTitle("Playing as " + lname);
-debug(1, "Playing with id " + termemu.sessid);
+debug(1, "Playing with id " + sessid);
 setmode("play");
 getData();
 }
 else if (reply.t == 'E') {
 debug(1, "Could not start game: " + reply.s);
 return;
 }
 function formreg(ev) {
 ev.preventDefault();
-if (termemu.sessid != null)
+if (sessid != 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;
 req.send(JSON.stringify(regmsg));
 return;
 }
 function gameover() {
-if (termemu.sessid == null)
+if (sessid == null)
 return;
 /* TODO IFACE2 If the end was unexpected, tell player the game was saved. */
-termemu.sessid = null;
+sessid = null;
 ajaxstate.clear();
 setTitle("Game over.");
 nsend = 0;
 nrecv = 0;
 msgQ = [];
 lname = null;
 setmode("login");
 }
 function stop() {
-if (!termemu.sessid)
+if (!sessid)
 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": termemu.sessid, "t": "q"}));
+req.send(JSON.stringify({"id": sessid, "t": "q"}));
 return;
 }
 function setmode(mode, ev) {
 if (ev)