You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by an...@apache.org on 2019/11/07 16:12:36 UTC
[incubator-dlab] branch DLAB-1212 created (now cd237dc)
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a change to branch DLAB-1212
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
at cd237dc [DLAB-1212]: connect new tunnel after unauthorize response
This branch includes the following new commits:
new 5a5b8ec [DLAB-1212]: cleanup scale modifications
new cd237dc [DLAB-1212]: connect new tunnel after unauthorize response
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/02: [DLAB-1212]: cleanup scale modifications
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1212
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 5a5b8ec6fbb48749b4251a0a36c2c062177bfb1e
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Thu Nov 7 18:06:23 2019 +0200
[DLAB-1212]: cleanup scale modifications
---
.../resources/webapp/src/app/webterminal/webterminal.component.scss | 2 --
1 file changed, 2 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/webterminal/webterminal.component.scss b/services/self-service/src/main/resources/webapp/src/app/webterminal/webterminal.component.scss
index 3ced756..b4f8188 100644
--- a/services/self-service/src/main/resources/webapp/src/app/webterminal/webterminal.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/webterminal/webterminal.component.scss
@@ -37,6 +37,4 @@
height: 100%;
flex-direction: column;
align-items: center;
- zoom: .85 !important;
- // -moz-transform: scale(.85);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 02/02: [DLAB-1212]: connect new tunnel after
unauthorize response
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1212
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit cd237dcec323e218441add92aa76ef81bf616a77
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Thu Nov 7 18:12:23 2019 +0200
[DLAB-1212]: connect new tunnel after unauthorize response
---
.../src/app/webterminal/webterminal.component.ts | 85 +++++++++++++++-------
1 file changed, 58 insertions(+), 27 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/webterminal/webterminal.component.ts b/services/self-service/src/main/resources/webapp/src/app/webterminal/webterminal.component.ts
index dd05db0..3622132 100644
--- a/services/self-service/src/main/resources/webapp/src/app/webterminal/webterminal.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/webterminal/webterminal.component.ts
@@ -27,7 +27,7 @@ import { environment } from '../../environments/environment';
// we can now access environment.apiUrl
const API_URL = environment.apiUrl;
-import { StorageService } from '../core/services';
+import { StorageService, HealthStatusService } from '../core/services';
import { FileUtils } from '../core/util';
@Component({
@@ -40,7 +40,11 @@ export class WebterminalComponent implements OnInit {
public id: string;
public endpoint: string;
public state: string = '';
- public layer;
+ public status: any;
+ public guacamole: any;
+ public tunnel: any;
+
+
@ViewChild('terminal', { read: ElementRef, static: false }) terminal: ElementRef;
@ViewChild('clip', { static: true }) clip;
@@ -48,47 +52,74 @@ export class WebterminalComponent implements OnInit {
constructor(
private route: ActivatedRoute,
private storageService: StorageService,
+ private healthStatusService: HealthStatusService,
@Inject(DOCUMENT) private document) {
}
ngOnInit() {
this.id = this.route.snapshot.paramMap.get('id');
this.endpoint = this.route.snapshot.paramMap.get('endpoint');
- this.open(this.id, this.endpoint);
+ this.openTerminal();
}
- public open(id_parameter: string, endpoint_parameter: string) {
- // added to simplify development process
- const url = environment.production ? window.location.origin : API_URL;
- const tunnel = new Guacamole.HTTPTunnel(
- `${url}/api/tunnel`, false,
- { 'Authorization': `Bearer ${this.storageService.getToken()}` }
- );
+ public openTerminal() {
- const guac = new Guacamole.Client(tunnel);
- const display = document.getElementById('display');
+ this.guacamoleTunnel();
+ this.guacamoleConnect();
- display.appendChild(guac.getDisplay().getElement());
- this.layer = guac.getDisplay().getDefaultLayer();
+ this.tunnel.onerror = (error) => {
+ if (error.message = 'Unauthorized') {
+ this.getStatus();
+ }
+ };
- guac.connect(`{"host" : "${id_parameter}", "endpoint" : "${endpoint_parameter}"}`);
+ this.guacamole.onstatechange = (state) => {
+ console.log(state);
- // Error handler
- guac.onerror = (error) => console.log(error.message);
- window.onunload = () => guac.disconnect();
+ const TUNNEL_STATE_MAP = {
+ STATE_IDLE: 0,
+ STATE_CONNECTING: 1,
+ STATE_WAITING: 2,
+ STATE_CONNECTED: 3,
+ STATE_DISCONNECTING: 4,
+ STATE_DISCONNECTED: 5
+ }
+ };
+
+ window.onunload = () => this.guacamole.disconnect();
- // Mouse
- const mouse = new Guacamole.Mouse(guac.getDisplay().getElement());
+ const mouse = new Guacamole.Mouse(this.guacamole.getDisplay().getElement());
mouse.onmousemove = (mouseState) => {
- if (navigator.userAgent.indexOf('Firefox') === -1) {
- mouseState.x = mouseState.x + 125;
- mouseState.y = mouseState.y + 65;
- }
- guac.sendMouseState(mouseState);
+ this.guacamole.sendMouseState(mouseState);
+ console.log(this.tunnel.state);
}
const keyboard = new Guacamole.Keyboard(document);
- keyboard.onkeydown = (keysym) => guac.sendKeyEvent(1, keysym);
- keyboard.onkeyup = (keysym) => guac.sendKeyEvent(0, keysym);
+ keyboard.onkeydown = (keysym) => this.guacamole.sendKeyEvent(1, keysym);
+ keyboard.onkeyup = (keysym) => this.guacamole.sendKeyEvent(0, keysym);
+ }
+
+ private guacamoleConnect() {
+ this.guacamole.connect(`{"host" : "${this.id}", "endpoint" : "${this.endpoint}"}`);
+ }
+
+ private guacamoleTunnel() {
+ const url = environment.production ? window.location.origin : API_URL;
+ this.tunnel = new Guacamole.HTTPTunnel(`${url}/api/tunnel`, true, { 'Authorization': `Bearer ${this.storageService.getToken()}` });
+ this.guacamole = new Guacamole.Client(this.tunnel);
+
+ const display = document.getElementById('display');
+ display.appendChild(this.guacamole.getDisplay().getElement());
+ }
+
+ private getStatus() {
+ this.healthStatusService.getEnvironmentHealthStatus().subscribe(
+ result => {
+ this.status = result || null;
+
+ this.guacamoleTunnel();
+ this.guacamoleConnect();
+ },
+ error => console.log('Status loading failed!'));
}
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org