iartamonov/mautrix-telegram
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

client: don't drop errors from client.Run()

Browse Source
This commit is contained in:
Tulir Asokan
2025-12-11 15:01:12 +02:00
parent d03260c4a7
commit 43b230148b
3 changed files with 42 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/connector/client.go
+25 -25
View File
@@ -81,7 +81,7 @@ type TelegramClient struct {
updatesManager *updates.Manager
clientCtx context.Context
clientCancel context.CancelFunc
clientDone *Future[error]
clientDone *exsync.Event
clientInitialized *exsync.Event
mu sync.Mutex
@@ -166,6 +166,7 @@ func NewTelegramClient(ctx context.Context, tc *TelegramConnector, login *bridge
prevReactionPoll: map[networkid.PortalKey]time.Time{},
clientInitialized: exsync.NewEvent(),
clientDone: exsync.NewEvent(),
}
if !login.Metadata.(*UserLoginMetadata).Session.HasAuthKey() {
@@ -411,6 +412,9 @@ func (t *TelegramClient) sendBadCredentialsOrUnknownError(err error) {
StateEvent: status.StateUnknownError,
Error: "tg-unknown-error",
Message: humanise.Error(err),
Info: map[string]any{
"go_error": err.Error(),
},
})
}
}
@@ -508,15 +512,11 @@ func (t *TelegramClient) onAuthError(err error) {
}()
}
func (t *TelegramClient) Connect(_ context.Context) {
func (t *TelegramClient) Connect(ctx context.Context) {
t.mu.Lock()
defer t.mu.Unlock()
ctx := context.Background()
log := zerolog.Ctx(context.Background()).With().Int64("user_id", t.telegramUserID).Logger()
ctx = log.WithContext(ctx)
log := zerolog.Ctx(ctx)
if !t.metadata.Session.HasAuthKey() {
log.Warn().Msg("user does not have an auth key, sending bad credentials state")
t.sendBadCredentialsOrUnknownError(ErrNoAuthKey)
@@ -532,39 +532,38 @@ func (t *TelegramClient) Connect(_ context.Context) {
ctx, cancel := context.WithCancel(ctx)
t.clientCtx = ctx
t.clientCancel = cancel
t.clientDone = NewFuture[error]()
t.clientDone.Clear()
t.clientInitialized.Clear()
go t.runInBackground(ctx)
}
runTelegramClient(ctx, t.client, t.clientInitialized, t.clientDone, func(ctx context.Context) error {
func (t *TelegramClient) runInBackground(ctx context.Context) {
log := zerolog.Ctx(ctx)
err := t.client.Run(ctx, func(ctx context.Context) error {
t.clientInitialized.Set()
log.Info().Msg("Client running starting updates")
return t.updatesManager.Run(ctx, t.client.API(), t.telegramUserID, updates.AuthOptions{
IsBot: t.metadata.IsBot,
})
})
}
func runTelegramClient(ctx context.Context, client *telegram.Client, initialized *exsync.Event, done *Future[error], callback func(ctx context.Context) error) {
go func() {
err := client.Run(ctx, func(ctx context.Context) error {
initialized.Set()
return callback(ctx)
})
initialized.Set()
done.Set(err)
}()
t.clientDone.Set()
t.clientInitialized.Set()
if err != nil {
log.Err(err).Msg("Client exited with error")
t.sendBadCredentialsOrUnknownError(err)
}
}
func (t *TelegramClient) Disconnect() {
t.mu.Lock()
defer t.mu.Unlock()
t.userLogin.Log.Info().Msg("Disconnecting client")
t.userLogin.Log.Debug().Msg("Disconnecting client")
if t.clientCancel != nil {
t.clientCancel()
t.userLogin.Log.Info().Msg("Waiting for client")
err, _ := t.clientDone.Get(context.Background())
t.userLogin.Log.Info().Err(err).Msg("Client done")
t.userLogin.Log.Debug().Msg("Waiting for client disconnection")
<-t.clientDone.GetChan()
}
t.userLogin.Log.Info().Msg("Disconnect complete")
@@ -614,7 +613,8 @@ func (t *TelegramClient) getSingleChannel(ctx context.Context, id int64) (*tg.Ch
func (t *TelegramClient) IsLoggedIn() bool {
// TODO use less hacky check than context cancellation
return t != nil && t.clientCtx != nil && t.client != nil && t.clientCtx.Err() == nil &&
return t != nil && t.client != nil &&
t.clientInitialized.IsSet() && !t.clientDone.IsSet() &&
t.metadata.Session.HasAuthKey()
}