Full Flow : Catalog + Peer

daemons/node/indexer/service.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"oc-discovery/conf"
 	"oc-discovery/daemons/node/common"
+	"strings"
 	"sync"
 
 	oclib "cloud.o-forge.io/core/oc-lib"
@@ -60,9 +61,19 @@ func NewIndexerService(h host.Host, ps *pubsub.PubSub, maxNode int, isNative boo
 		}
 	}
 
-	if ix.DHT, err = dht.New(
-		context.Background(),
-		ix.Host,
+	// Parse bootstrap peers from configured native/indexer addresses so that the
+	// DHT can find its routing table entries even in a fresh deployment.
+	var bootstrapPeers []pp.AddrInfo
+	for _, addrStr := range strings.Split(conf.GetConfig().NativeIndexerAddresses+","+conf.GetConfig().IndexerAddresses, ",") {
+		addrStr = strings.TrimSpace(addrStr)
+		if addrStr == "" {
+			continue
+		}
+		if ad, err := pp.AddrInfoFromString(addrStr); err == nil {
+			bootstrapPeers = append(bootstrapPeers, *ad)
+		}
+	}
+	dhtOpts := []dht.Option{
 		dht.Mode(dht.ModeServer),
 		dht.ProtocolPrefix("oc"), // 🔥 réseau privé
 		dht.Validator(record.NamespacedValidator{
@@ -71,7 +82,11 @@ func NewIndexerService(h host.Host, ps *pubsub.PubSub, maxNode int, isNative boo
 			"name":    DefaultValidator{},
 			"pid":     DefaultValidator{},
 		}),
-	); err != nil {
+	}
+	if len(bootstrapPeers) > 0 {
+		dhtOpts = append(dhtOpts, dht.BootstrapPeers(bootstrapPeers...))
+	}
+	if ix.DHT, err = dht.New(context.Background(), ix.Host, dhtOpts...); err != nil {
 		logger.Info().Msg(err.Error())
 		return nil
 	}
@@ -90,6 +105,16 @@ func NewIndexerService(h host.Host, ps *pubsub.PubSub, maxNode int, isNative boo
 }
 
 func (ix *IndexerService) Close() {
+	if ix.Native != nil && ix.Native.cancel != nil {
+		ix.Native.cancel()
+	}
+	// Explicitly deregister from natives on clean shutdown so they evict this
+	// indexer immediately rather than waiting for TTL expiry (~90 s).
+	if !ix.IsNative {
+		if nativeAddrs := conf.GetConfig().NativeIndexerAddresses; nativeAddrs != "" {
+			common.UnregisterFromNative(ix.Host, nativeAddrs)
+		}
+	}
 	ix.DHT.Close()
 	ix.PS.UnregisterTopicValidator(common.TopicPubSubSearch)
 	if ix.nameIndex != nil {