RLGWebD: rlgwebd.js comparison

comparison rlgwebd.js @ 176:bf518a00190b

Add client-side support for watching dgamelaunch games.

author	John "Elwin" Edwards
date	Wed, 14 Jan 2015 07:44:22 -0500
parents	4dd87508fc96
children	85fde763c7ed

comparison

equal deleted inserted replaced

-:4dd87508fc96
+:bf518a00190b
 "name": "xterm-256color"};
 this.term = pty.spawn(this.game.path, args, spawnopts);
 tslog("%s playing %s (pid %d)", this.pname, this.game.uname, this.term.pid);
 this.failed = false;
 sessions[this.game.uname + "/" + this.pname] = this;
-gamemux.emit('begin', this.game.uname, this.pname);
+gamemux.emit('begin', this.game.uname, this.pname, 'rlg');
 /* Set up the lockfile and ttyrec */
 this.lasttime = new Date();
 var ts = timestamp(this.lasttime);
 var progressdir = path.join("/dgldir/inprogress", this.game.uname);
 this.lock = path.join(progressdir, this.pname + ":node:" + ts + ".ttyrec");
 }
 else {
 ss.fd = fd;
 ss.emit('open', true);
 tslog("DGL %s: open", ss.tag());
+gamemux.emit('begin', ss.gname, ss.pname, 'dgl');
 ss.readchunk();
 ss.recwatcher = fs.watch(ss.ttyrec, function (ev, finame) {
 if (ev == "change")
 ss.readchunk();
 });
 if (connlist[i].connected)
 connlist[i].close();
 }
 fs.close(this.fd);
 this.emit("close");
+gamemux.emit('end', this.gname, this.pname);
 tslog("DGL %s: closed", ss.tag());
 };
 this.watchers = [];
 /* Attach a watcher. */
 this.attach = function (wsReq) {
 /* Currently, this doesn't do anything blocking, but keep the callback */
 function getStatus(callback) {
 var now = new Date();
 var statusinfo = {"s": allowlogin, "g": []};
 for (var tag in sessions) {
-var gamedesc = {};
+var gamedesc = {"c": "rlg"};
 gamedesc["p"] = sessions[tag].pname;
 gamedesc["g"] = sessions[tag].game.uname;
 gamedesc["i"] = now - sessions[tag].lasttime;
 gamedesc["w"] = sessions[tag].watchers.length;
 statusinfo["g"].push(gamedesc);
 }
-statusinfo["dgl"] = [];
 for (var tag in dglgames) {
-var dglinfo = {};
+var dglinfo = {"c": "dgl"};
 var slash = tag.search('/');
 dglinfo["g"] = tag.slice(0, slash);
 dglinfo["p"] = tag.slice(slash + 1);
 dglinfo["i"] = now - dglgames[tag].lasttime;
 dglinfo["w"] = dglgames[tag].watchers.length;
-statusinfo["dgl"].push(dglinfo);
+statusinfo["g"].push(dglinfo);
 }
 callback(statusinfo);
 }
 function statusmsg(req, res) {
 getStatus(function (info) {
 info["t"] = "t";
 conn.sendUTF(JSON.stringify(info));
 });
 }
-var beginH = function (gname, pname) {
+var beginH = function (gname, pname, client) {
-conn.sendUTF(JSON.stringify({"t": "b", "p": pname, "g": gname}));
+conn.sendUTF(JSON.stringify({"t": "b", "c": client, "p": pname,
+"g": gname}));
 };
 var listH = function (list) {
 conn.sendUTF(JSON.stringify(list));
 };
 var endH = function (gname, pname) {
 /* Only games with low idle time are included.  Use getStatus() for the
 * complete list. */
 function pushStatus() {
 var now = new Date();
-var statusinfo = {"t": "p", "s": allowlogin, "g": [], "dgl": []};
+var statusinfo = {"t": "p", "s": allowlogin, "g": []};
 for (var tag in sessions) {
 var delta = now - sessions[tag].lasttime;
 if (delta < 60000) {
-var gamedesc = {};
+var gamedesc = {"c": "rlg"};
 gamedesc["p"] = sessions[tag].pname;
 gamedesc["g"] = sessions[tag].game.uname;
 gamedesc["i"] = delta;
 gamedesc["w"] = sessions[tag].watchers.length;
 statusinfo["g"].push(gamedesc);
 }
 }
 for (var tag in dglgames) {
 var delta = now - dglgames[tag].lasttime;
 if (delta < 60000) {
-var dglinfo = {};
+var dglinfo = {"c": "dgl"};
 var slash = tag.search('/');
 dglinfo["g"] = tag.slice(0, slash);
 dglinfo["p"] = tag.slice(slash + 1);
 dglinfo["i"] = delta;
 dglinfo["w"] = dglgames[tag].watchers.length;
-statusinfo["dgl"].push(dglinfo);
+statusinfo["g"].push(dglinfo);
 }
 }
 gamemux.emit('list', statusinfo);
 }