jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Use new exec API

Browse Source
This commit is contained in:
Girish Ramakrishnan
2022-05-16 11:37:35 -07:00
parent 64ea742a62
commit 6b70aaf123
2 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/js/terminal.js
+24 -18
View File
@@ -146,24 +146,30 @@ angular.module('Application').controller('TerminalController', ['$scope', '$tran
});
};
function createTerminalSocket() {
try {
// websocket cannot use relative urls
var cmd = JSON.stringify([ '/bin/bash' ]);
var url = Client.apiOrigin.replace('https', 'wss') + '/api/v1/apps/' + $scope.selected.value + '/execws?tty=true&rows=' + $scope.terminal.rows + '&columns=' + $scope.terminal.cols + '&access_token=' + Client.getToken() + '&cmd=' + cmd;
$scope.terminalSocket = new WebSocket(url);
$scope.terminal.loadAddon(new AttachAddon.AttachAddon($scope.terminalSocket));
function createTerminalSocket(callback) {
var appId = $scope.selected.value;
$scope.terminalSocket.onclose = function () {
// retry in one second
$scope.terminalReconnectTimeout = setTimeout(function () {
showTerminal(true);
}, 1000);
};
Client.createExec(appId, { cmd: [ '/bin/bash' ], tty: true }, function (error, execId) {
if (error) return callback(error);
} catch (e) {
console.error(e);
}
try {
// websocket cannot use relative urls
var url = Client.apiOrigin.replace('https', 'wss') + '/api/v1/apps/' + appId + '/exec/' + execId + '/startws?tty=true&rows=' + $scope.terminal.rows + '&columns=' + $scope.terminal.cols + '&access_token=' + Client.getToken();
$scope.terminalSocket = new WebSocket(url);
$scope.terminal.loadAddon(new AttachAddon.AttachAddon($scope.terminalSocket));
$scope.terminalSocket.onclose = function () {
// retry in one second
$scope.terminalReconnectTimeout = setTimeout(function () {
showTerminal(true);
}, 1000);
};
callback();
} catch (e) {
callback(e);
}
});
}
function refreshApp(id, callback) {
@@ -220,7 +226,7 @@ angular.module('Application').controller('TerminalController', ['$scope', '$tran
$scope.fitAddon.fit();
// create exec container after we fit() since we cannot resize exec container post-creation
createTerminalSocket();
createTerminalSocket(function (error) { if (error) console.error(error); });
$scope.terminal.focus();
}, 1000);
@@ -364,7 +370,7 @@ angular.module('Application').controller('TerminalController', ['$scope', '$tran
// setup all the dialog focus handling
['downloadFileModal'].forEach(function (id) {
$('#' + id).on('shown.bs.modal', function () {
$(this).find("[autofocus]:first").focus();
$(this).find('[autofocus]:first').focus();
});
});
}]);