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

RLG-Web: Allow games to be taken over.

Browse source 
Make it possible to reconnect to a game if the user has left the page
without saving.
This commit is contained in:
John "Elwin" Edwards 2012-07-11 10:30:33 -07:00
parent 8ebcf32a4d
commit 2828b5f33c
2 changed files with 51 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
rlgterm.js
View file

@ -562,14 +562,14 @@ function getchoices() {
else if (reply.stat[gname] == "0") else if (reply.stat[gname] == "0")
acttext = "Start a game"; acttext = "Start a game";
else if (reply.stat[gname] == "p") else if (reply.stat[gname] == "p")
acttext = "Game in progress"; acttext = "Reconnect";
else if (reply.stat[gname] == "d") else if (reply.stat[gname] == "d")
acttext = "Game in progress (dgl)"; acttext = "Game in progress (dgl)";
else else
continue; continue;
var button = document.createElement("span"); var button = document.createElement("span");
button.appendChild(document.createTextNode(acttext)); button.appendChild(document.createTextNode(acttext));
if ("s0".indexOf(reply.stat[gname]) >= 0) { if ("s0p".indexOf(reply.stat[gname]) >= 0) {
button.onclick = makeStarter(gname); button.onclick = makeStarter(gname);
button.className = "ibutton"; button.className = "ibutton";
} }
@ -628,9 +628,20 @@ function startgame(game) {
} }
else if (reply.t == 'E') { else if (reply.t == 'E') {
debug(1, "Could not start game: " + reply.s); debug(1, "Could not start game: " + reply.s);
message("Your game could not be started: " + reply.s);
if (reply.c == 1) { if (reply.c == 1) {
logout(); logout();
message("The server forgot about you, please log in again.");
}
else if (reply.c == 4) {
message("You can't play that game because it is currently being " +
"played over SSH.");
}
else if (reply.c == 7) {
message("The game is being saved, try again in a few seconds.");
}
else {
message("The server says it can't start your game because \"" +
reply.s + "\". This is probably a bug.");
} }
} }
}; };

39
rlgwebd.js
View file

@ -309,6 +309,23 @@ function Player(gamename, lkey, dims, callback) {
} }
tslog("Flushing queue for player %s", player.id); tslog("Flushing queue for player %s", player.id);
}; };
this.reset = function () {
/* To be called when the game is taken over. */
if (this.Qtimeout) {
clearTimeout(this.Qtimeout);
this.Qtimeout = null;
}
for (var i = 0; i < this.recvQ.length; i++) {
if (this.recvQ[i] !== undefined) {
this.session.write(this.recvQ[i]);
}
}
this.recvQ = [];
this.nrecv = 0;
this.nsend = 0;
this.sendQ = [{"t": "d", "n": this.nsend++,
"d": this.session.framebuf.toString("hex", 0, this.session.frameoff)}];
};
this.quit = function() { this.quit = function() {
if (this.alive) if (this.alive)
this.session.close(); this.session.close();
@ -611,7 +628,9 @@ function startgame(req, res, formdata) {
} }
// A callback to pass to the game-in-progress checker. // A callback to pass to the game-in-progress checker.
var launch = function(err, fname) { var launch = function(err, fname) {
if (fname) { var nodematch = new RegExp("^" + username + ":node:");
if (fname && (fname.match(nodematch) === null)) {
/* It's being played in dgamelaunch. */
sendError(res, 4, null); sendError(res, 4, null);
tslog("%s is already playing %s", username, gname); tslog("%s is already playing %s", username, gname);
return; return;
@ -630,7 +649,23 @@ function startgame(req, res, formdata) {
tslog("Unable to allocate TTY for %s", gname); tslog("Unable to allocate TTY for %s", gname);
} }
}; };
new Player(gname, lkey, dims, respondlaunch); if (fname) {
for (var cid in clients) {
cli = clients[cid];
if ((cli instanceof Player) &&
cli.session.pname == username &&
cli.session.game.uname == gname) {
cli.reset();
respondlaunch(cli, true);
tslog("Game %d has been taken over.", cli.session.sessid);
return;
}
}
sendError(res, 7);
}
else {
new Player(gname, lkey, dims, respondlaunch);
}
}; };
checkprogress(username, games[gname], launch, []); checkprogress(username, games[gname], launch, []);
} }