warden/rlgwebd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add client-side support for watching dgamelaunch games.

Browse source
This commit is contained in:
John "Elwin" Edwards 2015-01-14 07:44:22 -05:00
parent 7332b95a30
commit 2e0cec33ba
3 changed files with 37 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

24
rlgwebd.js
View file

@ -109,7 +109,7 @@ function TermSession(gname, pname, wsReq) {
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);
@ -345,6 +345,7 @@ function DglSession(filename) {
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")
@ -368,6 +369,7 @@ function DglSession(filename) {
}
fs.close(this.fd);
this.emit("close");
gamemux.emit('end', this.gname, this.pname);
tslog("DGL %s: closed", ss.tag());
};
this.watchers = [];
@ -820,22 +822,21 @@ 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);
}
@ -1084,8 +1085,9 @@ function wsHandler(wsRequest) {
conn.sendUTF(JSON.stringify(info));
});
}
var beginH = function (gname, pname) {
conn.sendUTF(JSON.stringify({"t": "b", "p": pname, "g": gname}));
var beginH = function (gname, pname, client) {
conn.sendUTF(JSON.stringify({"t": "b", "c": client, "p": pname,
"g": gname}));
};
var listH = function (list) {
conn.sendUTF(JSON.stringify(list));
@ -1112,11 +1114,11 @@ function wsHandler(wsRequest) {
* 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;
@ -1127,13 +1129,13 @@ function pushStatus() {
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);