refactor: replace std log with custom logger interface throughout codebase

Author: ordishs

client.go

@@ -7,7 +7,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"log"
 	"os"
 	"sync"
 	"time"
@@ -126,7 +125,7 @@ func NewClient(config Config) (P2PClient, error) {
 	for _, peerInfo := range bootstrapPeers {
 		go func(pi peer.AddrInfo) {
 			if err := h.Connect(ctx, pi); err == nil {
-				log.Printf("Connected to bootstrap peer: %s", pi.ID.String())
+				logger.Infof("Connected to bootstrap peer: %s", pi.ID.String())
 			}
 		}(peerInfo)
 	}
@@ -150,11 +149,11 @@ func NewClient(config Config) (P2PClient, error) {
 	}
 
 	// Set up mDNS discovery
-	mdnsService := mdns.NewMdnsService(h, "", &discoveryNotifee{h: h, ctx: ctx})
+	mdnsService := mdns.NewMdnsService(h, "", &discoveryNotifee{h: h, ctx: ctx, logger: logger})
 	if err := mdnsService.Start(); err != nil {
-		log.Printf("Warning: mDNS failed to start: %v", err)
+		logger.Errorf("mDNS failed to start: %v", err)
 	} else {
-		log.Println("mDNS discovery started")
+		logger.Infof("mDNS discovery started")
 	}
 
 	client := &Client{
@@ -199,7 +198,7 @@ func (c *Client) Subscribe(topic string) <-chan Message {
 			var err error
 			t, err = c.pubsub.Join(topic)
 			if err != nil {
-				log.Printf("Failed to join topic %s: %v", topic, err)
+				c.logger.Errorf("Failed to join topic %s: %v", topic, err)
 				close(msgChan)
 				return
 			}
@@ -212,7 +211,7 @@ func (c *Client) Subscribe(topic string) <-chan Message {
 		// Subscribe to topic
 		sub, err := t.Subscribe()
 		if err != nil {
-			log.Printf("Failed to subscribe to topic %s: %v", topic, err)
+			c.logger.Errorf("Failed to subscribe to topic %s: %v", topic, err)
 			close(msgChan)
 			return
 		}
@@ -232,7 +231,7 @@ func (c *Client) Subscribe(topic string) <-chan Message {
 						if tp == peerID {
 							name := c.peerTracker.getName(peerID)
 							addr := conn.RemoteMultiaddr().String()
-							log.Printf("[CONNECTED] Topic peer %s [%s] %s", peerID.String(), name, addr)
+							c.logger.Infof("[CONNECTED] Topic peer %s [%s] %s", peerID.String(), name, addr)
 
 							// Save peer cache
 							c.savePeerCache(t)
@@ -246,7 +245,7 @@ func (c *Client) Subscribe(topic string) <-chan Message {
 				topicPeers := t.ListPeers()
 				for _, tp := range topicPeers {
 					if tp == peerID {
-						log.Printf("[DISCONNECTED] Lost connection to topic peer %s", peerID.String()[:16])
+						c.logger.Infof("[DISCONNECTED] Lost connection to topic peer %s", peerID.String()[:16])
 						return
 					}
 				}
@@ -358,7 +357,7 @@ func (c *Client) Close() error {
 	case <-done:
 		return nil
 	case <-time.After(2 * time.Second):
-		log.Printf("Warning: Clean shutdown timed out, forcing exit")
+		c.logger.Warnf("Clean shutdown timed out, forcing exit")
 		return nil
 	}
 }
@@ -443,7 +442,7 @@ func (c *Client) receiveMessages(sub *pubsub.Subscription, topic *pubsub.Topic,
 			if c.ctx.Err() != nil {
 				return
 			}
-			log.Printf("Error reading message: %v", err)
+			c.logger.Errorf("Error reading message: %v", err)
 			continue
 		}
 
@@ -458,7 +457,7 @@ func (c *Client) receiveMessages(sub *pubsub.Subscription, topic *pubsub.Topic,
 			Data []byte `json:"data"`
 		}
 		if err := json.Unmarshal(msg.Data, &m); err != nil {
-			log.Printf("Error unmarshaling message: %v", err)
+			c.logger.Errorf("Error unmarshaling message: %v", err)
 			continue
 		}
 
@@ -511,8 +510,9 @@ func (c *Client) savePeerCache(topic *pubsub.Topic) {
 // Helper functions
 
 type discoveryNotifee struct {
-	h   host.Host
-	ctx context.Context
+	h      host.Host
+	ctx    context.Context
+	logger logger
 }
 
 func (n *discoveryNotifee) HandlePeerFound(pi peer.AddrInfo) {
@@ -521,7 +521,7 @@ func (n *discoveryNotifee) HandlePeerFound(pi peer.AddrInfo) {
 	}
 
 	if err := n.h.Connect(n.ctx, pi); err == nil {
-		log.Printf("Connected to peer: %s", pi.ID.String())
+		n.logger.Infof("Connected to peer: %s", pi.ID.String())
 	}
 }
 

example/go.mod

@@ -3,7 +3,6 @@ module github.com/ordishs/p2p_poc/example
 go 1.25.1
 
 require (
-	github.com/ordishs/gocore v1.0.81
 	github.com/bsv-blockchain/go-p2p-message-bus v0.0.0
 )
 

example/main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	"encoding/json"
 	"flag"
 	"fmt"
 	"os"
@@ -10,9 +11,8 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/libp2p/go-libp2p/core/crypto"
-	"github.com/ordishs/gocore"
 	p2p "github.com/bsv-blockchain/go-p2p-message-bus"
+	"github.com/libp2p/go-libp2p/core/crypto"
 )
 
 func main() {
@@ -23,10 +23,11 @@ func main() {
 
 	flag.Parse()
 
-	logger := gocore.Log("p2p_poc")
+	logger := &p2p.DefaultLogger{}
 
 	if *name == "" {
-		logger.Fatal("--name flag is required")
+		logger.Errorf("--name flag is required")
+		return
 	}
 
 	ctx, cancel := context.WithCancel(context.Background())
@@ -46,17 +47,19 @@ func main() {
 		// Generate a new key
 		privKey, err = p2p.GeneratePrivateKey()
 		if err != nil {
-			logger.Fatalf("Failed to generate private key: %v", err)
+			logger.Errorf("Failed to generate private key: %v", err)
+			return
 		}
 
 		keyHex, _ = p2p.PrivateKeyToHex(privKey)
-		fmt.Printf("Generated new private key: %s\n", keyHex)
-		fmt.Println("Save this key and use it next time with --key flag or P2P_PRIVATE_KEY env var")
+		logger.Infof("Generated new private key: %s\n", keyHex)
+		logger.Infof("Save this key and use it next time with --key flag or P2P_PRIVATE_KEY env var")
 	} else {
 		// Load key from hex
 		privKey, err = p2p.PrivateKeyFromHex(keyHex)
 		if err != nil {
-			logger.Fatalf("Failed to load private key: %v", err)
+			logger.Errorf("Failed to load private key: %v", err)
+			return
 		}
 	}
 
@@ -68,8 +71,10 @@ func main() {
 		PeerCacheFile: "peer_cache.json", // Enable peer persistence
 	})
 	if err != nil {
-		logger.Fatalf("Failed to create P2P client: %v", err)
+		logger.Errorf("Failed to create P2P client: %v", err)
+		return
 	}
+
 	defer client.Close()
 
 	// Parse topics list
@@ -78,8 +83,6 @@ func main() {
 		topicList[i] = strings.TrimSpace(t)
 	}
 
-	logger.Infof("Subscribing to topics: %v", topicList)
-
 	// Subscribe to all topics and merge messages into single channel
 	allMsgChan := make(chan p2p.Message, 100)
 
@@ -92,14 +95,26 @@ func main() {
 				allMsgChan <- msg
 			}
 		}(msgChan)
-
-		logger.Infof("Subscribed to topic: %s", topic)
 	}
 
 	// Start message receiver
 	go func() {
 		for msg := range allMsgChan {
-			fmt.Printf("[%-52s] %s: %s (topic: %s)\n", msg.FromID, msg.From, string(msg.Data), msg.Topic)
+			var data string
+
+			// Try to unmarshal and re-marshal for pretty printing
+			var jsonObj interface{}
+			if err := json.Unmarshal(msg.Data, &jsonObj); err == nil {
+				if jsonBytes, err := json.MarshalIndent(jsonObj, "", "  "); err == nil {
+					data = string(jsonBytes)
+				} else {
+					data = string(msg.Data)
+				}
+			} else {
+				data = string(msg.Data)
+			}
+
+			logger.Infof("[%-52s] %s: (%s)\n%s", msg.FromID, msg.From, msg.Topic, data)
 		}
 	}()
 
@@ -123,7 +138,7 @@ func main() {
 							return
 						}
 					}
-					fmt.Printf("[%-52s] %s: %s\n", "local", *name, data)
+					logger.Infof("[%-52s] %s: %s\n", "local", *name, data)
 				}
 			}
 		}()
@@ -141,26 +156,25 @@ func main() {
 			case <-ticker.C:
 				peers := client.GetPeers()
 				if len(peers) > 0 {
-					fmt.Printf("\n=== Connected Peers: %d ===\n", len(peers))
+					logger.Infof("\n=== Connected Peers: %d ===\n", len(peers))
 					for _, peer := range peers {
-						fmt.Printf("  - %s [%s]\n", peer.Name, peer.ID)
+						logger.Infof("  - %s [%s]\n", peer.Name, peer.ID)
 						for _, addr := range peer.Addrs {
-							fmt.Printf("    %s\n", addr)
+							logger.Infof("    %s\n", addr)
 						}
 					}
-					fmt.Println()
 				}
 			}
 		}
 	}()
 
-	fmt.Println("P2P client started. Press Ctrl+C to exit")
+	logger.Infof("P2P client started. Press Ctrl+C to exit")
 
 	// Wait for shutdown signal
 	sigChan := make(chan os.Signal, 1)
 	signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM)
 	<-sigChan
 
-	fmt.Println("\nShutting down...")
+	logger.Infof("\nShutting down...")
 	cancel()
 }