Skip to content

refactor(webapp): update calls to onSessionEvent #1375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Benoît Cortier (CBenoit) merged 2 commits into from
Jun 11, 2025
Merged

refactor(webapp): update calls to onSessionEvent #1375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ada413f
refactor(webapp): update calls to onSessionEvent
AlexYusiuk Jun 10, 2025
4df03b2
chore(webapp): bump iron-remote-desktop version to 0.5.0
AlexYusiuk Jun 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 7 additions & 49 deletions webapp/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion webapp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"@angular/platform-browser-dynamic": "18.2.1",
"@angular/router": "18.2.1",
"@devolutions/icons": "4.0.8",
"@devolutions/iron-remote-desktop": "^0.4.0",
"@devolutions/iron-remote-desktop": "^0.5.0",
"@devolutions/iron-remote-desktop-rdp": "^0.2.0",
"@devolutions/iron-remote-desktop-vnc": "^0.3.0",
"@devolutions/web-ssh-gui": "0.3.1",
Expand Down
31 changes: 13 additions & 18 deletions webapp/src/client/app/modules/web-client/ard/web-client-ard.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,20 +372,19 @@ export class WebClientArdComponent extends WebClientBaseComponent implements OnI
}

private initSessionEventHandler(): void {
this.remoteClient.onSessionEvent({
next: (event: SessionEvent): void => {
switch (event.type) {
case SessionEventType.STARTED:
this.handleSessionStarted(event);
break;
case SessionEventType.TERMINATED:
case SessionEventType.ERROR:
this.handleSessionEndedOrError(event);
break;
}
},
error: (err) => this.handleSubscriptionError(err),
});
const handler = (event: SessionEvent): void => {
switch (event.type) {
case SessionEventType.STARTED:
this.handleSessionStarted(event);
break;
case SessionEventType.TERMINATED:
case SessionEventType.ERROR:
this.handleSessionEndedOrError(event);
break;
}
};

this.remoteClient.onSessionEvent(handler);
}

private handleSessionStarted(event: SessionEvent): void {
Expand Down Expand Up @@ -423,10 +422,6 @@ export class WebClientArdComponent extends WebClientBaseComponent implements OnI
void this.webSessionService.updateWebSessionIcon(this.webSessionId, icon);
}

private handleSubscriptionError(error): void {
console.error('Error in session event subscription', error);
}

private handleIronRDPError(error: IronError | string): void {
this.notifyUserAboutError(error);
this.disableComponentStatus();
Expand Down
31 changes: 13 additions & 18 deletions webapp/src/client/app/modules/web-client/rdp/web-client-rdp.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,20 +420,19 @@ export class WebClientRdpComponent extends WebClientBaseComponent implements OnI
}

private initSessionEventHandler(): void {
this.remoteClient.onSessionEvent({
next: (event: SessionEvent): void => {
switch (event.type) {
case SessionEventType.STARTED:
this.handleSessionStarted(event);
break;
case SessionEventType.TERMINATED:
case SessionEventType.ERROR:
this.handleSessionEndedOrError(event);
break;
}
},
error: (err) => this.handleSubscriptionError(err),
});
const handler = (event: SessionEvent): void => {
switch (event.type) {
case SessionEventType.STARTED:
this.handleSessionStarted(event);
break;
case SessionEventType.TERMINATED:
case SessionEventType.ERROR:
this.handleSessionEndedOrError(event);
break;
}
};

this.remoteClient.onSessionEvent(handler);
}

private handleSessionStarted(event: SessionEvent): void {
Expand Down Expand Up @@ -471,10 +470,6 @@ export class WebClientRdpComponent extends WebClientBaseComponent implements OnI
void this.webSessionService.updateWebSessionIcon(this.webSessionId, icon);
}

private handleSubscriptionError(error): void {
console.error('Error in session event subscription', error);
}

private handleIronRDPError(error: IronError | string): void {
this.notifyUserAboutError(error);
this.disableComponentStatus();
Expand Down
31 changes: 13 additions & 18 deletions webapp/src/client/app/modules/web-client/vnc/web-client-vnc.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,20 +437,19 @@ export class WebClientVncComponent extends WebClientBaseComponent implements OnI
}

private initSessionEventHandler(): void {
this.remoteClient.onSessionEvent({
next: (event: SessionEvent): void => {
switch (event.type) {
case SessionEventType.STARTED:
this.handleSessionStarted(event);
break;
case SessionEventType.TERMINATED:
case SessionEventType.ERROR:
this.handleSessionEndedOrError(event);
break;
}
},
error: (err) => this.handleSubscriptionError(err),
});
const handler = (event: SessionEvent): void => {
switch (event.type) {
case SessionEventType.STARTED:
this.handleSessionStarted(event);
break;
case SessionEventType.TERMINATED:
case SessionEventType.ERROR:
this.handleSessionEndedOrError(event);
break;
}
};

this.remoteClient.onSessionEvent(handler);
}

private handleSessionStarted(event: SessionEvent): void {
Expand Down Expand Up @@ -488,10 +487,6 @@ export class WebClientVncComponent extends WebClientBaseComponent implements OnI
void this.webSessionService.updateWebSessionIcon(this.webSessionId, icon);
}

private handleSubscriptionError(error): void {
console.error('Error in session event subscription', error);
}

private handleIronRDPError(error: IronError | string): void {
this.notifyUserAboutError(error);
this.disableComponentStatus();
Expand Down