RLGWebD: rlgwebd.js comparison

comparison rlgwebd.js @ 170:50e4c9feeac2

RLGWebD: fix simultaneous player bug. Multiple games can now run at the same time, and data will be sent to the proper place. The interaction of multiple players with watchers has not yet been tested.

author	John "Elwin" Edwards
date	Fri, 09 Jan 2015 13:06:41 -0500
parents	6f4b7e1b32e8
children	671bed5039aa

comparison

equal deleted inserted replaced

-:6f4b7e1b32e8
+:50e4c9feeac2
 var gamemux = new events.EventEmitter();
 /* Constructor.  A TermSession handles a pty and the game running on it.
 *   gname: (String) Name of the game to launch.
 *   pname: (String) The player's name.
-*   dims: (Array [Number, Number]) Height and width of the pty.
+*   wsReq: (WebSocketRequest) The request from the client.
-*   handlers: (Object) Key-value pairs, event names and functions to
+*
-*           install to handle them.
 *  Events:
 *   "data": Data generated by child. Parameters: buf (Buffer)
 *   "exit": Child terminated. Parameters: none
 */
-function TermSession(gname, pname, dims, handlers) {
+function TermSession(gname, pname, wsReq) {
 var ss = this;
 /* Subclass EventEmitter to do the hard work. */
 events.EventEmitter.call(this);
-for (var evname in handlers)
-this.on(evname, handlers[evname]);
 /* Don't launch anything that's not a real game. */
 if (gname in games) {
 this.game = games[gname];
 }
 else {
 this.failed = true;
+wsReq.reject(404, errorcodes[2], "No such game");
+tslog("Game %s is not available", game);
 return;
 }
 this.pname = pname;
-/* Grab a spot in the sessions table. */
-sessions[this.game.uname + "/" + this.pname] = this;
 /* Set up the sizes. */
-this.w = Math.floor(Number(dims[1]));
+this.w = Math.floor(Number(wsReq.resourceURL.query.w));
 if (!(this.w > 0 && this.w < 256))
 this.w = 80;
-this.h = Math.floor(Number(dims[0]));
+this.h = Math.floor(Number(wsReq.resourceURL.query.h));
 if (!(this.h > 0 && this.h < 256))
 this.h = 24;
 /* Environment. */
 var childenv = {};
 for (var key in process.env) {
 var spawnopts = {"env": childenv, "cwd": "/", "rows": this.h, "cols": this.w,
 "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);
 /* 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.record = fs.createWriteStream(ttyrec, { mode: 0664 });
 /* Holds the output since the last screen clear, so watchers can begin
 * with a complete screen. */
 this.framebuf = new Buffer(1024);
 this.frameoff = 0;
+this.playerconn = wsReq.accept(null, wsReq.origin);
 /* END setup */
 function ttyrec_chunk(datastr) {
 ss.lasttime = new Date();
 var buf = new Buffer(datastr);
 var chunk = new Buffer(buf.length + 12);
 chunk.writeUInt32LE(1000 * (ss.lasttime.getTime() % 1000), 4);
 chunk.writeUInt32LE(buf.length, 8);
 buf.copy(chunk, 12);
 ss.record.write(chunk);
 ss.framepush(buf);
+/* Send to the player. */
+var msg = {"t": "d", "d": buf.toString("hex")};
+ss.playerconn.sendUTF(JSON.stringify(msg));
+/* For the benefit of watchers. */
 ss.emit('data', buf);
 }
 this.term.on("data", ttyrec_chunk);
 this.framepush = function(chunk) {
 /* If this chunk resets the screen, discard what preceded it. */
 // Teardown.
 this.term.on("exit", function () {
 var tag = ss.tag();
 fs.unlink(ss.lock);
 ss.record.end();
+if (ss.playerconn.connected) {
+ss.playerconn.sendUTF(JSON.stringify({"t": "q"}));
+ss.playerconn.close();
+}
 ss.emit('exit');
 gamemux.emit('end', ss.game.uname, ss.pname);
 delete sessions[tag];
 tslog("Game %s ended.", tag);
 });
 this.close = function () {
-if (this.tag() in sessions)
+if (ss.tag() in sessions)
-this.term.kill('SIGHUP');
+ss.term.kill('SIGHUP');
 };
+/* Send initial data. */
+this.playerconn.sendUTF(JSON.stringify({"t": "s", "w": this.w, "h": this.h,
+"p": this.pname, "g": this.game.uname}));
+/* Attach handlers. */
+function messageH(message) {
+var parsedMsg = getMsgWS(message);
+if (parsedMsg.t == 'q') {
+ss.close();
+}
+else if (parsedMsg.t == 'd') {
+var hexstr = parsedMsg.d.replace(/[^0-9a-f]/gi, "");
+if (hexstr.length % 2 != 0) {
+hexstr = hexstr.slice(0, -1);
+}
+var keybuf = new Buffer(hexstr, "hex");
+ss.write(keybuf);
+}
+}
+this.playerconn.on('message', messageH);
+this.playerconn.on('close', this.close);
 }
 TermSession.prototype = new events.EventEmitter();
 function DglSession(filename) {
 var ss = this;
 }));
 conn.sendUTF(JSON.stringify({"t": "d",
 "d": session.framebuf.toString("hex", 0, session.frameoff)}));
 }
-function wsPlay(wsReq, game, pname, dims) {
+function wsStartGame(wsReq) {
-tslog("wsPlay: running for %s/%s", game, pname);
-tslog("Request is for %s", logins[wsReq.resourceURL.query["key"]].name);
-var conn;
-var session;
-/* Listeners on the WebSocket */
-function messageH(message) {
-var parsedMsg = getMsgWS(message);
-if (parsedMsg.t == 'q') {
-session.close();
-}
-else if (parsedMsg.t == 'd') {
-var hexstr = parsedMsg.d.replace(/[^0-9a-f]/gi, "");
-if (hexstr.length % 2 != 0) {
-hexstr = hexstr.slice(0, -1);
-}
-var keybuf = new Buffer(hexstr, "hex");
-session.write(keybuf);
-}
-}
-function closeH() {
-session.close();
-}
-/* These listen on the TermSession. */
-function dataH(chunk) {
-var msg = {};
-msg.t = "d";
-msg.d = chunk.toString("hex");
-conn.sendUTF(JSON.stringify(msg));
-}
-function exitH() {
-if (conn.connected)
-conn.sendUTF(JSON.stringify({"t": "q"}));
-conn.close();
-session.removeListener('data', dataH);
-session.removeListener('exit', exitH);
-}
-var handlers = {'data': dataH, 'exit': exitH};
-session = new TermSession(game, pname, dims, handlers);
-if (!session.failed) {
-var tag = session.game.uname + "/" + session.pname;
-var reply = {"t": "s", "tag": tag, "w": session.w, "h": session.h,
-"p": session.pname, "g": session.game.uname};
-tslog("Accepting for %s", tag);
-tslog("Request is for %s", logins[wsReq.resourceURL.query["key"]].name);
-tslog("Session is for %s", session.pname);
-conn = wsReq.accept(null, wsReq.origin);
-conn.sendUTF(JSON.stringify(reply));
-conn.on('message', messageH);
-conn.on('close', closeH);
-}
-else {
-wsReq.reject(500, errorcodes[5]);
-tslog("Unable to allocate TTY for %s", game);
-}
-}
-function wsStart(wsReq) {
 var playmatch = wsReq.resourceURL.pathname.match(/^\/play\/([^\/]*)$/);
 if (!playmatch[1] || !(playmatch[1] in games)) {
 wsReq.reject(404, errorcodes[2]);
 return;
 }
 if (!(lkey in logins)) {
 wsReq.reject(404, errorcodes[1]);
 return;
 }
 var pname = logins[lkey].name;
-var dims = [wsReq.resourceURL.query.h, wsReq.resourceURL.query.w];
 function progcallback(err, fname) {
 if (fname) {
 wsReq.reject(404, errorcodes[4]);
 tslog("%s is already playing %s", pname, gname);
 }
-else
+else {
-wsPlay(wsReq, gname, pname, dims);
+new TermSession(gname, pname, wsReq);
+}
 };
 checkprogress(pname, games[gname], progcallback, []);
 }
 /* Some functions which check whether a player is currently playing or
 var conn = wsRequest.accept(null, wsRequest.origin);
 new wsWatcher(conn, tsession);
 tslog("Game %s is being watched via WebSockets", tsession.tag());
 }
 else if (playmatch !== null) {
-wsStart(wsRequest);
+wsStartGame(wsRequest);
 }
 else if (wsRequest.resourceURL.pathname == "/status") {
 var conn = wsRequest.accept(null, wsRequest.origin);
 var tell = function () {
 getStatus(function (info) {