Update bridge info if IDS registration fails due to registration prov…

…ider error
beeper · Dec 21, 2023 · fcdf41f · fcdf41f
1 parent d1c5ef8
commit fcdf41f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/imessage/ipc/bridgeinfo.go b/imessage/ipc/bridgeinfo.go
@@ -83,6 +83,9 @@ func GetBridgeInfo() *BridgeInfo {
 		}
 	}
 	resp.NextReregisterCheck = nextReregisterCheck.UTC()
+	if global.NACNotReachable {
+		resp.RegistrationProviderError = ErrBadRegistrationCode.Message
+	}
 
 	return &resp
 }
diff --git a/imessage/ipc/events.go b/imessage/ipc/events.go
@@ -19,6 +19,7 @@ package main
 import (
 	"context"
 	"crypto/sha256"
+	"errors"
 	"fmt"
 	"regexp"
 	"slices"
@@ -36,6 +37,7 @@ import (
 	"github.com/beeper/imessage/database"
 	"github.com/beeper/imessage/imessage"
 	"github.com/beeper/imessage/imessage/direct"
+	"github.com/beeper/imessage/imessage/direct/nacserv"
 	"github.com/beeper/imessage/imessage/direct/util/uri"
 	"github.com/beeper/imessage/msgconv"
 )
@@ -846,6 +848,10 @@ func handleEvent(evt any) {
 		handleDelivered(typedEvt)
 
 	case *direct.IDSRegisterFail:
+		if errors.Is(typedEvt.Error, nacserv.ErrProviderNotReachable) {
+			global.NACNotReachable = true
+			global.IPC.Send(CmdBridgeInfo, GetBridgeInfo())
+		}
 		analytics.Track("IMGo IDS Register Failure", map[string]any{
 			"bi":    true,
 			"error": typedEvt.Error.Error(),
@@ -919,6 +925,7 @@ func handleEvent(evt any) {
 		}
 		global.IPC.Send(CmdBridgeInfo, GetBridgeInfo())
 	case *direct.IDSActuallyReregistered:
+		global.NACNotReachable = false
 		global.IPC.Send(CmdBridgeInfo, GetBridgeInfo())
 	case *direct.IDSRegisterSuccess:
 		//go updateGroupOutgoingHandles()

diff --git a/imessage/ipc/global.go b/imessage/ipc/global.go
@@ -96,6 +96,7 @@ type IMContext struct {
 
 	StartConfirmed       bool
 	InitialConfigureDone bool
+	NACNotReachable      bool
 
 	Stopping atomic.Bool
 }