jinql
/
webssh
mirror of https://github.com/huashengdun/webssh
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed a bug that client closes websocket on handling non utf-8 encoded bytes

pull/12/merge
Sheng 2018-05-22 19:28:04 +08:00
parent 28360c31e2
commit 191bb109e0
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
webssh/static/js/main.js
View File

@ -91,8 +91,14 @@ jQuery(function($){
};
socket.onmessage = function(msg) {
// console.log(msg);
term.write(msg.data);
var reader = new FileReader();
reader.onloadend = function(event){
var decoder = new TextDecoder();
var text = decoder.decode(reader.result);
// console.log(text);
term.write(text);
};
reader.readAsArrayBuffer(msg.data);
};
socket.onerror = function(e) {

2
webssh/worker.py
View File

@ -63,7 +63,7 @@ class Worker(object):
logging.debug('{!r} to {}:{}'.format(data, *self.handler.src_addr))
try:
self.handler.write_message(data)
self.handler.write_message(data, binary=True)
except tornado.websocket.WebSocketClosedError:
self.close(reason='websocket closed')