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

signalmeow: fix propagating errors when disconnected

Browse source
This commit is contained in:
Tulir Asokan 2025-02-26 16:47:51 +02:00
parent 4713ddfcd1
commit 870f0d152e
3 changed files with 14 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkg/connector/client.go
View file

@ -236,7 +236,6 @@ func (s *SignalClient) ConnectBackground(ctx context.Context, _ *bridgev2.Connec
log.Info().Msg("Authed websocket connected")
case web.SignalWebsocketConnectionEventDisconnected:
log.Err(status.Err).Msg("Authed websocket disconnected")
return fmt.Errorf("authed websocket disconnected: %w", status.Err)
case web.SignalWebsocketConnectionEventLoggedOut:
log.Err(status.Err).Msg("Authed websocket logged out")
return fmt.Errorf("authed websocket logged out: %w", status.Err)

2
pkg/signalmeow/receiving.go
View file

@ -285,7 +285,7 @@ func (cli *Client) incomingRequestHandler(ctx context.Context, req *signalpb.Web
if *req.Verb == http.MethodPut && *req.Path == "/api/v1/message" {
return cli.incomingAPIMessageHandler(ctx, req)
} else if *req.Verb == http.MethodPut && *req.Path == "/api/v1/queue/empty" {
log.Trace().Msg("Received queue empty")
log.Debug().Msg("Received queue empty notice")
cli.handleEvent(&events.QueueEmpty{})
} else {
log.Warn().Any("req", req).Msg("Unknown websocket request message")

47
pkg/signalmeow/web/signalwebsocket.go
View file

@ -195,7 +195,7 @@ func (s *SignalWebsocket) connectLoop(
log.Warn().Dur("backoff", backoff).Msg("Failed to connect, waiting to retry...")
time.Sleep(backoff)
backoff += backoffIncrement
} else if !isFirstConnect && s.basicAuth != nil {
} else if !isFirstConnect && s.basicAuth != nil && ctx.Err() == nil {
time.Sleep(initialBackoff)
}
if ctx.Err() != nil {
@ -331,42 +331,21 @@ func (s *SignalWebsocket) connectLoop(
}()
// Wait for read or write or ping loop to exit (which means there was an error)
log.Info().Msg("Waiting for read or write loop to exit")
select {
case <-loopCtx.Done():
log.Info().Msg("received loopCtx done")
if context.Cause(loopCtx) != nil {
err := context.Cause(loopCtx)
if err != nil && err != context.Canceled {
log.Err(err).Msg("loopCtx error")
errorCount++
}
log.Debug().Msg("Finished preparing connection, waiting for loop context to finish")
<-loopCtx.Done()
ctxCauseErr := context.Cause(loopCtx)
log.Debug().AnErr("ctx_cause_err", ctxCauseErr).Msg("Read or write loop exited")
if ctxCauseErr == nil || errors.Is(ctxCauseErr, context.Canceled) {
s.statusChannel <- SignalWebsocketConnectionStatus{
Event: SignalWebsocketConnectionEventCleanShutdown,
}
if context.Cause(loopCtx) != nil && context.Cause(loopCtx) == context.Canceled {
s.statusChannel <- SignalWebsocketConnectionStatus{
Event: SignalWebsocketConnectionEventCleanShutdown,
}
} else {
s.statusChannel <- SignalWebsocketConnectionStatus{
Event: SignalWebsocketConnectionEventDisconnected,
Err: err,
}
}
case <-ctx.Done():
log.Info().AnErr("ctx_err", ctx.Err()).AnErr("ctx_cause", context.Cause(ctx)).Msg("received ctx done")
if context.Cause(ctx) != nil && context.Cause(ctx) == context.Canceled {
s.statusChannel <- SignalWebsocketConnectionStatus{
Event: SignalWebsocketConnectionEventCleanShutdown,
}
return
} else {
s.statusChannel <- SignalWebsocketConnectionStatus{
Event: SignalWebsocketConnectionEventDisconnected,
Err: err,
}
} else {
errorCount++
s.statusChannel <- SignalWebsocketConnectionStatus{
Event: SignalWebsocketConnectionEventDisconnected,
Err: ctxCauseErr,
}
}
log.Info().Msg("Read or write loop exited")
// Clean up
ws.Close(websocket.StatusGoingAway, "Going away")