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

Cherry pick door fix

Browse Source
This commit is contained in:
Bryan Ashby
2024-02-06 16:02:51 -07:00
parent f638ea85f0
commit 69710d4c52
1 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
core/door.js
View File

@@ -161,16 +161,42 @@ module.exports = class Door {
'External door process spawned' 'External door process spawned'
); );
const exitHandler = () => {
if (this.sockServer) {
this.sockServer.close();
}
// we may not get a close
if ('stdio' === this.io) {
this.restoreIo(this.doorPty);
}
if (this.doorPty) {
this.doorPty.removeAllListeners();
delete this.doorPty;
}
return callback(null);
};
this.doorPty.on('error', err => {
this.client.log.warn(
{ error: err.message },
'Door exited with error'
);
});
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(this.doorPty); this.client.term.output.pipe(this.doorPty);
this.doorPty.onData(this.doorDataHandler.bind(this)); // dumb hack around node-pty; under nix, if we bail at the
// right time, listenerCount will be referenced, but does
// not exist!
this.doorPty.listenerCount = () => 1;
this.doorPty.onExit( (/*exitEvent*/) => { this.doorPty.onData(this.doorDataHandler.bind(this));
return this.restoreIo(this.doorPty);
});
} else if ('socket' === this.io) { } else if ('socket' === this.io) {
this.client.log.debug( this.client.log.debug(
{ {
@@ -184,20 +210,7 @@ module.exports = class Door {
this.doorPty.onExit(exitEvent => { this.doorPty.onExit(exitEvent => {
const {exitCode, signal} = exitEvent; const {exitCode, signal} = exitEvent;
this.client.log.info({ exitCode, signal }, 'Door exited'); this.client.log.info({ exitCode, signal }, 'Door exited');
exitHandler();
if (this.sockServer) {
this.sockServer.close();
}
// we may not get a close
if ('stdio' === this.io) {
this.restoreIo(this.doorPty);
}
this.doorPty.removeAllListeners();
delete this.doorPty;
return callback(null);
}); });
}, },
], ],