aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

close previous testConnect attempts (#4598)

Browse source 
* close previous testConnect attempts

* remove onerror handler when canceling previous attempt

Co-authored-by: Jeremy Letto <jeremy.letto@datasite.com>
This commit is contained in:
Jeremy Letto 2022-03-22 17:42:58 -05:00 committed by GitHub
parent 4899b6cfef
commit 6d200d17b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
webclient/src/websocket/services/WebSocketService.ts
View file

@ -8,6 +8,8 @@ import { SessionPersistence } from '../persistence';
export class WebSocketService { export class WebSocketService {
private socket: WebSocket; private socket: WebSocket;
private testSocket: WebSocket;
private webClient: WebClient; private webClient: WebClient;
private keepAliveService: KeepAliveService; private keepAliveService: KeepAliveService;
@ -104,6 +106,11 @@ export class WebSocketService {
} }
private testWebSocket(url: string): void { private testWebSocket(url: string): void {
if (this.testSocket) {
this.testSocket.onerror = null;
this.testSocket.close();
}
const socket = new WebSocket(url); const socket = new WebSocket(url);
socket.binaryType = 'arraybuffer'; socket.binaryType = 'arraybuffer';
@ -118,5 +125,11 @@ export class WebSocketService {
socket.onerror = () => { socket.onerror = () => {
SessionPersistence.testConnectionFailed(); SessionPersistence.testConnectionFailed();
}; };
socket.onclose = () => {
this.testSocket = null;
}
this.testSocket = socket;
} }
} }