integrate ctx and p2p updates from old repo (#12)

* integrate ctx and p2p updates from old repo

* lint fix

* clean up context

* get header by height

* fix bootstrap

* fix context cancellation

* fix deps

* fix context in sse stream

* update go-sdk

* Fix tests

* lint fix

Author: shruggr

cmd/server/api.go

@@ -23,15 +23,19 @@ import (
 var openapiSpec string
 
 // Server wraps the ChainManager with Fiber handlers
+//
+//nolint:containedctx // Context stored for SSE stream shutdown detection
 type Server struct {
+	ctx          context.Context
 	cm           *chaintracks.ChainManager
 	sseClients   map[int64]*bufio.Writer
 	sseClientsMu sync.RWMutex
 }
 
 // NewServer creates a new API server
-func NewServer(cm *chaintracks.ChainManager) *Server {
+func NewServer(ctx context.Context, cm *chaintracks.ChainManager) *Server {
 	return &Server{
+		ctx:        ctx,
 		cm:         cm,
 		sseClients: make(map[int64]*bufio.Writer),
 	}
@@ -97,6 +101,9 @@ func (s *Server) HandleTipStream(c *fiber.Ctx) error {
 	c.Set("Connection", "keep-alive")
 	c.Set("Transfer-Encoding", "chunked")
 
+	// Capture context before entering stream writer
+	ctx := c.UserContext()
+
 	c.Context().SetBodyStreamWriter(fasthttp.StreamWriter(func(w *bufio.Writer) {
 		clientID := time.Now().UnixNano()
 
@@ -111,7 +118,7 @@ func (s *Server) HandleTipStream(c *fiber.Ctx) error {
 		}()
 
 		// Send initial tip
-		tip := s.cm.GetTip()
+		tip := s.cm.GetTip(ctx)
 		if tip != nil { //nolint:nestif // SSE stream initialization logic
 
 			data, err := json.Marshal(tip)
@@ -129,15 +136,17 @@ func (s *Server) HandleTipStream(c *fiber.Ctx) error {
 		ticker := time.NewTicker(15 * time.Second)
 		defer ticker.Stop()
 
-		for range ticker.C {
-			// Send keepalive comment
-			if _, writeErr := fmt.Fprintf(w, ": keepalive\n\n"); writeErr != nil {
-				// Connection closed
-				return
-			}
-			if err := w.Flush(); err != nil {
-				// Connection closed
+		for {
+			select {
+			case <-s.ctx.Done():
 				return
+			case <-ticker.C:
+				if _, writeErr := fmt.Fprintf(w, ": keepalive\n\n"); writeErr != nil {
+					return
+				}
+				if err := w.Flush(); err != nil {
+					return
+				}
 			}
 		}
 	}))
@@ -169,7 +178,7 @@ func (s *Server) HandleRobots(c *fiber.Ctx) error {
 
 // HandleGetNetwork returns the network name
 func (s *Server) HandleGetNetwork(c *fiber.Ctx) error {
-	network, err := s.cm.GetNetwork()
+	network, err := s.cm.GetNetwork(c.UserContext())
 	if err != nil {
 		return c.Status(fiber.StatusInternalServerError).JSON(Response{
 			Status: "error",
@@ -187,15 +196,15 @@ func (s *Server) HandleGetHeight(c *fiber.Ctx) error {
 	c.Set("Cache-Control", "public, max-age=60")
 	return c.JSON(Response{
 		Status: "success",
-		Value:  s.cm.GetHeight(),
+		Value:  s.cm.GetHeight(c.UserContext()),
 	})
 }
 
 // HandleGetTipHash returns the chain tip hash
 func (s *Server) HandleGetTipHash(c *fiber.Ctx) error {
 	c.Set("Cache-Control", "no-cache")
 
-	tip := s.cm.GetTip()
+	tip := s.cm.GetTip(c.UserContext())
 	if tip == nil {
 		return c.Status(fiber.StatusNotFound).JSON(Response{
 			Status:      "error",
@@ -215,7 +224,7 @@ func (s *Server) HandleGetTipHash(c *fiber.Ctx) error {
 func (s *Server) HandleGetTipHeader(c *fiber.Ctx) error {
 	c.Set("Cache-Control", "no-cache")
 
-	tip := s.cm.GetTip()
+	tip := s.cm.GetTip(c.UserContext())
 	if tip == nil {
 		return c.Status(fiber.StatusNotFound).JSON(Response{
 			Status:      "error",
@@ -250,18 +259,19 @@ func (s *Server) HandleGetHeaderByHeight(c *fiber.Ctx) error {
 		})
 	}
 
-	tip := s.cm.GetHeight()
+	tip := s.cm.GetHeight(c.UserContext())
 	if uint32(height) < tip-100 {
 		c.Set("Cache-Control", "public, max-age=3600")
 	} else {
 		c.Set("Cache-Control", "no-cache")
 	}
 
-	header, err := s.cm.GetHeaderByHeight(uint32(height))
+	header, err := s.cm.GetHeaderByHeight(c.UserContext(), uint32(height))
 	if err != nil {
-		return c.JSON(Response{
-			Status: "success",
-			Value:  nil,
+		return c.Status(fiber.StatusNotFound).JSON(Response{
+			Status:      "error",
+			Code:        "ERR_NOT_FOUND",
+			Description: "Header not found at height " + heightStr,
 		})
 	}
 
@@ -291,15 +301,16 @@ func (s *Server) HandleGetHeaderByHash(c *fiber.Ctx) error {
 		})
 	}
 
-	header, err := s.cm.GetHeaderByHash(hash)
+	header, err := s.cm.GetHeaderByHash(c.UserContext(), hash)
 	if err != nil {
-		return c.JSON(Response{
-			Status: "success",
-			Value:  nil,
+		return c.Status(fiber.StatusNotFound).JSON(Response{
+			Status:      "error",
+			Code:        "ERR_NOT_FOUND",
+			Description: "Header not found for hash " + hashStr,
 		})
 	}
 
-	tip := s.cm.GetHeight()
+	tip := s.cm.GetHeight(c.UserContext())
 	if header.Height < tip-100 {
 		c.Set("Cache-Control", "public, max-age=3600")
 	} else {
@@ -343,7 +354,7 @@ func (s *Server) HandleGetHeaders(c *fiber.Ctx) error {
 		})
 	}
 
-	tip := s.cm.GetHeight()
+	tip := s.cm.GetHeight(c.UserContext())
 	if uint32(height) < tip-100 {
 		c.Set("Cache-Control", "public, max-age=3600")
 	} else {
@@ -353,7 +364,7 @@ func (s *Server) HandleGetHeaders(c *fiber.Ctx) error {
 	var hexData string
 	for i := uint32(0); i < uint32(count); i++ {
 		h := uint32(height) + i
-		header, err := s.cm.GetHeaderByHeight(h)
+		header, err := s.cm.GetHeaderByHeight(c.UserContext(), h)
 		if err != nil {
 			break
 		}

cmd/server/api_test.go

@@ -23,6 +23,7 @@ func TestHandleGetNetwork(t *testing.T) {
 
 func TestHandleGetHeight(t *testing.T) {
 	app, cm := setupTestApp(t)
+	ctx := t.Context()
 
 	resp := httpGet(t, app, "/v2/height")
 	requireStatus(t, resp, 200)
@@ -35,11 +36,12 @@ func TestHandleGetHeight(t *testing.T) {
 	parseJSONResponse(t, resp.Body, &response)
 
 	assert.Equal(t, "success", response.Status)
-	assert.Equal(t, cm.GetHeight(), uint32(response.Value))
+	assert.Equal(t, cm.GetHeight(ctx), uint32(response.Value))
 }
 
 func TestHandleGetTipHash(t *testing.T) {
 	app, cm := setupTestApp(t)
+	ctx := t.Context()
 
 	resp := httpGet(t, app, "/v2/tip/hash")
 	requireStatus(t, resp, 200)
@@ -52,11 +54,12 @@ func TestHandleGetTipHash(t *testing.T) {
 	parseJSONResponse(t, resp.Body, &response)
 
 	assert.Equal(t, "success", response.Status)
-	assert.Equal(t, cm.GetTip().Header.Hash().String(), response.Value)
+	assert.Equal(t, cm.GetTip(ctx).Header.Hash().String(), response.Value)
 }
 
 func TestHandleGetTipHeader(t *testing.T) {
 	app, cm := setupTestApp(t)
+	ctx := t.Context()
 
 	resp := httpGet(t, app, "/v2/tip/header")
 	requireStatus(t, resp, 200)
@@ -68,13 +71,14 @@ func TestHandleGetTipHeader(t *testing.T) {
 	parseJSONResponse(t, resp.Body, &response)
 
 	assert.Equal(t, "success", response.Status)
-	assert.Equal(t, cm.GetTip().Height, response.Value.Height)
+	assert.Equal(t, cm.GetTip(ctx).Height, response.Value.Height)
 }
 
 func TestHandleGetHeaderByHeight(t *testing.T) {
 	app, cm := setupTestApp(t)
+	ctx := t.Context()
 
-	if cm.GetHeight() < 100 {
+	if cm.GetHeight(ctx) < 100 {
 		t.Skip("Not enough headers to test")
 	}
 
@@ -95,22 +99,15 @@ func TestHandleGetHeaderByHeight_NotFound(t *testing.T) {
 	app, _ := setupTestApp(t)
 
 	resp := httpGet(t, app, "/v2/header/height/99999999")
-	requireStatus(t, resp, 200)
-
-	var response struct {
-		Status string      `json:"status"`
-		Value  interface{} `json:"value"`
-	}
-	parseJSONResponse(t, resp.Body, &response)
-
-	assert.Equal(t, "success", response.Status)
-	assert.Nil(t, response.Value, "Expected null value for non-existent header")
+	requireStatus(t, resp, 404)
+	requireErrorResponse(t, resp.Body)
 }
 
 func TestHandleGetHeaderByHash(t *testing.T) {
 	app, cm := setupTestApp(t)
+	ctx := t.Context()
 
-	tip := cm.GetTip()
+	tip := cm.GetTip(ctx)
 	hash := tip.Header.Hash().String()
 
 	resp := httpGet(t, app, "/v2/header/hash/"+hash)
@@ -139,22 +136,15 @@ func TestHandleGetHeaderByHash_NotFound(t *testing.T) {
 
 	nonExistentHash := chainhash.Hash{}
 	resp := httpGet(t, app, "/v2/header/hash/"+nonExistentHash.String())
-	requireStatus(t, resp, 200)
-
-	var response struct {
-		Status string      `json:"status"`
-		Value  interface{} `json:"value"`
-	}
-	parseJSONResponse(t, resp.Body, &response)
-
-	assert.Equal(t, "success", response.Status)
-	assert.Nil(t, response.Value, "Expected null value for non-existent header")
+	requireStatus(t, resp, 404)
+	requireErrorResponse(t, resp.Body)
 }
 
 func TestHandleGetHeaders(t *testing.T) {
 	app, cm := setupTestApp(t)
+	ctx := t.Context()
 
-	if cm.GetHeight() < 10 {
+	if cm.GetHeight(ctx) < 10 {
 		t.Skip("Not enough headers to test")
 	}
 

cmd/server/config.go

@@ -1,17 +1,20 @@
 package main
 
 import (
+	"encoding/json"
+	"log"
 	"os"
 	"path/filepath"
 	"strconv"
 )
 
 // Config holds the server configuration
 type Config struct {
-	Port         int
-	Network      string
-	StoragePath  string
-	BootstrapURL string
+	Port           int
+	Network        string
+	StoragePath    string
+	BootstrapURL   string
+	BootstrapPeers []string
 }
 
 // LoadConfig loads configuration from environment variables with defaults
@@ -35,12 +38,38 @@ func LoadConfig() *Config {
 
 	bootstrapURL := os.Getenv("BOOTSTRAP_URL")
 
+	bootstrapPeers := loadBootstrapPeers(network)
+
 	return &Config{
-		Port:         port,
-		Network:      network,
-		StoragePath:  storagePath,
-		BootstrapURL: bootstrapURL,
+		Port:           port,
+		Network:        network,
+		StoragePath:    storagePath,
+		BootstrapURL:   bootstrapURL,
+		BootstrapPeers: bootstrapPeers,
+	}
+}
+
+// loadBootstrapPeers loads P2P bootstrap peers from data/bootstrap_peers.json
+func loadBootstrapPeers(network string) []string {
+	data, err := os.ReadFile("data/bootstrap_peers.json")
+	if err != nil {
+		log.Printf("Warning: could not load bootstrap_peers.json: %v", err)
+		return nil
 	}
+
+	var peers map[string][]string
+	if err := json.Unmarshal(data, &peers); err != nil {
+		log.Printf("Warning: could not parse bootstrap_peers.json: %v", err)
+		return nil
+	}
+
+	if networkPeers, ok := peers[network]; ok {
+		log.Printf("Loaded %d bootstrap peers for network %s", len(networkPeers), network)
+		return networkPeers
+	}
+
+	log.Printf("Warning: no bootstrap peers found for network %s", network)
+	return nil
 }
 
 // getDefaultStoragePath returns ~/.chaintracks as the default storage path

cmd/server/dashboard.go

@@ -23,8 +23,8 @@ func NewDashboardHandler(server *Server) *DashboardHandler {
 
 // HandleStatus renders the status dashboard
 func (h *DashboardHandler) HandleStatus(c *fiber.Ctx) error {
-	tip := h.server.cm.GetTip()
-	height := h.server.cm.GetHeight()
+	tip := h.server.cm.GetTip(c.UserContext())
+	height := h.server.cm.GetHeight(c.UserContext())
 
 	var tipHash string
 	var tipChainwork string
@@ -36,7 +36,7 @@ func (h *DashboardHandler) HandleStatus(c *fiber.Ctx) error {
 		tipChainwork = "N/A"
 	}
 
-	network, err := h.server.cm.GetNetwork()
+	network, err := h.server.cm.GetNetwork(c.UserContext())
 	if err != nil {
 		network = "unknown"
 	}