lovely-projects/mautrix-signal
lovely-projects/mautrix-signal
1
0
Fork 0
mirror of https://github.com/mautrix/signal.git synced 2025-03-14 14:15:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

connector: connect unauthed websocket in background mode

Browse source
This commit is contained in:
Tulir Asokan 2025-02-12 18:43:57 +02:00
parent 5c7cd643fa
commit 3d5f873cfc
2 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/connector/client.go
View file

@ -221,7 +221,7 @@ func (s *SignalClient) Connect(ctx context.Context) {
func (s *SignalClient) ConnectBackground(ctx context.Context, _ *bridgev2.ConnectBackgroundParams) error {
s.queueEmptyWaiter.Clear()
ch, err := s.Client.StartAuthedWS(ctx)
ch, _, err := s.Client.StartWebsockets(ctx)
if err != nil {
return err
}

45
pkg/signalmeow/receiving.go
View file

@ -68,34 +68,43 @@ type SignalConnectionStatus struct {
Err error
}
func (cli *Client) StartAuthedWS(ctx context.Context) (chan web.SignalWebsocketConnectionStatus, error) {
ctx, cancel := context.WithCancel(ctx)
cli.WSCancel = cancel
authChan, err := cli.connectAuthedWS(ctx, cli.incomingRequestHandler)
func (cli *Client) StartWebsockets(ctx context.Context) (authChan, unauthChan chan web.SignalWebsocketConnectionStatus, err error) {
authChan, unauthChan, _, _, err = cli.startWebsocketsInternal(ctx)
return
}
func (cli *Client) startWebsocketsInternal(
ctx context.Context,
) (
authChan, unauthChan chan web.SignalWebsocketConnectionStatus,
cancelCtx context.Context,
cancelFunc context.CancelFunc,
err error,
) {
cancelCtx, cancelFunc = context.WithCancel(ctx)
cli.WSCancel = cancelFunc
unauthChan, err = cli.connectUnauthedWS(cancelCtx)
if err != nil {
cancel()
return nil, err
cancelFunc()
return
}
zerolog.Ctx(ctx).Info().Msg("Unauthed websocket connecting")
authChan, err = cli.connectAuthedWS(cancelCtx, cli.incomingRequestHandler)
if err != nil {
cancelFunc()
return
}
zerolog.Ctx(ctx).Info().Msg("Authed websocket connecting")
return authChan, nil
return
}
func (cli *Client) StartReceiveLoops(ctx context.Context) (chan SignalConnectionStatus, error) {
log := zerolog.Ctx(ctx).With().Str("action", "start receive loops").Logger()
ctx, cancel := context.WithCancel(log.WithContext(ctx))
cli.WSCancel = cancel
authChan, err := cli.connectAuthedWS(ctx, cli.incomingRequestHandler)
ctx = log.WithContext(ctx)
authChan, unauthChan, ctx, cancel, err := cli.startWebsocketsInternal(log.WithContext(ctx))
if err != nil {
cancel()
return nil, err
}
log.Info().Msg("Authed websocket connecting")
unauthChan, err := cli.connectUnauthedWS(ctx)
if err != nil {
cancel()
return nil, err
}
log.Info().Msg("Unauthed websocket connecting")
statusChan := make(chan SignalConnectionStatus, 10000)
initialConnectChan := make(chan struct{})