RLGWebD: rlgwebd.js comparison

comparison rlgwebd.js @ 87:bd2cf6dda28d

RLG-Web: use the pty module. Convert the RLG-Web server to use the pty.js module instead of the ptyhelper binary.

author	John "Elwin" Edwards <elwin@sdf.org>
date	Mon, 09 Jul 2012 12:24:03 -0700
parents	4303d94d87a2
children	d644e7d46852

comparison

equal deleted inserted replaced

-:ad4229cf8321
+:bd2cf6dda28d
 var path = require('path');
 var fs = require('fs');
 var events = require('events');
 var child_process = require('child_process');
 var daemon = require(path.join(localModules, "daemon"));
+var pty = require(path.join(localModules, "pty.js"));
 /* Configuration variables */
 // These first two files are NOT in the chroot.
 var ctlsocket = "/var/local/rlgwebd/ctl";
 var logfile = "/var/local/rlgwebd/log";
 *   handlers: (Object) Key-value pairs, event names and functions to
 *           install to handle them.
 *  Events:
 *   "open": Emitted on startup.  Parameters: success (Boolean)
 *   "data": Data generated by child. Parameters: buf (Buffer)
-*   "exit": Child terminated. Parameters: exitcode, signal
+*   "exit": Child terminated. Parameters: none
 */
 function TermSession(game, lkey, dims, handlers) {
 var ss = this;
 /* Subclass EventEmitter to do the hard work. */
 events.EventEmitter.call(this);
 /* Environment. */
 var childenv = {};
 for (var key in process.env) {
 childenv[key] = process.env[key];
 }
-childenv["PTYHELPER"] = String(this.h) + "x" + String(this.w);
+var args = ["-n", this.pname];
-args = [this.game.path, "-n", this.pname];
+var spawnopts = {"env": childenv, "cwd": "/", "rows": this.h, "cols": this.w,
-this.child = child_process.spawn("/bin/ptyhelper", args, {"env": childenv});
+"name": "xterm-256color"};
+this.term = pty.spawn(this.game.path, args, spawnopts);
+tslog("%s playing %s (index %d, pid %d)", this.pname, this.game.uname,
+this.sessid, this.term.pid);
 this.emit('open', true, this.sessid);
 /* Set up the lockfile and ttyrec */
 var ts = timestamp();
 var progressdir = "/dgldir/inprogress-" + this.game.uname;
 this.lock = path.join(progressdir, this.pname + ":node:" + ts + ".ttyrec");
-var lmsg = this.child.pid.toString() + '\n' + this.w + '\n' + this.h + '\n';
+var lmsg = this.term.pid.toString() + '\n' + this.w + '\n' + this.h + '\n';
 fs.writeFile(this.lock, lmsg, "utf8");
 var ttyrec = path.join("/dgldir/ttyrec", this.pname, this.game.uname,
 ts + ".ttyrec");
 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;
 logins[lkey].sessions.push(this.sessid);
-tslog("%s playing %s (index %d, pid %d)", this.pname, this.game.uname,
-this.sessid, this.child.pid);
 /* END setup */
-function ttyrec_chunk(buf) {
+function ttyrec_chunk(datastr) {
 var ts = new Date();
+var buf = new Buffer(datastr);
 var chunk = new Buffer(buf.length + 12);
 /* TTYREC headers */
 chunk.writeUInt32LE(Math.floor(ts.getTime() / 1000), 0);
 chunk.writeUInt32LE(1000 * (ts.getTime() % 1000), 4);
 chunk.writeUInt32LE(buf.length, 8);
 buf.copy(chunk, 12);
 ss.record.write(chunk);
 ss.framepush(buf);
 ss.emit('data', buf);
 }
-this.child.stdout.on("data", ttyrec_chunk);
+this.term.on("data", ttyrec_chunk);
-this.child.stderr.on("data", ttyrec_chunk);
 this.framepush = function(chunk) {
 /* If this chunk resets the screen, discard what preceded it. */
 if (bufncmp(chunk, this.game.clear, this.game.clear.length)) {
 this.framebuf = new Buffer(1024);
 this.frameoff = 0;
 }
 chunk.copy(this.framebuf, this.frameoff);
 this.frameoff += chunk.length;
 };
 this.write = function(data) {
-this.child.stdin.write(data);
+this.term.write(data);
 };
-this.child.on("exit", function (code, signal) {
+this.term.on("exit", function () {
 fs.unlink(ss.lock);
 ss.record.end();
-ss.emit('exit', code, signal);
+ss.emit('exit');
 var id = ss.sessid;
 delete sessions[id];
 tslog("Game %s ended.", id);
 });
 this.close = function () {
-this.child.kill('SIGHUP');
+this.term.kill('SIGHUP');
 };
 }
 TermSession.prototype = new events.EventEmitter();
 function Watcher(session) {
 reply.t = "d";
 reply.n = ss.nsend++;
 reply.d = buf.toString("hex");
 ss.sendQ.push(reply);
 }
-function exitH(code, signal) {
+function exitH() {
 ss.alive = false;
 ss.sendQ.push({"t": "q"});
 }
 session.on('data', dataH);
 session.on('exit', exitH);
 reply.t = "d";
 reply.n = ss.nsend++;
 reply.d = chunk.toString("hex");
 ss.sendQ.push(reply);
 }
-function exitH(code, signal) {
+function exitH() {
 ss.alive = false;
 ss.sendQ.push({"t": "q"});
 }
 var handlers = {'open': openH, 'data': dataH, 'exit': exitH};
 this.session = new TermSession(gamename, lkey, dims, handlers);
 }
 }
 process.on("exit", function () {
 for (var sessid in sessions) {
-sessions[sessid].child.kill('SIGHUP');
+sessions[sessid].term.kill('SIGHUP');
 }
 tslog("Quitting...");
 return;
 });