Per-packet source tracking in transport, via/from in info output

lib/client/client.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/theater/picomap/lib/halfsiphash"
 	"github.com/theater/picomap/lib/msgpack"
-	"io"
 )
 
 var HashKey = [8]byte{}
@@ -15,7 +14,7 @@ var HashKey = [8]byte{}
 type transport interface {
 	Send(data []byte) error
 	SetReadTimeout(timeout time.Duration)
-	Reader() io.Reader
+	Recv() (data []byte, from string, err error)
 	Broadcast() bool
 	Close() error
 }
@@ -45,20 +44,28 @@ func (c *Client) send(msg any) (uint32, error) {
 	return id, c.transport.Send(data)
 }
 
-func roundTrip[T any](c *Client, req any) ([]*T, error) {
+type Response[T any] struct {
+	From  string
+	Value *T
+}
+
+func roundTrip[T any](c *Client, req any) ([]Response[T], error) {
 	id, err := c.send(req)
 	if err != nil {
 		return nil, err
 	}
 	c.transport.SetReadTimeout(c.timeout)
-	dec := msgpack.NewDecoder(c.transport.Reader())
 	broadcast := c.transport.Broadcast()
-	var results []*T
+	var results []Response[T]
 	for {
-		var env Envelope
-		if err := dec.Decode(&env); err != nil {
+		data, from, err := c.transport.Recv()
+		if err != nil {
 			break
 		}
+		var env Envelope
+		if err := msgpack.Unmarshal(data, &env); err != nil {
+			continue
+		}
 		if env.MessageID != id {
 			continue
 		}
@@ -74,7 +81,7 @@ func roundTrip[T any](c *Client, req any) ([]*T, error) {
 			return nil, devErr
 		}
 		if typed, ok := inner.(*T); ok {
-			results = append(results, typed)
+			results = append(results, Response[T]{From: from, Value: typed})
 			if !broadcast {
 				break
 			}
@@ -83,14 +90,14 @@ func roundTrip[T any](c *Client, req any) ([]*T, error) {
 	return results, nil
 }
 
-func first[T any](results []*T, err error) (*T, error) {
+func first[T any](results []Response[T], err error) (*T, error) {
 	if err != nil {
 		return nil, err
 	}
 	if len(results) == 0 {
 		return nil, fmt.Errorf("no response")
 	}
-	return results[0], nil
+	return results[0].Value, nil
 }
 
 func (c *Client) PICOBOOT() error {
@@ -102,7 +109,7 @@ func (c *Client) Info() (*ResponseInfo, error) {
 	return first(roundTrip[ResponseInfo](c, &RequestInfo{}))
 }
 
-func (c *Client) InfoAll() ([]*ResponseInfo, error) {
+func (c *Client) InfoAll() ([]Response[ResponseInfo], error) {
 	return roundTrip[ResponseInfo](c, &RequestInfo{})
 }