mirror of
https://github.com/NuSkooler/enigma-bbs.git
synced 2025-08-05 09:21:30 +02:00
* Clean up door.py
* Implement trimMessageAreasScheduledEvent() method * Misc cleanup
This commit is contained in:
Bryan Ashby
parent
6e6ebc9b18
commit
f5a1a79777
3 changed files with 208 additions and 199 deletions
220
core/door.js
220
core/door.js
|
|
@ -1,24 +1,24 @@
|
|||
/* jslint node: true */
|
||||
'use strict';
|
||||
|
||||
var spawn = require('child_process').spawn;
|
||||
var events = require('events');
|
||||
const events = require('events');
|
||||
|
||||
var _ = require('lodash');
|
||||
var pty = require('ptyw.js');
|
||||
var decode = require('iconv-lite').decode;
|
||||
var net = require('net');
|
||||
var async = require('async');
|
||||
const _ = require('lodash');
|
||||
const pty = require('ptyw.js');
|
||||
const decode = require('iconv-lite').decode;
|
||||
const createServer = require('net').createServer;
|
||||
|
||||
exports.Door = Door;
|
||||
|
||||
function Door(client, exeInfo) {
|
||||
events.EventEmitter.call(this);
|
||||
|
||||
this.client = client;
|
||||
this.exeInfo = exeInfo;
|
||||
|
||||
const self = this;
|
||||
this.client = client;
|
||||
this.exeInfo = exeInfo;
|
||||
this.exeInfo.encoding = this.exeInfo.encoding || 'cp437';
|
||||
this.exeInfo.encoding = this.exeInfo.encoding.toLowerCase();
|
||||
let restored = false;
|
||||
|
||||
//
|
||||
// Members of exeInfo:
|
||||
|
|
@ -31,25 +31,17 @@ function Door(client, exeInfo) {
|
|||
// dropFile
|
||||
// node
|
||||
// inhSocket
|
||||
//
|
||||
}
|
||||
//
|
||||
|
||||
require('util').inherits(Door, events.EventEmitter);
|
||||
|
||||
|
||||
|
||||
Door.prototype.run = function() {
|
||||
|
||||
var self = this;
|
||||
|
||||
var doorData = function(data) {
|
||||
// :TODO: skip decoding if we have a match, e.g. cp437 === cp437
|
||||
self.client.term.write(decode(data, self.exeInfo.encoding));
|
||||
this.doorDataHandler = function(data) {
|
||||
if(self.client.term.outputEncoding === self.exeInfo.encoding) {
|
||||
self.client.term.rawWrite(data);
|
||||
} else {
|
||||
self.client.term.write(decode(data, self.exeInfo.encoding));
|
||||
}
|
||||
};
|
||||
|
||||
var restored = false;
|
||||
|
||||
var restore = function(piped) {
|
||||
this.restoreIo = function(piped) {
|
||||
if(!restored && self.client.term.output) {
|
||||
self.client.term.output.unpipe(piped);
|
||||
self.client.term.output.resume();
|
||||
|
|
@ -57,100 +49,98 @@ Door.prototype.run = function() {
|
|||
}
|
||||
};
|
||||
|
||||
var sockServer;
|
||||
this.prepareSocketIoServer = function(cb) {
|
||||
if('socket' === self.exeInfo.io) {
|
||||
const sockServer = createServer(conn => {
|
||||
|
||||
async.series(
|
||||
[
|
||||
function prepareServer(callback) {
|
||||
if('socket' === self.exeInfo.io) {
|
||||
sockServer = net.createServer(function connected(conn) {
|
||||
sockServer.getConnections( (err, count) => {
|
||||
|
||||
sockServer.getConnections(function connCount(err, count) {
|
||||
// We expect only one connection from our DOOR/emulator/etc.
|
||||
if(!err && count <= 1) {
|
||||
self.client.term.output.pipe(conn);
|
||||
|
||||
conn.on('data', self.doorDataHandler);
|
||||
|
||||
// We expect only one connection from our DOOR/emulator/etc.
|
||||
if(!err && count <= 1) {
|
||||
self.client.term.output.pipe(conn);
|
||||
|
||||
conn.on('data', doorData);
|
||||
|
||||
conn.once('end', function ended() {
|
||||
restore(conn);
|
||||
});
|
||||
|
||||
conn.once('error', function error(err) {
|
||||
self.client.log.info('Door socket server connection error: ' + err.message);
|
||||
restore(conn);
|
||||
});
|
||||
}
|
||||
conn.once('end', () => {
|
||||
return self.restoreIo(conn);
|
||||
});
|
||||
});
|
||||
|
||||
sockServer.listen(0, function listening() {
|
||||
callback(null);
|
||||
});
|
||||
} else {
|
||||
callback(null);
|
||||
}
|
||||
},
|
||||
function launch(callback) {
|
||||
// Expand arg strings, e.g. {dropFile} -> DOOR32.SYS
|
||||
var args = _.clone(self.exeInfo.args); // we need a copy so the original is not modified
|
||||
|
||||
for(var i = 0; i < args.length; ++i) {
|
||||
args[i] = self.exeInfo.args[i].format({
|
||||
dropFile : self.exeInfo.dropFile,
|
||||
node : self.exeInfo.node.toString(),
|
||||
//inhSocket : self.exeInfo.inhSocket.toString(),
|
||||
srvPort : sockServer ? sockServer.address().port.toString() : '-1',
|
||||
userId : self.client.user.userId.toString(),
|
||||
});
|
||||
}
|
||||
|
||||
var door = pty.spawn(self.exeInfo.cmd, args, {
|
||||
cols : self.client.term.termWidth,
|
||||
rows : self.client.term.termHeight,
|
||||
// :TODO: cwd
|
||||
env : self.exeInfo.env,
|
||||
});
|
||||
|
||||
if('stdio' === self.exeInfo.io) {
|
||||
self.client.log.debug('Using stdio for door I/O');
|
||||
|
||||
self.client.term.output.pipe(door);
|
||||
|
||||
door.on('data', doorData);
|
||||
|
||||
door.once('close', function closed() {
|
||||
restore(door);
|
||||
});
|
||||
} else if('socket' === self.exeInfo.io) {
|
||||
self.client.log.debug(
|
||||
{ port : sockServer.address().port },
|
||||
'Using temporary socket server for door I/O');
|
||||
}
|
||||
|
||||
door.once('exit', function exited(code) {
|
||||
self.client.log.info( { code : code }, 'Door exited');
|
||||
|
||||
if(sockServer) {
|
||||
sockServer.close();
|
||||
conn.once('error', err => {
|
||||
self.client.log.info( { error : err.toString() }, 'Door socket server connection');
|
||||
return self.restoreIo(conn);
|
||||
});
|
||||
}
|
||||
|
||||
// we may not get a close
|
||||
if('stdio' === self.exeInfo.io) {
|
||||
restore(door);
|
||||
}
|
||||
|
||||
door.removeAllListeners();
|
||||
|
||||
self.emit('finished');
|
||||
});
|
||||
}
|
||||
],
|
||||
function complete(err) {
|
||||
if(err) {
|
||||
self.client.log.warn( { error : err.toString() }, 'Failed executing door');
|
||||
}
|
||||
});
|
||||
|
||||
sockServer.listen(0, () => {
|
||||
return cb(null, sockServer);
|
||||
});
|
||||
} else {
|
||||
return cb(null);
|
||||
}
|
||||
);
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
require('util').inherits(Door, events.EventEmitter);
|
||||
|
||||
Door.prototype.run = function() {
|
||||
const self = this;
|
||||
|
||||
this.prepareSocketIoServer( (err, sockServer) => {
|
||||
if(err) {
|
||||
this.client.log.warn( { error : err.toString() }, 'Failed executing door');
|
||||
return self.emit('finished');
|
||||
}
|
||||
|
||||
// Expand arg strings, e.g. {dropFile} -> DOOR32.SYS
|
||||
let args = _.clone(self.exeInfo.args); // we need a copy so the original is not modified
|
||||
|
||||
for(let i = 0; i < args.length; ++i) {
|
||||
args[i] = self.exeInfo.args[i].format({
|
||||
dropFile : self.exeInfo.dropFile,
|
||||
node : self.exeInfo.node.toString(),
|
||||
srvPort : sockServer ? sockServer.address().port.toString() : '-1',
|
||||
userId : self.client.user.userId.toString(),
|
||||
});
|
||||
}
|
||||
|
||||
const door = pty.spawn(self.exeInfo.cmd, args, {
|
||||
cols : self.client.term.termWidth,
|
||||
rows : self.client.term.termHeight,
|
||||
// :TODO: cwd
|
||||
env : self.exeInfo.env,
|
||||
});
|
||||
|
||||
if('stdio' === self.exeInfo.io) {
|
||||
self.client.log.debug('Using stdio for door I/O');
|
||||
|
||||
self.client.term.output.pipe(door);
|
||||
|
||||
door.on('data', self.doorDataHandler);
|
||||
|
||||
door.once('close', () => {
|
||||
return self.restoreIo(door);
|
||||
});
|
||||
} else if('socket' === self.exeInfo.io) {
|
||||
self.client.log.debug( { port : sockServer.address().port }, 'Using temporary socket server for door I/O');
|
||||
}
|
||||
|
||||
door.once('exit', exitCode => {
|
||||
self.client.log.info( { exitCode : exitCode }, 'Door exited');
|
||||
|
||||
if(sockServer) {
|
||||
sockServer.close();
|
||||
}
|
||||
|
||||
// we may not get a close
|
||||
if('stdio' === self.exeInfo.io) {
|
||||
return self.restoreIo(door);
|
||||
}
|
||||
|
||||
door.removeAllListeners();
|
||||
|
||||
self.emit('finished');
|
||||
});
|
||||
});
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue