moon
/
enigma-bbs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hopefully a little better handling of external doors/processes

This commit is contained in:
Bryan Ashby 2019-06-01 14:38:48 -06:00
parent da91bf0191
commit 9cc59f8ff8
No known key found for this signature in database
GPG Key ID: B49EB437951D2542
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
core/door.js
View File

@ -70,14 +70,13 @@ module.exports = class Door {
const args = exeInfo.args.map( arg => stringFormat(arg, formatObj) ); const args = exeInfo.args.map( arg => stringFormat(arg, formatObj) );
this.client.log.debug( this.client.log.info(
{ cmd : exeInfo.cmd, args, io : this.io }, { cmd : exeInfo.cmd, args, io : this.io },
'Executing door' 'Executing external door process'
); );
let door;
try { try {
door = pty.spawn(exeInfo.cmd, args, { this.doorPty = pty.spawn(exeInfo.cmd, args, {
cols : this.client.term.termWidth, cols : this.client.term.termWidth,
rows : this.client.term.termHeight, rows : this.client.term.termHeight,
cwd : cwd, cwd : cwd,
@ -88,15 +87,19 @@ module.exports = class Door {
return cb(e); return cb(e);
} }
this.client.log.debug(
{ processId : this.doorPty.pid }, 'External door process spawned'
);
if('stdio' === this.io) { if('stdio' === this.io) {
this.client.log.debug('Using stdio for door I/O'); this.client.log.debug('Using stdio for door I/O');
this.client.term.output.pipe(door); this.client.term.output.pipe(this.doorPty);
door.on('data', this.doorDataHandler.bind(this)); this.doorPty.on('data', this.doorDataHandler.bind(this));
door.once('close', () => { this.doorPty.once('close', () => {
return this.restoreIo(door); return this.restoreIo(this.doorPty);
}); });
} else if('socket' === this.io) { } else if('socket' === this.io) {
this.client.log.debug( this.client.log.debug(
@ -105,7 +108,7 @@ module.exports = class Door {
); );
} }
door.once('exit', exitCode => { this.doorPty.once('exit', exitCode => {
this.client.log.info( { exitCode : exitCode }, 'Door exited'); this.client.log.info( { exitCode : exitCode }, 'Door exited');
if(this.sockServer) { if(this.sockServer) {
@ -114,10 +117,11 @@ module.exports = class Door {
// we may not get a close // we may not get a close
if('stdio' === this.io) { if('stdio' === this.io) {
this.restoreIo(door); this.restoreIo(this.doorPty);
} }
door.removeAllListeners(); this.doorPty.removeAllListeners();
delete this.doorPty;
return cb(null); return cb(null);
}); });
@ -128,9 +132,15 @@ module.exports = class Door {
} }
restoreIo(piped) { restoreIo(piped) {
if(!this.restored && this.client.term.output) { if(!this.restored) {
this.client.term.output.unpipe(piped); if(this.doorPty) {
this.client.term.output.resume(); this.doorPty.kill();
}
if(this.client.term.output) {
this.client.term.output.unpipe(piped);
this.client.term.output.resume();
}
this.restored = true; this.restored = true;
} }
} }