rpn: gobind does not like array-types

Author: ignoramous

intra/backend/ipn_proxies.go

@@ -178,8 +178,8 @@ type RpnAcc interface {
 	Created() int64
 	// Expires returns the time (unix millis) currently active account expires.
 	Expires() int64
-	// Locations returns a list of servers worldwide. May be nil.
-	Locations() []RpnServer
+	// Locations returns RpnServers encapsulating this proxy's worldwide server presence.
+	Locations() (RpnServers, error)
 	// Update updates the account creating new state.
 	Update() (newstate *Gobyte, err error)
 }
@@ -270,6 +270,15 @@ type RouterStats struct {
 	Since int64
 }
 
+type RpnServers interface {
+	// Get returns the RpnServer at index i; errors if i is out of bounds.
+	Get(i int) (*RpnServer, error)
+	// Len returns the number of RpnServers.
+	Len() int
+	// Json returns the RpnServer struct as JSON bytes.
+	Json() (*Gobyte, error)
+}
+
 type RpnServer struct {
 	// Name of the server, if any.
 	Name string

intra/dns53/dot_test.go

@@ -366,7 +366,13 @@ func TestProtonReaches(t *testing.T) {
 
 	const maxVisited = 10
 	visited := make(map[string]struct{}, 0)
-	for _, c := range win.Locations() {
+	locs, err := win.Locations()
+	ko(t, err)
+	for i := 0; i < locs.Len(); i++ {
+		c, err := locs.Get(i)
+		if err != nil {
+			continue
+		}
 		if _, ok := visited[c.CC]; !ok {
 			// _, _ = pxr.AddProxy(ipn.RpnPro+c.CC, c.UapiConfig())
 			visited[c.CC] = struct{}{}

intra/ipn/rpn.go

@@ -192,6 +192,6 @@ func (r *rpnp) Update() (newState *x.Gobyte, err error) {
 	return r.RpnAcc.Update()
 }
 
-func (r *rpnp) Locations() []x.RpnServer {
+func (r *rpnp) Locations() (x.RpnServers, error) {
 	return r.RpnAcc.Locations()
 }

intra/ipn/warp/api.go

@@ -33,8 +33,9 @@ import (
 )
 
 var (
-	errRpnStateless  = errors.New("rpn has no state or config")
-	errRpnUpdateless = errors.New("rpn cannot be updated only registered")
+	errRpnCountryless = errors.New("rpn is not multi-country")
+	errRpnStateless   = errors.New("rpn has no state or config")
+	errRpnUpdateless  = errors.New("rpn cannot be updated only registered")
 )
 
 type RpnAcc interface {
@@ -67,8 +68,8 @@ func (RpnMultiCountry) MultiCountry() bool { return true }
 
 type RpnCountryless struct{}
 
-func (c RpnCountryless) MultiCountry() bool       { return false }
-func (c RpnCountryless) Locations() []x.RpnServer { return nil }
+func (c RpnCountryless) MultiCountry() bool               { return false }
+func (c RpnCountryless) Locations() (x.RpnServers, error) { return nil, errRpnCountryless }
 
 type RpnStateless struct {
 	RpnUpdateless
@@ -81,6 +82,34 @@ type RpnUpdateless struct{}
 
 func (RpnUpdateless) Update() (*x.Gobyte, error) { return nil, errRpnUpdateless }
 
+type RpnMultiCountryServers struct {
+	all []x.RpnServer
+}
+
+var _ x.RpnServers = (*RpnMultiCountryServers)(nil)
+
+func (s *RpnMultiCountryServers) Get(i int) (*x.RpnServer, error) {
+	if i < 0 || i >= len(s.all) {
+		return nil, fmt.Errorf("rpn: %d out of range [0, %d)", i, len(s.all))
+	}
+	return &s.all[i], nil
+}
+
+func (s *RpnMultiCountryServers) Len() int {
+	return len(s.all)
+}
+
+func (s *RpnMultiCountryServers) Json() (*x.Gobyte, error) {
+	if s == nil || len(s.all) <= 0 {
+		return nil, fmt.Errorf("rpn: no servers")
+	}
+	b, err := json.Marshal(s.all)
+	if err != nil {
+		return nil, fmt.Errorf("rpn: marshal servers: %w", err)
+	}
+	return x.BytesOf(b), nil
+}
+
 type WarpClient struct {
 	RpnCountryless
 	RpnUpdateless

intra/ipn/warp/yegor.go

@@ -792,18 +792,16 @@ func (a *WsClient) Expires() int64 {
 	return refreshAt.UnixMilli()
 }
 
-func (a *WsClient) Locations() []x.RpnServer {
+func (a *WsClient) Locations() (x.RpnServers, error) {
 	if a == nil {
-		return nil
+		return nil, errWsNoClient
 	}
 	c := a.config()
 	if c == nil {
-		log.W("ws: locations: no session")
-		return nil
+		return nil, errWsNoConfig
 	}
 	if len(c.Configs) <= 0 {
-		log.W("ws: locations: no configs")
-		return nil
+		return nil, errWsNoCcConfig
 	}
 	visited := make(map[string]bool, len(c.Configs))
 	s := make([]x.RpnServer, 0, len(c.Configs)/maxPerRegionWgConfs)
@@ -829,7 +827,7 @@ func (a *WsClient) Locations() []x.RpnServer {
 		}
 		visited[rc.CC] = true
 	}
-	return s
+	return &RpnMultiCountryServers{s}, nil
 }
 
 // Update implements x.RpnAcc.