dependencies: update mautrix-go

Author: tulir

go.mod

@@ -22,7 +22,7 @@ require (
 	golang.org/x/net v0.31.0
 	google.golang.org/protobuf v1.35.2
 	gopkg.in/yaml.v3 v3.0.1
-	maunium.net/go/mautrix v0.22.1-0.20241120171618-4cd2bb62ff01
+	maunium.net/go/mautrix v0.22.1-0.20241202131110-166ba04aae02
 )
 
 require (

go.sum

@@ -94,5 +94,5 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 maunium.net/go/mauflag v1.0.0 h1:YiaRc0tEI3toYtJMRIfjP+jklH45uDHtT80nUamyD4M=
 maunium.net/go/mauflag v1.0.0/go.mod h1:nLivPOpTpHnpzEh8jEdSL9UqO9+/KBJFmNRlwKfkPeA=
-maunium.net/go/mautrix v0.22.1-0.20241120171618-4cd2bb62ff01 h1:8zrcggLi5IyHO9oBxjejbRyvgT0ePEwYLdFCdtohDnI=
-maunium.net/go/mautrix v0.22.1-0.20241120171618-4cd2bb62ff01/go.mod h1:oqwf9WYC/brqucM+heYk4gX11O59nP+ljvyxVhndFIM=
+maunium.net/go/mautrix v0.22.1-0.20241202131110-166ba04aae02 h1:g8L4GpOhyg5EuXtASDKyU9Cg79ZjATlUnh+giFumQgc=
+maunium.net/go/mautrix v0.22.1-0.20241202131110-166ba04aae02/go.mod h1:oqwf9WYC/brqucM+heYk4gX11O59nP+ljvyxVhndFIM=

pkg/connector/client.go

@@ -121,18 +121,22 @@ func (m *MetaClient) getProxy(reason string) (string, error) {
 	return respData.ProxyURL, nil
 }
 
-func (m *MetaClient) Connect(ctx context.Context) error {
+func (m *MetaClient) Connect(ctx context.Context) {
 	if m.Client == nil {
 		m.UserLogin.BridgeState.Send(status.BridgeState{
 			StateEvent: status.StateBadCredentials,
 			Error:      MetaNotLoggedIn,
 		})
-		return nil
+		return
 	}
 	if m.Main.Config.GetProxyFrom != "" || m.Main.Config.Proxy != "" {
 		m.Client.GetNewProxy = m.getProxy
 		if !m.Client.UpdateProxy("connect") {
-			return fmt.Errorf("failed to update proxy")
+			m.UserLogin.BridgeState.Send(status.BridgeState{
+				StateEvent: status.StateUnknownError,
+				Error:      MetaProxyUpdateFail,
+			})
+			return
 		}
 	}
 	currentUser, initialTable, err := m.Client.LoadMessagesPage()
@@ -187,18 +191,23 @@ func (m *MetaClient) Connect(ctx context.Context) error {
 				Error:      MetaConnectError,
 			})
 		}
-		return nil
+		return
 	}
-	return m.connectWithTable(ctx, initialTable, currentUser)
+	m.connectWithTable(ctx, initialTable, currentUser)
 }
 
-func (m *MetaClient) connectWithTable(ctx context.Context, initialTable *table.LSTable, currentUser types.UserInfo) error {
+func (m *MetaClient) connectWithTable(ctx context.Context, initialTable *table.LSTable, currentUser types.UserInfo) {
 	go m.handleTableLoop()
 
 	var err error
 	m.Ghost, err = m.Main.Bridge.GetGhostByID(ctx, networkid.UserID(m.UserLogin.ID))
 	if err != nil {
-		return fmt.Errorf("failed to get own ghost: %w", err)
+		zerolog.Ctx(ctx).Err(err).Msg("Failed to get own ghost")
+		m.UserLogin.BridgeState.Send(status.BridgeState{
+			StateEvent: status.StateUnknownError,
+			Error:      MetaConnectError,
+		})
+		return
 	}
 	m.UserLogin.RemoteName = currentUser.GetName()
 	m.UserLogin.RemoteProfile.Name = currentUser.GetName()
@@ -211,12 +220,15 @@ func (m *MetaClient) connectWithTable(ctx context.Context, initialTable *table.L
 
 	err = m.Client.Connect()
 	if err != nil {
-		return err
+		zerolog.Ctx(ctx).Err(err).Msg("Failed to connect")
+		m.UserLogin.BridgeState.Send(status.BridgeState{
+			StateEvent: status.StateUnknownError,
+			Error:      MetaConnectError,
+		})
+		return
 	}
 
 	go m.periodicReconnect()
-
-	return nil
 }
 
 func (m *MetaClient) periodicReconnect() {
@@ -374,10 +386,7 @@ func (m *MetaClient) FullReconnect() {
 	m.Disconnect()
 	m.Client = messagix.NewClient(m.LoginMeta.Cookies, m.UserLogin.Log.With().Str("component", "messagix").Logger())
 	m.Client.SetEventHandler(m.handleMetaEvent)
-	err := m.Connect(ctx)
-	if err != nil {
-		zerolog.Ctx(ctx).Err(err).Msg("Failed to reconnect")
-	}
+	m.Connect(ctx)
 }
 
 func (m *MetaClient) resetWADevice() {

pkg/connector/handlemeta.go

@@ -36,6 +36,7 @@ const (
 	MetaServerUnavailable      status.BridgeStateErrorCode = "meta-server-unavailable"
 	IGConsentRequired          status.BridgeStateErrorCode = "ig-consent-required"
 	FBConsentRequired          status.BridgeStateErrorCode = "fb-consent-required"
+	MetaProxyUpdateFail        status.BridgeStateErrorCode = "meta-proxy-update-fail"
 )
 
 func init() {
@@ -52,6 +53,7 @@ func init() {
 		FBConsentRequired:          "Consent required, please check the Facebook website to continue",
 		MetaServerUnavailable:      "Connection refused by server",
 		MetaConnectError:           "Unknown connection error",
+		MetaProxyUpdateFail:        "Failed to update proxy",
 	})
 }
 

pkg/connector/login.go

@@ -203,11 +203,7 @@ func (m *MetaCookieLogin) SubmitCookies(ctx context.Context, strCookies map[stri
 	metaClient.Client = client
 
 	backgroundCtx := ul.Log.WithContext(context.Background())
-	err = metaClient.connectWithTable(backgroundCtx, tbl, user)
-	if err != nil {
-		return nil, fmt.Errorf("failed to connect after login: %w", err)
-	}
-
+	go metaClient.connectWithTable(backgroundCtx, tbl, user)
 	return &bridgev2.LoginStep{
 		Type:         bridgev2.LoginStepTypeComplete,
 		StepID:       LoginStepIDComplete,