refactor(webapp): update calls to onSessionEvent

Update calls to onSessionEvent from @devolutions/iron-remote-desktop, as
the interface changed after RxJS was removed from latter's dependencies.

Author: AlexYusiuk

webapp/package-lock.json

@@ -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.2.0",
+    "@devolutions/iron-remote-desktop": "file:~/Projects/ironrdp/web-client/iron-remote-desktop/dist",
     "@devolutions/iron-remote-desktop-rdp": "^0.1.1",
     "@devolutions/iron-remote-desktop-vnc": "^0.2.1",
     "@devolutions/web-ssh-gui": "0.3.1",

webapp/package.json

@@ -358,20 +358,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 {
@@ -409,10 +408,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();

webapp/src/client/app/modules/web-client/ard/web-client-ard.component.ts

@@ -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 {
@@ -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();

webapp/src/client/app/modules/web-client/rdp/web-client-rdp.component.ts

@@ -433,20 +433,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 {
@@ -484,10 +483,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();