fix: github actions

Author: yoshino-s

internal/derperer/derp_endpoint.go

@@ -32,20 +32,27 @@ type DerpEndpoint struct {
 	Error     string         `json:"error,omitempty"`
 }
 
-func (d *DerpEndpoint) Convert() *tailcfg.DERPRegion {
-	return &tailcfg.DERPRegion{
-		RegionID:   d.ID,
-		RegionCode: d.Name,
-		RegionName: d.Name,
-		Nodes: []*tailcfg.DERPNode{
+func (d *DerpEndpoint) Convert() *DERPRegion {
+	return &DERPRegion{
+		DERPRegion: tailcfg.DERPRegion{
+			RegionID:   d.ID,
+			RegionCode: d.Name,
+			RegionName: d.Name,
+		},
+		Nodes: []*DERPNode{
 			{
-				Name:             d.Name,
-				RegionID:         d.ID,
-				HostName:         d.Host,
-				IPv4:             d.IPv4,
-				IPv6:             d.IPv6,
-				DERPPort:         d.Port,
-				InsecureForTests: d.Insecure,
+				DERPNode: tailcfg.DERPNode{
+					Name:             d.Name,
+					RegionID:         d.ID,
+					HostName:         d.Host,
+					IPv4:             d.IPv4,
+					IPv6:             d.IPv6,
+					DERPPort:         d.Port,
+					InsecureForTests: d.Insecure,
+				},
+				Latency:   d.Latency,
+				Bandwidth: d.Bandwidth,
+				Status:    d.Status,
 			},
 		},
 	}
@@ -55,15 +62,21 @@ type DerpEndpoints []*DerpEndpoint
 
 func (d DerpEndpoints) Len() int { return len(d) }
 
-func (d DerpEndpoints) Convert() *tailcfg.DERPMap {
+func (d DerpEndpoints) Convert() *DERPMap {
 	if d == nil {
-		return nil
+		return &DERPMap{
+			DERPMap: tailcfg.DERPMap{
+				Regions: map[int]*tailcfg.DERPRegion{},
+			},
+		}
 	}
-	m := &tailcfg.DERPMap{
-		Regions: make(map[int]*tailcfg.DERPRegion),
-		HomeParams: &tailcfg.DERPHomeParams{
-			RegionScore: map[int]float64{},
+	m := &DERPMap{
+		DERPMap: tailcfg.DERPMap{
+			HomeParams: &tailcfg.DERPHomeParams{
+				RegionScore: map[int]float64{},
+			},
 		},
+		Regions: make(map[int]*DERPRegion),
 	}
 	for _, endpoint := range d {
 		m.Regions[endpoint.ID] = endpoint.Convert()

internal/derperer/extend_map.go

@@ -0,0 +1,47 @@
+package derperer
+
+import (
+	"time"
+
+	"github.com/yoshino-s/derperer/pkg/speedtest"
+	"tailscale.com/tailcfg"
+)
+
+type DERPMap struct {
+	tailcfg.DERPMap
+	Regions map[int]*DERPRegion
+}
+
+type DERPRegion struct {
+	tailcfg.DERPRegion
+	Nodes []*DERPNode
+}
+
+type DERPNode struct {
+	tailcfg.DERPNode
+	Latency   time.Duration  `json:"latency,omitempty"`
+	Bandwidth speedtest.Unit `json:"bandwidth,omitempty"`
+	Status    DerpStatus     `json:"status,omitempty"`
+}
+
+func (n *DERPNode) ToOriginal() *tailcfg.DERPNode {
+	return &n.DERPNode
+}
+
+func (r *DERPRegion) ToOriginal() *tailcfg.DERPRegion {
+	region := &r.DERPRegion
+	region.Nodes = make([]*tailcfg.DERPNode, 0, len(r.Nodes))
+	for _, node := range r.Nodes {
+		region.Nodes = append(region.Nodes, node.ToOriginal())
+	}
+	return region
+}
+
+func (m *DERPMap) ToOriginal() *tailcfg.DERPMap {
+	derpMap := &m.DERPMap
+	derpMap.Regions = make(map[int]*tailcfg.DERPRegion)
+	for id, region := range m.Regions {
+		derpMap.Regions[id] = region.ToOriginal()
+	}
+	return derpMap
+}

internal/derperer/map.go

@@ -44,7 +44,7 @@ func (d *DerpererService) Configuration() configuration.Configuration {
 }
 
 func (d *DerpererService) testDerpEndpoint(endpoint *DerpEndpoint) {
-	res, err := d.SpeedtestService.CheckDerp(endpoint.Convert(), d.config.CheckDuration)
+	res, err := d.SpeedtestService.CheckDerp(endpoint.Convert().ToOriginal(), d.config.CheckDuration)
 	if err != nil {
 		d.Logger.Error("failed to check derp", zap.Any("endpoint", endpoint), zap.Error(err))
 		endpoint.Error = err.Error()

pkg/speedtest/unit.go

@@ -53,6 +53,9 @@ func (b Unit) MarshalText() ([]byte, error) {
 func (b Unit) MarshalJSON() ([]byte, error) {
 	return []byte(fmt.Sprintf(`"%s"`, b.String())), nil
 }
+func (b Unit) IsZero() bool {
+	return b.Value == 0
+}
 func (b *Unit) UnmarshalText(data []byte) error {
 	u, err := ParseUnit(string(data), b.Uint)
 	if err != nil {