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

* Fix file transfer bug for WebSockets and SSH. Set/restore temp data handler belongs in base client. 

* Lint some files
This commit is contained in:
Bryan Ashby 2018-05-12 09:33:41 -06:00
parent b2ae81c59e
commit 388e581b90
4 changed files with 57 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/client.js
View File

@ -100,6 +100,16 @@ function Client(/*input, output*/) {
} }
}); });
this.setTemporaryDirectDataHandler = function(handler) {
this.input.removeAllListeners('data');
this.input.on('data', handler);
};
this.restoreDataHandler = function() {
this.input.removeAllListeners('data');
this.input.on('data', this.dataHandler);
};
// //
// Peek at incoming |data| and emit events for any special // Peek at incoming |data| and emit events for any special

8
core/servers/login/ssh.js
View File

@ -129,6 +129,10 @@ function SSHClient(clientConn) {
} }
}); });
this.dataHandler = function(data) {
self.emit('data', data);
};
this.updateTermInfo = function(info) { this.updateTermInfo = function(info) {
// //
// From ssh2 docs: // From ssh2 docs:
@ -191,9 +195,7 @@ function SSHClient(clientConn) {
self.setInputOutput(channel.stdin, channel.stdout); self.setInputOutput(channel.stdin, channel.stdout);
channel.stdin.on('data', data => { channel.stdin.on('data', self.dataHandler);
self.emit('data', data);
});
if(self.cachedPtyInfo) { if(self.cachedPtyInfo) {
self.updateTermInfo(self.cachedPtyInfo); self.updateTermInfo(self.cachedPtyInfo);

10
core/servers/login/telnet.js
View File

@ -486,16 +486,6 @@ function TelnetClient(input, output) {
newEnvironRequested : false, newEnvironRequested : false,
}; };
this.setTemporaryDirectDataHandler = function(handler) {
this.input.removeAllListeners('data');
this.input.on('data', handler);
};
this.restoreDataHandler = function() {
this.input.removeAllListeners('data');
this.input.on('data', this.dataHandler);
};
this.dataHandler = function(b) { this.dataHandler = function(b) {
if(!Buffer.isBuffer(b)) { if(!Buffer.isBuffer(b)) {
EnigAssert(false, `Cannot push non-buffer ${typeof b}`); EnigAssert(false, `Cannot push non-buffer ${typeof b}`);

8
core/servers/login/websocket.js
View File

@ -30,6 +30,10 @@ function WebSocketClient(ws, req, serverType) {
const self = this; const self = this;
this.dataHandler = function(data) {
self.socketBridge.emit('data', data);
};
// //
// This bridge makes accessible various calls that client sub classes // This bridge makes accessible various calls that client sub classes
// want to access on I/O socket // want to access on I/O socket
@ -65,9 +69,7 @@ function WebSocketClient(ws, req, serverType) {
} }
}(ws); }(ws);
ws.on('message', data => { ws.on('message', this.dataHandler);
this.socketBridge.emit('data', data);
});
ws.on('close', () => { ws.on('close', () => {
// we'll remove client connection which will in turn end() via our SocketBridge above // we'll remove client connection which will in turn end() via our SocketBridge above