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
19 changes: 0 additions & 19 deletions web-client/iron-remote-desktop-rdp/package-lock.json

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

1 change: 0 additions & 1 deletion web-client/iron-remote-desktop-rdp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
"vite-plugin-wasm": "^3.1.0"
},
"dependencies": {
"rxjs": "^6.6.7",
"ua-parser-js": "^1.0.33"
}
}
5 changes: 1 addition & 4 deletions web-client/iron-remote-desktop-rdp/public/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,5 @@
"files": [
"iron-remote-desktop-rdp.js",
"index.d.ts"
],
"dependencies": {
"rxjs": "^6.6.7"
}
]
}
19 changes: 0 additions & 19 deletions web-client/iron-remote-desktop/package-lock.json

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

1 change: 0 additions & 1 deletion web-client/iron-remote-desktop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
"vite-plugin-wasm": "^3.1.0"
},
"dependencies": {
"rxjs": "^6.6.7",
"svelte-eslint-parser": "^1.0.0",
"ua-parser-js": "^1.0.33"
}
Expand Down
5 changes: 1 addition & 4 deletions web-client/iron-remote-desktop/public/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,5 @@
"files": [
"iron-remote-desktop.js",
"index.d.ts"
],
"dependencies": {
"rxjs": "^6.6.7"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ 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';
import type { Extension } from './Extension';
import type { Callback } from '../lib/Observable';

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

setCursorStyleOverride(style: string | null): void;

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

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

Expand Down
6 changes: 3 additions & 3 deletions web-client/iron-remote-desktop/src/iron-remote-desktop.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@
}

function serverBridgeListeners() {
remoteDesktopService.resize.subscribe((evt: ResizeEvent) => {
remoteDesktopService.resizeObservable.subscribe((evt: ResizeEvent) => {
loggingService.info(`Resize canvas to: ${evt.desktopSize.width}x${evt.desktopSize.height}`);
canvas.width = evt.desktopSize.width;
canvas.height = evt.desktopSize.height;
Expand All @@ -469,12 +469,12 @@
scaleSession(scale);
});

remoteDesktopService.scaleObserver.subscribe((s) => {
remoteDesktopService.scaleObservable.subscribe((s) => {
loggingService.info('Change scale!');
scaleSession(s);
});

remoteDesktopService.dynamicResize.subscribe((evt) => {
remoteDesktopService.dynamicResizeObservable.subscribe((evt) => {
loggingService.info(`Dynamic resize!, width: ${evt.width}, height: ${evt.height}`);
setViewerStyle(evt.height.toString(), evt.width.toString(), true);
});
Expand Down
19 changes: 19 additions & 0 deletions web-client/iron-remote-desktop/src/lib/Observable.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
export type Callback<T> = (_: T) => void;

export class Observable<T> {
constructor() {
this.subscribers = [];
}

subscribers: Array<Callback<T>>;

subscribe(cb: Callback<T>) {
this.subscribers.push(cb);
}

publish(value: T) {
for (const cb of this.subscribers) {
cb(value);
}
}
}
8 changes: 3 additions & 5 deletions web-client/iron-remote-desktop/src/services/PublicAPI.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ export class PublicAPI {

private connect(config: Config): Promise<NewSessionInfo> {
loggingService.info('Initializing connection.');
const resultObservable = this.remoteDesktopService.connect(config);

return resultObservable.toPromise();
return this.remoteDesktopService.connect(config);
}

private ctrlAltDel() {
Expand Down Expand Up @@ -73,8 +71,8 @@ export class PublicAPI {
configBuilder: this.configBuilder.bind(this),
connect: this.connect.bind(this),
setScale: this.setScale.bind(this),
onSessionEvent: (partialObserver) => {
this.remoteDesktopService.sessionObserver.subscribe(partialObserver);
onSessionEvent: (callback) => {
this.remoteDesktopService.sessionEventObservable.subscribe(callback);
},
ctrlAltDel: this.ctrlAltDel.bind(this),
metaKey: this.metaKey.bind(this),
Expand Down
Loading
Loading