Pass proxy down to libsignal Net instance

This commit is contained in:
Alex Bakon 2025-02-18 15:36:51 -05:00 committed by GitHub
commit aa8cc4d445
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 10 deletions

View file

@ -169,7 +169,7 @@ export class SocketManager extends EventListener {
const useLibsignalTransport =
window.Signal.RemoteConfig.isEnabled(
'desktop.experimentalTransport.enableAuth'
) && this.#transportOption(proxyAgent) === TransportOption.Libsignal;
) && this.#transportOption() === TransportOption.Libsignal;
const process = useLibsignalTransport
? connectAuthenticatedLibsignal({
@ -580,14 +580,7 @@ export class SocketManager extends EventListener {
}
}
#transportOption(proxyAgent: ProxyAgent | undefined): TransportOption {
const { hostname } = URL.parse(this.options.url);
// transport experiment doesn't support proxy
if (proxyAgent || hostname == null || !hostname.endsWith('signal.org')) {
return TransportOption.Original;
}
#transportOption(): TransportOption {
// in staging, switch to using libsignal transport
if (isStaging(this.options.version)) {
return TransportOption.Libsignal;
@ -643,7 +636,7 @@ export class SocketManager extends EventListener {
log.info('SocketManager: connecting unauthenticated socket');
const transportOption = this.#transportOption(proxyAgent);
const transportOption = this.#transportOption();
log.info(
`SocketManager: connecting unauthenticated socket, transport option [${transportOption}]`
);