mirrors/IronRDP
1
0
Fork 0
mirror of https://github.com/Devolutions/IronRDP.git synced 2025-07-07 17:45:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix(web): fix session dangling after calling run method (#820)

Browse source
This commit is contained in:
Alex Yusiuk 2025-06-16 19:35:48 +03:00 • committed by GitHub
parent 0f49ea4608
commit dfb99029a9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 15 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
web-client/iron-remote-desktop/public/package.json
View file

@ -10,7 +10,7 @@
"Alexandr Yusuk"
],
"description": "Backend-agnostic Web Component for remote desktop protocols",
"version": "0.5.0",
"version": "0.5.1",
"main": "iron-remote-desktop.js",
"types": "index.d.ts",
"files": [

38
web-client/iron-remote-desktop/src/services/remote-desktop.service.ts
View file

@ -18,17 +18,12 @@ import { ConfigBuilder } from './ConfigBuilder';
import type { Config } from './Config';
import type { Extension } from '../interfaces/Extension';
import { Observable } from '../lib/Observable';
import type { SessionTerminationInfo } from '../interfaces/SessionTerminationInfo';
type OnRemoteClipboardChanged = (data: ClipboardData) => void;
type OnRemoteReceivedFormatsList = () => void;
type OnForceClipboardUpdate = () => void;
const isIronError = (error: unknown): error is IronError =>
typeof error === 'object' &&
error !== null &&
typeof (error as IronError).backtrace === 'function' &&
typeof (error as IronError).kind === 'function';
export class RemoteDesktopService {
private module: RemoteDesktopModule;
private canvas?: HTMLCanvasElement;
@ -158,7 +153,7 @@ export class RemoteDesktopService {
throw new Error('could not connect to the session');
});
await this.run(session);
this.run(session);
loggingService.info('Session started.');
@ -180,19 +175,17 @@ export class RemoteDesktopService {
};
}
async run(session: Session): Promise<Session> {
try {
const termination_info = await session.run();
this.setVisibility(false);
this.raiseSessionEvent({
type: SessionEventType.TERMINATED,
data: 'Session was terminated: ' + termination_info.reason() + '.',
});
return session;
} catch (err) {
if (isIronError(err)) {
run(session: Session) {
session
.run()
.then((terminationInfo: SessionTerminationInfo) => {
this.setVisibility(false);
this.raiseSessionEvent({
type: SessionEventType.TERMINATED,
data: 'Session was terminated: ' + terminationInfo.reason() + '.',
});
})
.catch((err: IronError) => {
this.setVisibility(false);
this.raiseSessionEvent({
@ -203,10 +196,7 @@ export class RemoteDesktopService {
type: SessionEventType.TERMINATED,
data: 'Session was terminated.',
});
}
throw new Error('could not run the session.');
}
});
}
sendSpecialCombination(specialCombination: SpecialCombination): void {