Full Flow : Catalog + Peer

daemons/node/node.go

@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"maps"
 	"oc-discovery/conf"
 	"oc-discovery/daemons/node/common"
 	"oc-discovery/daemons/node/indexer"
@@ -110,7 +109,6 @@ func InitNode(isNode bool, isIndexer bool, isNativeIndexer bool) (*Node, error)
 		if _, err := node.claimInfo(conf.GetConfig().Name, conf.GetConfig().Hostname); err != nil {
 			panic(err)
 		}
-		logger.Info().Msg("subscribe to decentralized search flow...")
 		logger.Info().Msg("run garbage collector...")
 		node.StartGC(30 * time.Second)
 
@@ -122,10 +120,17 @@ func InitNode(isNode bool, isIndexer bool, isNativeIndexer bool) (*Node, error)
 			panic(err)
 		}
 		f := func(ctx context.Context, evt common.Event, topic string) {
-			if p, err := node.GetPeerRecord(ctx, evt.From); err == nil && len(p) > 0 {
-				node.StreamService.SendResponse(p[0], &evt)
+			m := map[string]interface{}{}
+			err := json.Unmarshal(evt.Payload, &m)
+			if err != nil || evt.From == node.PeerID.String() {
+				fmt.Println(evt.From, node.PeerID.String(), err)
+				return
+			}
+			if p, err := node.GetPeerRecord(ctx, evt.From, false); err == nil && len(p) > 0 && m["search"] != nil {
+				node.StreamService.SendResponse(p[0], &evt, fmt.Sprintf("%v", m["search"]))
 			}
 		}
+		logger.Info().Msg("subscribe to decentralized search flow...")
 		node.SubscribeToSearch(node.PS, &f)
 		logger.Info().Msg("connect to NATS")
 		go ListenNATS(node)
@@ -187,6 +192,7 @@ func (d *Node) publishPeerRecord(
 func (d *Node) GetPeerRecord(
 	ctx context.Context,
 	pidOrdid string,
+	search bool,
 ) ([]*peer.Peer, error) {
 	var err error
 	var info map[string]indexer.PeerRecord
@@ -200,16 +206,14 @@ func (d *Node) GetPeerRecord(
 	// Build the GetValue request: if pidOrdid is neither a UUID DID nor a libp2p
 	// PeerID, treat it as a human-readable name and let the indexer resolve it.
 	getReq := indexer.GetValue{Key: pidOrdid}
-	isNameSearch := false
 	if pidR, pidErr := pp.Decode(pidOrdid); pidErr == nil {
-		getReq.PeerID = pidR
+		getReq.PeerID = pidR.String()
 	} else if _, uuidErr := uuid.Parse(pidOrdid); uuidErr != nil {
 		// Not a UUID DID → treat pidOrdid as a name substring search.
 		getReq.Name = pidOrdid
 		getReq.Key = ""
-		isNameSearch = true
 	}
-
+	getReq.Search = search
 	for _, ad := range indexerSnapshot2 {
 		if common.StreamIndexers, err = common.TempStream(d.Host, *ad, common.ProtocolGet, "",
 			common.StreamIndexers, map[protocol.ID]*common.ProtocolInfo{}, &common.StreamMuIndexes); err != nil {
@@ -224,28 +228,17 @@ func (d *Node) GetPeerRecord(
 			continue
 		}
 		if resp.Found {
-			if info == nil {
-				info = resp.Records
-			} else {
-				// Aggregate results from all indexers for name searches.
-				maps.Copy(info, resp.Records)
-			}
-			// For exact lookups (PeerID / DID) stop at the first hit.
-			if !isNameSearch {
-				break
-			}
+			info = resp.Records
 		}
+		break
 	}
 	var ps []*peer.Peer
 	for _, pr := range info {
 		if pk, err := pr.Verify(); err != nil {
 			return nil, err
-		} else if ok, p, err := pr.ExtractPeer(d.PeerID.String(), pr.PeerID, pk); err != nil {
+		} else if _, p, err := pr.ExtractPeer(d.PeerID.String(), pr.PeerID, pk); err != nil {
 			return nil, err
 		} else {
-			if ok {
-				d.publishPeerRecord(&pr)
-			}
 			ps = append(ps, p)
 		}
 	}
@@ -316,6 +309,17 @@ func (d *Node) claimInfo(
 		return nil, err
 	} else {
 		_, p, err := rec.ExtractPeer(did, did, pub)
+		b, err := json.Marshal(p)
+		if err != nil {
+			return p, err
+		}
+		go tools.NewNATSCaller().SetNATSPub(tools.CREATE_RESOURCE, tools.NATSResponse{
+			FromApp:    "oc-discovery",
+			Datatype:   tools.PEER,
+			Method:     int(tools.CREATE_RESOURCE),
+			SearchAttr: "peer_id",
+			Payload:    b,
+		})
 		return p, err
 	}
 }