From ec2a17a0e411fd2f7c4f7967cc5053e5b63548e4 Mon Sep 17 00:00:00 2001 From: trevor-signal <131492920+trevor-signal@users.noreply.github.com> Date: Thu, 18 Apr 2024 13:00:16 -0400 Subject: [PATCH] Ensure unauthenticated websocket reconnects if using LibSignal's transport --- ts/textsecure/SocketManager.ts | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/ts/textsecure/SocketManager.ts b/ts/textsecure/SocketManager.ts index 53fc12697..5cbb0abb1 100644 --- a/ts/textsecure/SocketManager.ts +++ b/ts/textsecure/SocketManager.ts @@ -592,21 +592,23 @@ export class SocketManager extends EventListener { `SocketManager: connecting unauthenticated socket, transport option [${transportOption}]` ); + let process: AbortableProcess; + if (transportOption === TransportOption.Libsignal) { - this.unauthenticated = this.connectLibsignalUnauthenticated(); - return this.unauthenticated.getResult(); + process = this.connectLibsignalUnauthenticated(); + } else { + process = this.connectResource({ + name: UNAUTHENTICATED_CHANNEL_NAME, + path: '/v1/websocket/', + proxyAgent, + resourceOptions: { + name: UNAUTHENTICATED_CHANNEL_NAME, + keepalive: { path: '/v1/keepalive' }, + transportOption, + }, + }); } - const process = this.connectResource({ - name: UNAUTHENTICATED_CHANNEL_NAME, - path: '/v1/websocket/', - proxyAgent, - resourceOptions: { - name: UNAUTHENTICATED_CHANNEL_NAME, - keepalive: { path: '/v1/keepalive' }, - transportOption, - }, - }); this.unauthenticated = process; let unauthenticated: IWebSocketResource;