fix: fetch history when back online (#4651)

protocol/messenger.go

@@ -928,25 +928,29 @@ func (m *Messenger) cleanTopics() error {
 
 // handle connection change is called each time we go from offline/online or viceversa
 func (m *Messenger) handleConnectionChange(online bool) {
-	if online {
+	// Update pushNotificationClient
-		if m.pushNotificationClient != nil {
+	if m.pushNotificationClient != nil {
+		if online {
 			m.pushNotificationClient.Online()
-		}
+		} else {
-
-		if m.shouldPublishContactCode {
-			if err := m.publishContactCode(); err != nil {
-				m.logger.Error("could not publish on contact code", zap.Error(err))
-				return
-			}
-			m.shouldPublishContactCode = false
-		}
-	} else {
-		if m.pushNotificationClient != nil {
 			m.pushNotificationClient.Offline()
 		}
-
 	}
 
+	// Publish contact code
+	if online && m.shouldPublishContactCode {
+		if err := m.publishContactCode(); err != nil {
+			m.logger.Error("could not publish on contact code", zap.Error(err))
+		}
+		m.shouldPublishContactCode = false
+	}
+
+	// Start fetching messages from store nodes
+	if online {
+		m.asyncRequestAllHistoricMessages()
+	}
+
+	// Update ENS verifier
 	m.ensVerifier.SetOnline(online)
 }
 

protocol/messenger_mailserver.go

@@ -309,7 +309,9 @@ func (m *Messenger) resetFiltersPriority(filters []*transport.Filter) {
 }
 
 func (m *Messenger) RequestAllHistoricMessagesWithRetries(forceFetchingBackup bool) (*MessengerResponse, error) {
-	return m.performMailserverRequest(func() (*MessengerResponse, error) { return m.RequestAllHistoricMessages(forceFetchingBackup) })
+	return m.performMailserverRequest(func() (*MessengerResponse, error) {
+		return m.RequestAllHistoricMessages(forceFetchingBackup)
+	})
 }
 
 // RequestAllHistoricMessages requests all the historic messages for any topic

protocol/messenger_mailserver_cycle.go

@@ -425,12 +425,7 @@ func (m *Messenger) connectToMailserver(ms mailservers.Mailserver) error {
 			signal.SendMailserverAvailable(m.mailserverCycle.activeMailserver.Address, m.mailserverCycle.activeMailserver.ID)
 
 			// Query mailserver
-			go func() {
+			m.asyncRequestAllHistoricMessages()
-				_, err := m.performMailserverRequest(func() (*MessengerResponse, error) { return m.RequestAllHistoricMessages(false) })
-				if err != nil {
-					m.logger.Error("could not perform mailserver request", zap.Error(err))
-				}
-			}()
 		}
 	}
 	return nil
@@ -557,12 +552,7 @@ func (m *Messenger) handleMailserverCycleEvent(connectedPeers []ConnectedPeer) e
 					signal.SendMailserverAvailable(m.mailserverCycle.activeMailserver.Address, m.mailserverCycle.activeMailserver.ID)
 				}
 				// Query mailserver
-				go func() {
+				m.asyncRequestAllHistoricMessages()
-					_, err := m.RequestAllHistoricMessagesWithRetries(false)
-					if err != nil {
-						m.logger.Error("failed to request historic messages", zap.Error(err))
-					}
-				}()
 			} else {
 				m.mailPeersMutex.Unlock()
 			}
@@ -603,6 +593,16 @@ func (m *Messenger) handleMailserverCycleEvent(connectedPeers []ConnectedPeer) e
 	return nil
 }
 
+func (m *Messenger) asyncRequestAllHistoricMessages() {
+	m.logger.Debug("asyncRequestAllHistoricMessages")
+	go func() {
+		_, err := m.RequestAllHistoricMessagesWithRetries(false)
+		if err != nil {
+			m.logger.Error("failed to request historic messages", zap.Error(err))
+		}
+	}()
+}
+
 func (m *Messenger) updateWakuV1PeerStatus() {
 	ticker := time.NewTicker(1 * time.Second)
 	defer ticker.Stop()

wakuv2/waku.go

@@ -1232,7 +1232,9 @@ func (w *Waku) Start() error {
 			case c := <-w.connStatusChan:
 				w.connStatusMu.Lock()
 				latestConnStatus := formatConnStatus(w.node, c)
-				w.logger.Debug("PeerStats", zap.Any("stats", latestConnStatus))
+				w.logger.Debug("peer stats",
+					zap.Int("peersCount", len(latestConnStatus.Peers)),
+					zap.Any("stats", latestConnStatus))
 				for k, subs := range w.connStatusSubscriptions {
 					if subs.Active() {
 						subs.C <- latestConnStatus
@@ -1372,6 +1374,7 @@ func (w *Waku) OnNewEnvelopes(envelope *protocol.Envelope, msgType common.Messag
 	}
 
 	logger := w.logger.With(
+		zap.Any("messageType", msgType),
 		zap.String("envelopeHash", hexutil.Encode(envelope.Hash())),
 		zap.String("contentTopic", envelope.Message().ContentTopic),
 		zap.Int64("timestamp", envelope.Message().GetTimestamp()),