p2p: add start timestamp, net speed and misc

.github/workflows/docker-publish.yml

@@ -112,4 +112,4 @@ jobs:
             docker stop erebrus && docker rm erebrus && docker image rm ghcr.io/netsepio/erebrus:main
             echo ${{ secrets.GHCR_TOKEN }} | docker login ghcr.io -u ${{ secrets.GHCR_USERNAME }} --password-stdin
             docker pull ghcr.io/netsepio/erebrus:main
-            docker run -d -p 9080:9080/tcp -p 51820:51820/udp --cap-add=NET_ADMIN --cap-add=SYS_MODULE --sysctl="net.ipv4.conf.all.src_valid_mark=1" --sysctl="net.ipv6.conf.all.forwarding=1" --restart unless-stopped -v /home/ubuntu/erebrus/wireguard/:/etc/wireguard/ --name erebrus --env-file .env ghcr.io/netsepio/erebrus:main
+            docker run -d -p 9080:9080/tcp -p 9002:9002/tcp -p 51820:51820/udp --cap-add=NET_ADMIN --cap-add=SYS_MODULE --sysctl="net.ipv4.conf.all.src_valid_mark=1" --sysctl="net.ipv6.conf.all.forwarding=1" --restart unless-stopped -v /home/ubuntu/erebrus/wireguard/:/etc/wireguard/ --name erebrus --env-file .env ghcr.io/netsepio/erebrus:main

p2p/discovery.go

@@ -4,11 +4,9 @@ import (
 	"context"
 	"fmt"
 	"sync"
-	"time"
 
 	dht "github.com/libp2p/go-libp2p-kad-dht"
 	"github.com/libp2p/go-libp2p/core/host"
-	"github.com/libp2p/go-libp2p/core/network"
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/libp2p/go-libp2p/p2p/discovery/routing"
 	discovery "github.com/libp2p/go-libp2p/p2p/discovery/util"
@@ -19,19 +17,7 @@ import (
 // If you don't have any bootstrapPeers, you can use dht.DefaultBootstrapPeers
 // or an empty list.
 func NewDHT(ctx context.Context, host host.Host, bootstrapPeers []multiaddr.Multiaddr) (*dht.IpfsDHT, error) {
-	var options []dht.Option
-
-	// if no bootstrap peers, make this peer act as a bootstraping node
-	// other peers can use this peers ipfs address for peer discovery via dht
-	if len(bootstrapPeers) == 0 {
-		options = append(options, dht.Mode(dht.ModeServer))
-	}
-
-	// set our DiscoveryServiceTag as the protocol prefix so we can discover
-	// peers we're interested in.
-	options = append(options, dht.ProtocolPrefix("/"+DiscoveryServiceTag))
-
-	kdht, err := dht.New(ctx, host, options...)
+	kdht, err := dht.New(ctx, host)
 	if err != nil {
 		return nil, err
 	}
@@ -58,7 +44,6 @@ func NewDHT(ctx context.Context, host host.Host, bootstrapPeers []multiaddr.Mult
 		}()
 	}
 	wg.Wait()
-
 	return kdht, nil
 }
 
@@ -68,40 +53,4 @@ func Discover(ctx context.Context, h host.Host, dht *dht.IpfsDHT, rendezvous str
 
 	// Advertise our addresses on rendezvous
 	discovery.Advertise(ctx, routingDiscovery, rendezvous)
-
-	// Search for peers every DiscoveryInterval
-	ticker := time.NewTicker(DiscoveryInterval)
-	defer ticker.Stop()
-
-	for {
-		select {
-		case <-ctx.Done():
-			return
-		case <-ticker.C:
-
-			// Search for other peers advertising on rendezvous and
-			// connect to them.
-			peers, err := discovery.FindPeers(ctx, routingDiscovery, rendezvous)
-			if err != nil {
-				panic(err)
-			}
-
-			for _, p := range peers {
-				if p.ID == h.ID() {
-					continue
-				}
-				if h.Network().Connectedness(p.ID) != network.Connected {
-					_, err = h.Network().DialPeer(ctx, p.ID)
-					if err != nil {
-						fmt.Printf("Failed to connect to peer (%s): %s", p.ID, err.Error())
-						fmt.Println()
-						h.Network().ClosePeer(p.ID)
-						h.Peerstore().ClearAddrs(p.ID)
-						continue
-					}
-					fmt.Println("Connected to peer", p.ID.String())
-				}
-			}
-		}
-	}
 }

p2p/p2p.go

@@ -20,7 +20,10 @@ const DiscoveryInterval = time.Second * 10
 // other peers.
 const DiscoveryServiceTag = "erebrus"
 
+var StartTimeStamp int64
+
 func Init() {
+	StartTimeStamp = time.Now().Unix()
 	ctx := context.Background()
 
 	// create a new libp2p Host
@@ -32,6 +35,7 @@ func Init() {
 	fullAddr := getHostAddress(ha)
 	log.Printf("I am %s\n", fullAddr)
 
+	remoteAddr := "/ip4/" + os.Getenv("HOST_IP") + "/tcp/9002/p2p/" + ha.ID().String()
 	// Create a new PubSub service using the GossipSub router.
 	ps, err := pubsub.NewGossipSub(ctx, ha)
 	if err != nil {
@@ -61,7 +65,8 @@ func Init() {
 	}
 	go func() {
 		time.Sleep(5 * time.Second)
-		node_data := node.CreateNodeStatus(fullAddr, ha.ID().String())
+		fmt.Println("sending")
+		node_data := node.CreateNodeStatus(remoteAddr, ha.ID().String(), StartTimeStamp)
 		msgBytes, err := json.Marshal(node_data)
 		if err != nil {
 			panic(err)

util/pkg/node/node.go

@@ -1,22 +1,33 @@
 package node
 
-import "os"
+import (
+	"os"
+
+	"github.com/NetSepio/erebrus/util/pkg/speedtest"
+)
 
 type NodeStatus struct {
-	Id       string `json:"id"`
-	HttpPort string `json:"httpPort"`
-	Domain   string `json:"domain"`
-	Address  string `json:"address"`
-	Region   string `json:"region"`
+	Id             string  `json:"id"`
+	HttpPort       string  `json:"httpPort"`
+	Domain         string  `json:"domain"`
+	Address        string  `json:"address"`
+	Region         string  `json:"region"`
+	DownloadSpeed  float64 `json:"downloadSpeed"`
+	UploadSpeed    float64 `json:"uploadSpeed"`
+	StartTimeStamp int64   `json:"startTimeStamp"`
 }
 
-func CreateNodeStatus(address string, id string) *NodeStatus {
+func CreateNodeStatus(address string, id string, startTimeStamp int64) *NodeStatus {
+	speedtestResult, _ := speedtest.GetSpeedtestResults()
 	nodeStatus := &NodeStatus{
-		HttpPort: os.Getenv("HTTP_PORT"),
-		Domain:   os.Getenv("DOMAIN"),
-		Address:  address,
-		Region:   os.Getenv("REGION"),
-		Id:       id,
+		HttpPort:       os.Getenv("HTTP_PORT"),
+		Domain:         os.Getenv("DOMAIN"),
+		Address:        address,
+		Region:         os.Getenv("REGION"),
+		Id:             id,
+		DownloadSpeed:  speedtestResult.DownloadSpeed,
+		UploadSpeed:    speedtestResult.UploadSpeed,
+		StartTimeStamp: startTimeStamp,
 	}
 	return nodeStatus
 }