github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(webterminal): change it to HTML5 websocket

pull/123/head
liuzheng712 2016-03-04 20:07:05 +08:00
parent f73d34b9cc
commit 234f79857c
1 changed files with 86 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

142
static/js/webterminal.js
View File

@ -1,12 +1,60 @@
/** /**
* Created by liuzheng on 3/3/16. * Created by liuzheng on 3/3/16.
*/ */
var rowHeight = 1; //var rowHeight = 1;
var colWidth = 1; //var colWidth = 1;
function WSSHClient() { //function WSSHClient() {
} //}
WSSHClient.prototype._generateEndpoint = function (options) { //WSSHClient.prototype._generateEndpoint = function (options) {
console.log(options); // console.log(options);
// if (window.location.protocol == 'https:') {
// var protocol = 'wss://';
// } else {
// var protocol = 'ws://';
// }
//
// var endpoint = protocol + document.URL.match(RegExp('//(.*?)/'))[1] + '/ws/terminal' + document.URL.match(/(\?.*)/);
// return endpoint;
//};
//WSSHClient.prototype.connect = function (options) {
// var endpoint = this._generateEndpoint(options);
//
// if (window.WebSocket) {
// this._connection = new WebSocket(endpoint);
// }
// else if (window.MozWebSocket) {
// this._connection = MozWebSocket(endpoint);
// }
// else {
// options.onError('WebSocket Not Supported');
// return;
// }
//
// this._connection.onopen = function () {
// options.onConnect();
// };
//
// this._connection.onmessage = function (evt) {
// var data = JSON.parse(evt.data.toString());
// if (data.error !== undefined) {
// options.onError(data.error);
// }
// else {
// options.onData(data.data);
// }
// };
//
// this._connection.onclose = function (evt) {
// options.onClose();
// };
//};
//
//WSSHClient.prototype.send = function (data) {
// this._connection.send(JSON.stringify({'data': data}));
//};
function openTerminal(options) {
if (window.location.protocol == 'https:') { if (window.location.protocol == 'https:') {
var protocol = 'wss://'; var protocol = 'wss://';
} else { } else {
@ -14,47 +62,8 @@ WSSHClient.prototype._generateEndpoint = function (options) {
} }
var endpoint = protocol + document.URL.match(RegExp('//(.*?)/'))[1] + '/ws/terminal' + document.URL.match(/(\?.*)/); var endpoint = protocol + document.URL.match(RegExp('//(.*?)/'))[1] + '/ws/terminal' + document.URL.match(/(\?.*)/);
return endpoint; var sock = new WebSocket(endpoint);
}; //var client = new WSSHClient();
WSSHClient.prototype.connect = function (options) {
var endpoint = this._generateEndpoint(options);
if (window.WebSocket) {
this._connection = new WebSocket(endpoint);
}
else if (window.MozWebSocket) {
this._connection = MozWebSocket(endpoint);
}
else {
options.onError('WebSocket Not Supported');
return;
}
this._connection.onopen = function () {
options.onConnect();
};
this._connection.onmessage = function (evt) {
var data = JSON.parse(evt.data.toString());
if (data.error !== undefined) {
options.onError(data.error);
}
else {
options.onData(data.data);
}
};
this._connection.onclose = function (evt) {
options.onClose();
};
};
WSSHClient.prototype.send = function (data) {
this._connection.send(JSON.stringify({'data': data}));
};
function openTerminal(options) {
var client = new WSSHClient();
var term = new Terminal({ var term = new Terminal({
rows: rowHeight, rows: rowHeight,
cols: colWidth, cols: colWidth,
@ -63,29 +72,42 @@ function openTerminal(options) {
}); });
term.open(); term.open();
term.on('data', function (data) { term.on('data', function (data) {
client.send(data) sock.send(data)
}); });
$('.terminal').detach().appendTo('#term'); $('.terminal').detach().appendTo('#term');
term.resize(80, 24); term.resize(80, 24);
term.write('Connecting...'); term.write('Connecting...');
client.connect($.extend(options, { sock.onopen = function () {
onError: function (error) {
term.write('Error: ' + error + '\r\n');
},
onConnect: function () {
// Erase our connecting message // Erase our connecting message
term.write('\r'); term.write('\r');
}, };
onClose: function () { sock.onclose = function () {
term.write('Connection Reset By Peer'); term.write('Connection Reset By Peer');
}, };
onData: function (data) { sock.onmessage= function (data) {
term.write(data); term.write(data);
} };
})); sock.onerror= function () {
term.write('Connection Reset By Peer');
};
//client.connect($.extend(options, {
// onError: function (error) {
// term.write('Error: ' + error + '\r\n');
// },
// onConnect: function () {
// // Erase our connecting message
// term.write('\r');
// },
// onClose: function () {
// term.write('Connection Reset By Peer');
// },
// onData: function (data) {
// term.write(data);
// }
//}));
rowHeight = 0.0 + 1.00 * $('.terminal').height() / 24; rowHeight = 0.0 + 1.00 * $('.terminal').height() / 24;
colWidth = 0.0 + 1.00 * $('.terminal').width() / 80; colWidth = 0.0 + 1.00 * $('.terminal').width() / 80;
return {'term': term, 'client': client}; return {'term': term, 'client': sock};
} }
function resize() { function resize() {