Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import type { NewSessionInfo } from './NewSessionInfo';
import type { SessionEvent } from './session-event';
import { ConfigBuilder } from '../services/ConfigBuilder';
import type { Config } from '../services/Config';
import type { PartialObserver } from 'rxjs';

export interface UserInteraction {
setVisibility(state: boolean): void;
Expand All @@ -23,7 +24,7 @@ export interface UserInteraction {

setCursorStyleOverride(style: string | null): void;

onSessionEvent(callback: (event: SessionEvent) => void): void;
onSessionEvent(partialObserver: PartialObserver<SessionEvent>): void;

resize(width: number, height: number, scale?: number): void;

Expand Down
4 changes: 2 additions & 2 deletions web-client/iron-remote-desktop/src/services/PublicAPI.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ export class PublicAPI {
configBuilder: this.configBuilder.bind(this),
connect: this.connect.bind(this),
setScale: this.setScale.bind(this),
onSessionEvent: (callback) => {
this.remoteDesktopService.sessionObserver.subscribe(callback);
onSessionEvent: (partialObserver) => {
this.remoteDesktopService.sessionObserver.subscribe(partialObserver);
},
ctrlAltDel: this.ctrlAltDel.bind(this),
metaKey: this.metaKey.bind(this),
Expand Down
28 changes: 15 additions & 13 deletions web-client/iron-svelte-client/src/lib/login/login.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,22 @@
});

const initListeners = () => {
userInteraction.onSessionEvent((event) => {
if (event.type === 2) {
console.log('Error event', event.data);
userInteraction.onSessionEvent({
next: (event) => {
if (event.type === 2) {
console.log('Error event', event.data);

toast.set({
type: 'error',
message: typeof event.data !== 'string' ? event.data.backtrace() : event.data,
});
} else {
toast.set({
type: 'info',
message: typeof event.data === 'string' ? event.data : event.data?.backtrace() ?? 'No info',
});
}
toast.set({
type: 'error',
message: typeof event.data !== 'string' ? event.data.backtrace() : event.data,
});
} else {
toast.set({
type: 'info',
message: typeof event.data === 'string' ? event.data : event.data?.backtrace() ?? 'No info',
});
}
},
});
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@
userInteractionService.subscribe((val) => {
if (val != null) {
userInteraction = val;
userInteraction.onSessionEvent((event) => {
if (event.type === 0) {
userInteraction.setVisibility(true);
} else if (event.type === 1) {
setCurrentSessionActive(false);
}
userInteraction.onSessionEvent({
next: (event) => {
if (event.type === 0) {
userInteraction.setVisibility(true);
} else if (event.type === 1) {
setCurrentSessionActive(false);
}
},
});
}
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,15 @@
userInteractionService.subscribe((uis) => {
if (uis != null) {
uiService = uis;
uiService.onSessionEvent((event) => {
if (event.type === 0) {
uiService.setVisibility(true);
} else if (event.type === 1) {
setCurrentSessionActive(false);
showLogin.set(true);
}
uiService.onSessionEvent({
next: (event) => {
if (event.type === 0) {
uiService.setVisibility(true);
} else if (event.type === 1) {
setCurrentSessionActive(false);
showLogin.set(true);
}
},
});
}
});
Expand Down
Loading