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

client: consume unauth websocket status in ConnectBackground

Browse source
This commit is contained in:
Tulir Asokan 2025-03-13 17:38:14 +02:00
parent e55601d0e0
commit 074a2a9bef
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkg/connector/client.go
View file

@ -225,7 +225,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.StartWebsockets(ctx)
ch, unauthCh, err := s.Client.StartWebsockets(ctx)
if err != nil {
return err
}
@ -251,6 +251,19 @@ func (s *SignalClient) ConnectBackground(ctx context.Context, _ *bridgev2.Connec
case web.SignalWebsocketConnectionEventCleanShutdown:
log.Info().Msg("Authed websocket clean shutdown")
}
case status := <-unauthCh:
switch status.Event {
case web.SignalWebsocketConnectionEventConnected:
log.Info().Msg("Unauthed websocket connected")
case web.SignalWebsocketConnectionEventDisconnected:
log.Err(status.Err).Msg("Unauthed websocket disconnected")
case web.SignalWebsocketConnectionEventLoggedOut:
log.Err(status.Err).Msg("Unauthed websocket logged out")
case web.SignalWebsocketConnectionEventError:
log.Err(status.Err).Msg("Unauthed websocket error")
case web.SignalWebsocketConnectionEventCleanShutdown:
log.Info().Msg("Unauthed websocket clean shutdown")
}
case <-ctx.Done():
log.Warn().Msg("Context finished before queue empty event")
if didConnect {

2
pkg/signalmeow/receiving.go
View file

@ -280,7 +280,7 @@ func (cli *Client) incomingRequestHandler(ctx context.Context, req *signalpb.Web
Str("handler", "incoming request handler").
Str("verb", *req.Verb).
Str("path", *req.Path).
Uint64("request_id", *req.Id).
Uint64("incoming_request_id", *req.Id).
Logger()
ctx = log.WithContext(ctx)
if *req.Verb == http.MethodPut && *req.Path == "/api/v1/message" {