From c3352499fa71b6a9dfcb681c745887387a742275 Mon Sep 17 00:00:00 2001
From: mr <morgane.roques@irt-saintexupery.com>
Date: Mon, 2 Feb 2026 09:05:58 +0100
Subject: [PATCH] First Starting debug

---
 daemons/node/common/common_pubsub.go |  2 +-
 daemons/node/common/common_stream.go |  2 +-
 daemons/node/common/crypto.go        | 49 ++++++++++++++++++----------
 daemons/node/indexer/handler.go      |  2 +-
 daemons/node/indexer/service.go      |  8 ++++-
 daemons/node/node.go                 | 20 +++++++++---
 daemons/node/pubsub/publish.go       |  2 +-
 daemons/node/pubsub/service.go       |  4 ++-
 daemons/node/stream/service.go       |  3 ++
 main.go                              |  2 +-
 pem/private.pem                      |  3 ++
 pem/public.pem                       |  3 ++
 psk/psk.key                          |  3 ++
 13 files changed, 74 insertions(+), 29 deletions(-)
 create mode 100644 pem/private.pem
 create mode 100644 pem/public.pem
 create mode 100644 psk/psk.key

diff --git a/daemons/node/common/common_pubsub.go b/daemons/node/common/common_pubsub.go
index 5587052..a1ffb3e 100644
--- a/daemons/node/common/common_pubsub.go
+++ b/daemons/node/common/common_pubsub.go
@@ -27,7 +27,7 @@ type Event struct {
 }
 
 func NewEvent(name string, from string, dt *tools.DataType, user string, payload []byte) *Event {
-	priv, err := LoadKeyFromFile(false) // your node private key
+	priv, err := LoadKeyFromFilePrivate() // your node private key
 	if err != nil {
 		return nil
 	}
diff --git a/daemons/node/common/common_stream.go b/daemons/node/common/common_stream.go
index 3e642fe..3e8b5ca 100644
--- a/daemons/node/common/common_stream.go
+++ b/daemons/node/common/common_stream.go
@@ -246,7 +246,7 @@ func ConnectToIndexers(h host.Host, minIndexer int, maxIndexer int, myPID pp.ID)
 		}
 	}
 	if len(StaticIndexers) == 0 {
-		panic("can't run a node with no indexers")
+		logger.Err(errors.New("you run a node without indexers... your gonna be isolated."))
 	}
 
 	if len(StaticIndexers) < minIndexer {
diff --git a/daemons/node/common/crypto.go b/daemons/node/common/crypto.go
index 5fbeea1..945581a 100644
--- a/daemons/node/common/crypto.go
+++ b/daemons/node/common/crypto.go
@@ -2,7 +2,10 @@ package common
 
 import (
 	"bytes"
+	"crypto/ed25519"
+	"crypto/x509"
 	"encoding/base64"
+	"encoding/pem"
 	"errors"
 	"fmt"
 	"oc-discovery/conf"
@@ -44,36 +47,47 @@ func Verify(pub crypto.PubKey, data, sig []byte) (bool, error) {
 	return pub.Verify(data, sig)
 }
 
-func LoadKeyFromFile(isPublic bool) (crypto.PrivKey, error) {
+func LoadKeyFromFilePrivate() (crypto.PrivKey, error) {
 	path := conf.GetConfig().PrivateKeyPath
-	if isPublic {
-		path = conf.GetConfig().PublicKeyPath
-	}
+	fmt.Println("extract " + path)
 	data, err := os.ReadFile(path)
 	if err != nil {
 		return nil, err
 	}
-
-	// Try to unmarshal as libp2p private key (supports ed25519, rsa, etc.)
-	priv, err := crypto.UnmarshalPrivateKey(data)
+	fmt.Println(data)
+	block, _ := pem.Decode(data)
+	fmt.Println(block.Bytes)
+	keyAny, err := x509.ParsePKCS8PrivateKey(block.Bytes)
 	if err != nil {
 		return nil, err
 	}
-	return priv, nil
+
+	edKey, ok := keyAny.(ed25519.PrivateKey)
+	if !ok {
+		return nil, fmt.Errorf("not an ed25519 key")
+	}
+	return crypto.UnmarshalEd25519PrivateKey(edKey)
 }
 
-func VerifyPubWithPriv() bool {
-	priv, err := LoadKeyFromFile(false)
+func LoadKeyFromFilePublic() (crypto.PubKey, error) {
+	path := conf.GetConfig().PublicKeyPath
+	fmt.Println("extract " + path)
+	data, err := os.ReadFile(path)
 	if err != nil {
-		fmt.Println(err)
-		return false
+		return nil, err
 	}
-	pub, err := LoadKeyFromFile(true)
+	block, _ := pem.Decode(data)
+	keyAny, err := x509.ParsePKIXPublicKey(block.Bytes)
 	if err != nil {
-		fmt.Println(err)
-		return false
+		return nil, err
 	}
-	return priv.GetPublic().Equals(pub)
+
+	edKey, ok := keyAny.(ed25519.PublicKey)
+	if !ok {
+		return nil, fmt.Errorf("not an ed25519 key")
+	}
+	// Try to unmarshal as libp2p private key (supports ed25519, rsa, etc.)
+	return crypto.UnmarshalEd25519PublicKey(edKey)
 }
 
 func LoadPSKFromFile() (pnet.PSK, error) {
@@ -82,11 +96,12 @@ func LoadPSKFromFile() (pnet.PSK, error) {
 	if err != nil {
 		return nil, err
 	}
-	// Try to unmarshal as libp2p private key (supports ed25519, rsa, etc.)
+	fmt.Println("sqqdsqsqd")
 	psk, err := pnet.DecodeV1PSK(bytes.NewReader(data))
 	if err != nil {
 		return nil, err
 	}
+	fmt.Println("PSK found.")
 	return psk, nil
 }
 
diff --git a/daemons/node/indexer/handler.go b/daemons/node/indexer/handler.go
index 30387f0..f9547ae 100644
--- a/daemons/node/indexer/handler.go
+++ b/daemons/node/indexer/handler.go
@@ -29,7 +29,7 @@ type PeerRecord struct {
 }
 
 func (p *PeerRecord) Sign() error {
-	priv, err := common.LoadKeyFromFile(false)
+	priv, err := common.LoadKeyFromFilePrivate()
 	if err != nil {
 		return err
 	}
diff --git a/daemons/node/indexer/service.go b/daemons/node/indexer/service.go
index 0dcce9e..f2ad704 100644
--- a/daemons/node/indexer/service.go
+++ b/daemons/node/indexer/service.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"oc-discovery/daemons/node/common"
 
+	oclib "cloud.o-forge.io/core/oc-lib"
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
 	"github.com/libp2p/go-libp2p/core/host"
 )
@@ -17,6 +18,8 @@ type IndexerService struct {
 
 // if a pubsub is given... indexer is also an active oc-node. If not... your a strict indexer
 func NewIndexerService(h host.Host, ps *pubsub.PubSub, maxNode int) *IndexerService {
+	logger := oclib.GetLogger()
+	logger.Info().Msg("open indexer mode...")
 	var err error
 	ix := &IndexerService{
 		LongLivedStreamRecordedService: common.NewStreamRecordedService[PeerRecord](h, maxNode, false),
@@ -31,8 +34,11 @@ func NewIndexerService(h host.Host, ps *pubsub.PubSub, maxNode int) *IndexerServ
 	ix.PS = ps
 	// later TODO : all indexer laucnh a private replica of them self. DEV OPS
 	if ix.isStrictIndexer {
+		logger.Info().Msg("connect to indexers as strict indexer...")
 		common.ConnectToIndexers(h, 0, 5, ix.Host.ID()) // TODO : make var to change how many indexers are allowed.
-		ix.SubscribeToNodeActivity(ix.PS)               // now we subscribe to a long run topic named node-activity, to relay message.
+		logger.Info().Msg("subscribe to node activity as strict indexer...")
+		ix.SubscribeToNodeActivity(ix.PS) // now we subscribe to a long run topic named node-activity, to relay message.
+		logger.Info().Msg("subscribe to decentralized search flow as strict indexer...")
 		ix.SubscribeToSearch(ix.PS)
 	}
 	ix.initNodeHandler() // then listen up on every protocol expected
diff --git a/daemons/node/node.go b/daemons/node/node.go
index ba912e3..1e62f08 100644
--- a/daemons/node/node.go
+++ b/daemons/node/node.go
@@ -27,6 +27,7 @@ type Node struct {
 	PubSubService                                       *pubsub.PubSubService
 	StreamService                                       *stream.StreamService
 	PeerID                                              pp.ID
+	isIndexer                                           bool
 }
 
 func InitNode(isNode bool, isIndexer bool) (*Node, error) {
@@ -35,7 +36,7 @@ func InitNode(isNode bool, isIndexer bool) (*Node, error) {
 	}
 	logger := oclib.GetLogger()
 	logger.Info().Msg("retrieving private key...")
-	priv, err := common.LoadKeyFromFile(false) // your node private key
+	priv, err := common.LoadKeyFromFilePrivate() // your node private key
 	if err != nil {
 		return nil, err
 	}
@@ -57,6 +58,7 @@ func InitNode(isNode bool, isIndexer bool) (*Node, error) {
 	}
 	node := &Node{
 		PeerID:                         h.ID(),
+		isIndexer:                      isIndexer,
 		LongLivedStreamRecordedService: common.NewStreamRecordedService[interface{}](h, 1000, false),
 	}
 	var ps *pubsubs.PubSub
@@ -67,10 +69,15 @@ func InitNode(isNode bool, isIndexer bool) (*Node, error) {
 			panic(err) // can't run your node without a propalgation pubsub, of state of node.
 		}
 		node.PS = ps
+		logger.Info().Msg("connect to indexers...")
 		common.ConnectToIndexers(node.Host, 0, 5, node.PeerID) // TODO : make var to change how many indexers are allowed.
+		logger.Info().Msg("claims my node...")
 		node.claimInfo(conf.GetConfig().Name, conf.GetConfig().Hostname)
+		logger.Info().Msg("subscribe to node activity...")
 		node.SubscribeToNodeActivity(node.PS) // now we subscribe to a long run topic named node-activity, to relay message.
+		logger.Info().Msg("subscribe to decentralized search flow...")
 		node.SubscribeToSearch(node.PS)
+		logger.Info().Msg("run garbage collector...")
 		node.StartGC(30 * time.Second)
 
 		if node.StreamService, err = stream.InitStream(context.Background(), node.Host, node.PeerID, 1000, node); err != nil {
@@ -85,11 +92,14 @@ func InitNode(isNode bool, isIndexer bool) (*Node, error) {
 		logger.Info().Msg("generate opencloud indexer...")
 		node.IndexerService = indexer.NewIndexerService(node.Host, ps, 5)
 	}
+	logger.Info().Msg("Node is actually running.")
 	return node, nil
 }
 
 func (d *Node) Close() {
-	d.IndexerService.Close()
+	if d.isIndexer {
+		d.IndexerService.Close()
+	}
 	d.PubSubService.Close()
 	d.StreamService.Close()
 	d.Host.Close()
@@ -98,7 +108,7 @@ func (d *Node) Close() {
 func (d *Node) publishPeerRecord(
 	rec *indexer.PeerRecord,
 ) error {
-	priv, err := common.LoadKeyFromFile(false) // your node private key
+	priv, err := common.LoadKeyFromFilePrivate() // your node private key
 	if err != nil {
 		return err
 	}
@@ -185,12 +195,12 @@ func (d *Node) claimInfo(
 		return nil, err
 	}
 
-	priv, err := common.LoadKeyFromFile(false)
+	priv, err := common.LoadKeyFromFilePrivate()
 	if err != nil {
 		return nil, err
 	}
 
-	pub, err := common.LoadKeyFromFile(true)
+	pub, err := common.LoadKeyFromFilePublic()
 	if err != nil {
 		return nil, err
 	}
diff --git a/daemons/node/pubsub/publish.go b/daemons/node/pubsub/publish.go
index 5945799..19c927c 100644
--- a/daemons/node/pubsub/publish.go
+++ b/daemons/node/pubsub/publish.go
@@ -55,7 +55,7 @@ func (ps *PubSubService) publishEvent(
 	if err != nil {
 		return err
 	}
-	priv, err := common.LoadKeyFromFile(false)
+	priv, err := common.LoadKeyFromFilePrivate()
 	if err != nil {
 		return err
 	}
diff --git a/daemons/node/pubsub/service.go b/daemons/node/pubsub/service.go
index 11d2407..f3f8ed8 100644
--- a/daemons/node/pubsub/service.go
+++ b/daemons/node/pubsub/service.go
@@ -7,6 +7,7 @@ import (
 	"strings"
 	"sync"
 
+	oclib "cloud.o-forge.io/core/oc-lib"
 	"cloud.o-forge.io/core/oc-lib/tools"
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
 	"github.com/libp2p/go-libp2p/core/host"
@@ -28,7 +29,8 @@ func InitPubSub(ctx context.Context, h host.Host, ps *pubsub.PubSub, node common
 		StreamService: streamService,
 		PS:            ps,
 	}
-
+	logger := oclib.GetLogger()
+	logger.Info().Msg("subscribe to events...")
 	service.initSubscribeEvents(ctx)
 	return service, nil
 }
diff --git a/daemons/node/stream/service.go b/daemons/node/stream/service.go
index 7f08392..99b6fe5 100644
--- a/daemons/node/stream/service.go
+++ b/daemons/node/stream/service.go
@@ -43,6 +43,7 @@ type StreamService struct {
 }
 
 func InitStream(ctx context.Context, h host.Host, key pp.ID, maxNode int, node common.DiscoveryPeer) (*StreamService, error) {
+	logger := oclib.GetLogger()
 	service := &StreamService{
 		Key:          key,
 		Node:         node,
@@ -50,7 +51,9 @@ func InitStream(ctx context.Context, h host.Host, key pp.ID, maxNode int, node c
 		Streams:      common.ProtocolStream{},
 		maxNodesConn: maxNode,
 	}
+	logger.Info().Msg("handle to partner heartbeat protocol...")
 	service.Host.SetStreamHandler(ProtocolHeartbeatPartner, service.HandlePartnerHeartbeat)
+	logger.Info().Msg("connect to partners...")
 	service.connectToPartners() // we set up a stream
 	go service.StartGC(30 * time.Second)
 	return service, nil
diff --git a/main.go b/main.go
index 8a337ca..20901d2 100644
--- a/main.go
+++ b/main.go
@@ -26,7 +26,7 @@ func main() {
 
 	conf.GetConfig().Name = o.GetStringDefault("NAME", "opencloud-demo")
 	conf.GetConfig().Hostname = o.GetStringDefault("HOSTNAME", "localhost")
-	conf.GetConfig().PSKPath = o.GetStringDefault("PSK_PATH", "./psk/psk")
+	conf.GetConfig().PSKPath = o.GetStringDefault("PSK_PATH", "./psk/psk.key")
 	conf.GetConfig().NodeEndpointPort = o.GetInt64Default("NODE_ENDPOINT_PORT", 4001)
 	conf.GetConfig().PublicKeyPath = o.GetStringDefault("PUBLIC_KEY_PATH", "./pem/public.pem")
 	conf.GetConfig().PrivateKeyPath = o.GetStringDefault("PRIVATE_KEY_PATH", "./pem/private.pem")
diff --git a/pem/private.pem b/pem/private.pem
new file mode 100644
index 0000000..c7b53e8
--- /dev/null
+++ b/pem/private.pem
@@ -0,0 +1,3 @@
+-----BEGIN PRIVATE KEY-----
+MC4CAQAwBQYDK2VwBCIEIK2oBaOtGNchE09MBRtPd5oEOUcVUQG2ndym5wKExj7R
+-----END PRIVATE KEY-----
diff --git a/pem/public.pem b/pem/public.pem
new file mode 100644
index 0000000..50d91ba
--- /dev/null
+++ b/pem/public.pem
@@ -0,0 +1,3 @@
+-----BEGIN PUBLIC KEY-----
+MCowBQYDK2VwAyEAZ2nLJBL8a5opfa8nFeVj0SZToW8pl4+zgcSUkeZFRO4=
+-----END PUBLIC KEY-----
diff --git a/psk/psk.key b/psk/psk.key
new file mode 100644
index 0000000..d25fc43
--- /dev/null
+++ b/psk/psk.key
@@ -0,0 +1,3 @@
+/key/swarm/psk/1.0.0/
+/base16/
+9018b627b4d0f123d1cfcd16f33b538688ed7588cde9da8c60d587b7022399c1