First try on using standard websocket and removing socket.io from the
middle
This commit is contained in:
@@ -179,7 +179,53 @@
|
||||
$scope.idxByHostname[instance.hostname] = instance;
|
||||
}
|
||||
|
||||
var socket = io({ path: '/sessions/' + sessionId + '/ws' });
|
||||
var base = '';
|
||||
if (window.location.protocol == 'http:') {
|
||||
base = 'ws://';
|
||||
} else {
|
||||
base = 'wss://';
|
||||
}
|
||||
base += window.location.host;
|
||||
if (window.location.port) {
|
||||
base += ':' + window.location.port;
|
||||
}
|
||||
|
||||
var socket = new WebSocket(base + '/sessions/' + sessionId + '/ws/');
|
||||
socket.listeners = {};
|
||||
|
||||
socket.on = function(name, cb) {
|
||||
if (!socket.listeners[name]) {
|
||||
socket.listeners[name] = [];
|
||||
}
|
||||
socket.listeners[name].push(cb);
|
||||
}
|
||||
|
||||
socket.emit = function() {
|
||||
var name = arguments[0]
|
||||
var args = [];
|
||||
for (var i = 1; i < arguments.length; i++) {
|
||||
args.push(arguments[i]);
|
||||
}
|
||||
socket.send(JSON.stringify({name: name, args: args}));
|
||||
}
|
||||
|
||||
socket.addEventListener('open', function (event) {
|
||||
console.log('open', event);
|
||||
});
|
||||
socket.addEventListener('close', function (event) {
|
||||
console.log('close', event);
|
||||
});
|
||||
socket.addEventListener('message', function (event) {
|
||||
var m = JSON.parse(event.data);
|
||||
var ls = socket.listeners[m.name];
|
||||
if (ls) {
|
||||
for (var i=0; i<ls.length; i++) {
|
||||
var l = ls[i];
|
||||
l.apply(l, m.args);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
socket.on('instance terminal status', function(name, status) {
|
||||
var instance = $scope.idx[name];
|
||||
|
||||
@@ -294,7 +294,6 @@
|
||||
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/danialfarid-angular-file-upload/12.2.13/ng-file-upload-all.min.js" integrity="sha256-LrZq3efIkFX0BooX7x/rjWyYDvMKfFV2HJpy6HBw7cE=" crossorigin="anonymous"></script>
|
||||
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/1.7.3/socket.io.js"></script>
|
||||
<script src="/assets/app.js"></script>
|
||||
<script src="/assets/xterm.js"></script>
|
||||
<script src="/assets/xterm-addons/fit.js"></script>
|
||||
|
||||
Reference in New Issue
Block a user