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

Move to pty-node over custom pty2.js

Browse Source
This commit is contained in:
Bryan Ashby
2018-03-08 21:39:42 -07:00
parent 63ff2a6057
commit f6f1de4bd8
5 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/door.js
View File

@@ -6,7 +6,7 @@ const stringFormat = require('./string_format.js');
const events = require('events');
const _ = require('lodash');
const pty = require('ptyw.js');
const pty = require('node-pty');
const decode = require('iconv-lite').decode;
const createServer = require('net').createServer;
@@ -18,8 +18,7 @@ function Door(client, exeInfo) {
const self = this;
this.client = client;
this.exeInfo = exeInfo;
this.exeInfo.encoding = this.exeInfo.encoding || 'cp437';
this.exeInfo.encoding = this.exeInfo.encoding.toLowerCase();
this.exeInfo.encoding = (this.exeInfo.encoding || 'cp437').toLowerCase();
let restored = false;
//
@@ -36,11 +35,7 @@ function Door(client, exeInfo) {
//
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));
}
self.client.term.write(decode(data, self.exeInfo.encoding));
};
this.restoreIo = function(piped) {
@@ -113,10 +108,11 @@ Door.prototype.run = function() {
}
const door = pty.spawn(self.exeInfo.cmd, args, {
cols : self.client.term.termWidth,
rows : self.client.term.termHeight,
cols : self.client.term.termWidth,
rows : self.client.term.termHeight,
// :TODO: cwd
env : self.exeInfo.env,
env : self.exeInfo.env,
encoding : null, // we want to handle all encoding ourself
});
if('stdio' === self.exeInfo.io) {