Peer Discovery -> DHT // no more pubsub state

daemons/node/indexer/service.go

@@ -6,8 +6,9 @@ import (
 	"sync"
 
 	oclib "cloud.o-forge.io/core/oc-lib"
-	pp "cloud.o-forge.io/core/oc-lib/models/peer"
+	dht "github.com/libp2p/go-libp2p-kad-dht"
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
+	record "github.com/libp2p/go-libp2p-record"
 	"github.com/libp2p/go-libp2p/core/host"
 	"github.com/libp2p/go-libp2p/core/peer"
 )
@@ -16,9 +17,13 @@ import (
 type IndexerService struct {
 	*common.LongLivedStreamRecordedService[PeerRecord]
 	PS              *pubsub.PubSub
+	DHT             *dht.IpfsDHT
 	isStrictIndexer bool
 	mu              sync.RWMutex
 	DisposedPeers   map[peer.ID]*common.TopicNodeActivityPub
+
+	SeenQueries map[string]bool
+	SeenMU      sync.Mutex
 }
 
 // if a pubsub is given... indexer is also an active oc-node. If not... your a strict indexer
@@ -46,28 +51,25 @@ func NewIndexerService(h host.Host, ps *pubsub.PubSub, maxNode int) *IndexerServ
 		logger.Info().Msg("subscribe to decentralized search flow as strict indexer...")
 		ix.SubscribeToSearch(ix.PS, nil)
 	}
-	f := func(ctx context.Context, evt common.TopicNodeActivityPub, _ string) {
-		ix.mu.Lock()
-		if pid, err := peer.Decode(evt.PeerID); err == nil {
-			if evt.NodeActivity == pp.OFFLINE.EnumIndex() {
-				delete(ix.DisposedPeers, pid)
-			}
-			if evt.NodeActivity == pp.ONLINE.EnumIndex() {
-				ix.DisposedPeers[pid] = &evt
-			}
-		}
-
-		ix.mu.Unlock()
+	if ix.DHT, err = dht.New(
+		context.Background(),
+		ix.Host,
+		dht.Mode(dht.ModeServer),
+		dht.Validator(record.NamespacedValidator{
+			"node": PeerRecordValidator{},
+		}),
+	); err != nil {
+		return nil
 	}
-	ix.SubscribeToNodeActivity(ix.PS, &f) // now we subscribe to a long run topic named node-activity, to relay message.
-	ix.initNodeHandler()                  // then listen up on every protocol expected
+	ix.initNodeHandler() // then listen up on every protocol expected
 	return ix
 }
 
 func (ix *IndexerService) Close() {
+	ix.DHT.Close()
+	ix.PS.UnregisterTopicValidator(common.TopicPubSubSearch)
 	for _, s := range ix.StreamRecords {
 		for _, ss := range s {
-			ss.Stream.Close()
 			ss.HeartbeatStream.Stream.Close()
 		}
 	}