chore: remove go-waku changes and address review comment

Author: jrainville

go.mod

@@ -24,10 +24,6 @@ replace github.com/libp2p/go-libp2p-pubsub v0.13.1 => github.com/waku-org/go-lib
 
 replace github.com/oNaiPs/go-generate-fast v0.3.0 => github.com/status-im/go-generate-fast v0.0.0-20250916164518-c78009bcfa9e
 
-// Temporary: use fork with background-mode filter subscription fix until
-// waku-org/go-waku#1304 is merged and released.
-replace github.com/waku-org/go-waku => github.com/xAlisher/go-waku v0.10.2-0.20260603060940-9f8361930df9
-
 require (
 	github.com/anacrolix/torrent v1.41.0
 	github.com/beevik/ntp v0.3.0

go.sum

@@ -2446,8 +2446,8 @@ github.com/wk8/go-ordered-map/v2 v2.1.7/go.mod h1:9Xvgm2mV2kSq2SAm0Y608tBmu8akTz
 github.com/wlynxg/anet v0.0.3/go.mod h1:eay5PRQr7fIVAMbTbchTnO9gG65Hg/uYGdc7mguHxoA=
 github.com/wlynxg/anet v0.0.5 h1:J3VJGi1gvo0JwZ/P1/Yc/8p63SoW98B5dHkYDmpgvvU=
 github.com/wlynxg/anet v0.0.5/go.mod h1:eay5PRQr7fIVAMbTbchTnO9gG65Hg/uYGdc7mguHxoA=
-github.com/xAlisher/go-waku v0.10.2-0.20260603060940-9f8361930df9 h1:f1tcz/ftQgHNQkEkfLG8+TBJqluJ10aQO19DpYTUAk8=
-github.com/xAlisher/go-waku v0.10.2-0.20260603060940-9f8361930df9/go.mod h1:PDs4hlPbONeMQGsNyfArZV4R2Js1Zy5oqLBfw2VU278=
+github.com/waku-org/go-waku v0.10.2-0.20260518064454-d6d39395ac48 h1:a00GguapTGSRIN9ocw93WsrMOTD07TJ1iqCashttNwA=
+github.com/waku-org/go-waku v0.10.2-0.20260518064454-d6d39395ac48/go.mod h1:PDs4hlPbONeMQGsNyfArZV4R2Js1Zy5oqLBfw2VU278=
 github.com/xanzy/go-gitlab v0.15.0/go.mod h1:8zdQa/ri1dfn8eS3Ir1SyfvOKlw7WBJ8DVThkpGiXrs=
 github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
 github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs=

pkg/backend/node/service_registry.go

@@ -40,9 +40,7 @@ func (p *PausableMediaServer) Resume() error {
 }
 
 // PausableMessenger wraps a protocol.Messenger to implement common.Pausable.
-// Pause() → ToBackground() and Resume() → ToForeground() so that the Java
-// PauseServices/ResumeServices flow gates filter health-check pings and
-// mailserver history syncs without a separate SetAppBackground API call.
+// Pause() → SetPaused(true) and Resume() → SetPaused(false)
 type PausableMessenger struct {
 	common.PauseBroadcaster
 	m *protocol.Messenger
@@ -57,13 +55,13 @@ func newPausableMessenger(m *protocol.Messenger) *PausableMessenger {
 func (p *PausableMessenger) PausableName() string { return "messenger" }
 
 func (p *PausableMessenger) Pause() error {
-	p.m.ToBackground()
+	p.m.SetPaused(true)
 	p.MarkPaused()
 	return nil
 }
 
 func (p *PausableMessenger) Resume() error {
-	p.m.ToForeground()
+	p.m.SetPaused(false)
 	p.MarkResumed()
 	return nil
 }

pkg/messaging/api.go

@@ -62,15 +62,6 @@ func (a *API) ResumeTransport() {
 	}
 }
 
-// SetFilterBackgroundMode suppresses (background=true) or re-enables
-// (background=false) Waku filter-subscription renewal. Call with background=true
-// when the app UI is hidden to avoid LTE wakeups from expiring subscriptions.
-func (a *API) SetFilterBackgroundMode(background bool) {
-	if a.core.stack.Transport != nil {
-		a.core.stack.Transport.SetFilterBackgroundMode(background)
-	}
-}
-
 // PauseDataSync idles (paused==true) or re-arms (paused==false) the reliability
 // layer's data-sync node so its outbound loop performs no work while the host is
 // backgrounded.

pkg/messaging/layers/transport/transport.go

@@ -99,15 +99,6 @@ func (t *Transport) Pause() {
 	}
 }
 
-// SetFilterBackgroundMode suppresses (background=true) or re-enables
-// (background=false) filter-subscription renewal in the underlying waku
-// light-client. No-op when waku is nil or in relay mode.
-func (t *Transport) SetFilterBackgroundMode(background bool) {
-	if t.waku != nil {
-		t.waku.SetFilterBackgroundMode(background)
-	}
-}
-
 // Resume signals Transport's internal goroutines to resume and cascades to
 // EnvelopesMonitor and the underlying waku transport.
 func (t *Transport) Resume() {

pkg/messaging/waku/gowaku.go

@@ -1037,16 +1037,6 @@ func (w *Waku) subscribe(f *common.Filter) (string, error) {
 	return id, nil
 }
 
-// SetFilterBackgroundMode suppresses (background=true) or re-enables
-// (background=false) filter-subscription renewal in light-client mode.
-// No-op when filterManager is nil (relay mode).
-func (w *Waku) SetFilterBackgroundMode(background bool) {
-	if w.filterManager == nil {
-		return
-	}
-	w.filterManager.SetBackgroundMode(background)
-}
-
 // Unsubscribe removes an installed message handler.
 func (w *Waku) Unsubscribe(ctx context.Context, id string) error {
 	ok := w.filters.Uninstall(id)

pkg/messaging/waku/types/waku.go

@@ -108,11 +108,6 @@ type Waku interface {
 	Pause() error
 	// Resume re-arms goroutines suspended by Pause. Idempotent.
 	Resume() error
-	// SetFilterBackgroundMode suppresses (background=true) or re-enables
-	// (background=false) filter-subscription renewal in light-client mode.
-	// When suppressed, expiring subscriptions are not renewed until the app
-	// returns to foreground, avoiding spurious LTE radio wakeups.
-	SetFilterBackgroundMode(background bool)
 
 	// Waku protocol version
 	Version() uint

protocol/messenger.go

@@ -137,7 +137,6 @@ type Messenger struct {
 
 	started           bool
 	paused            atomic.Bool
-	backgroundMode    atomic.Bool // true when the app UI is not visible; gates background history syncs
 	quit              chan struct{}
 	ctx               context.Context
 	cancel            context.CancelFunc
@@ -548,29 +547,6 @@ func (m *Messenger) processSentMessage(id string) error {
 	return nil
 }
 
-func (m *Messenger) ToForeground() {
-	m.SetPaused(false)
-	if m.httpServer != nil {
-		m.httpServer.ToForeground()
-	}
-	m.backgroundMode.Store(false)
-	if m.messaging != nil {
-		m.messaging.SetFilterBackgroundMode(false)
-	}
-	m.asyncRequestAllHistoricMessages()
-}
-
-func (m *Messenger) ToBackground() {
-	m.SetPaused(true)
-	if m.httpServer != nil {
-		m.httpServer.ToBackground()
-	}
-	m.backgroundMode.Store(true)
-	if m.messaging != nil {
-		m.messaging.SetFilterBackgroundMode(true)
-	}
-}
-
 func (m *Messenger) SetPaused(paused bool) {
 	m.paused.Store(paused)
 	if m.ensVerifier != nil {
@@ -593,6 +569,16 @@ func (m *Messenger) SetPaused(paused bool) {
 			m.logger.Warn("failed to pause data sync", zap.Error(err))
 		}
 	}
+	if !paused {
+		if m.httpServer != nil {
+			m.httpServer.ToForeground()
+		}
+		if m.started {
+			m.asyncRequestAllHistoricMessages()
+		}
+	} else if m.httpServer != nil {
+		m.httpServer.ToBackground()
+	}
 	// ToDo: the current ArchiveManager does not provide SetPaused method yet
 	// if m.archiveManager != nil {
 	// 	m.archiveManager.SetPaused(paused)
@@ -833,9 +819,8 @@ func (m *Messenger) handleConnectionChange(online bool) {
 	}
 
 	// Start fetching messages from store nodes.
-	// Skip when backgrounded: the sync will run in ToForeground()
-	// when the app returns to foreground.
-	if online && !m.backgroundMode.Load() {
+	// Skip when backgrounded: the sync will run when the app returns to foreground.
+	if online && !m.isPaused() {
 		m.asyncRequestAllHistoricMessages()
 	}
 

protocol/messenger_mailserver_cycle.go

@@ -159,9 +159,9 @@ func (m *Messenger) checkForStorenodeCycleSignals() {
 				if ok {
 					signal.SendStoreNodeAvailable(&ms)
 				}
-				// Skip history sync when backgrounded; ToForeground()
+				// Skip history sync when backgrounded; SetPaused(false)
 				// will trigger it when the app returns to foreground.
-				if !m.backgroundMode.Load() {
+				if !m.isPaused() {
 					m.asyncRequestAllHistoricMessages()
 				}
 			}

services/ext/api.go

@@ -2,7 +2,6 @@ package ext
 
 import (
 	"context"
-	"errors"
 	"time"
 
 	"github.com/libp2p/go-libp2p/core/peer"