Merge pull request #2 from MysteriumNetwork/feature/node-pings-api

API client for sending stats

cmd/mysterium_server/command_run/command.go

@@ -4,16 +4,18 @@ import (
 	"github.com/mysterium/node/ipify"
 	"github.com/mysterium/node/openvpn"
 	"github.com/mysterium/node/server"
+	"github.com/mysterium/node/server/dto"
 	"io"
+	"time"
 )
 
 type commandRun struct {
 	output      io.Writer
 	outputError io.Writer
 
-	ipifyClient ipify.Client
+	ipifyClient     ipify.Client
 	mysteriumClient server.Client
-	vpnServer *openvpn.Server
+	vpnServer       *openvpn.Server
 }
 
 func (cmd *commandRun) Run(options CommandOptions) error {
@@ -38,6 +40,13 @@ func (cmd *commandRun) Run(options CommandOptions) error {
 		return err
 	}
 
+	go func() {
+		for {
+			time.Sleep(1 * time.Minute)
+			cmd.mysteriumClient.NodeSendStats(options.NodeKey, []dto.SessionStats{})
+		}
+	}()
+
 	vpnServerConfig := openvpn.NewServerConfig(
 		"10.8.0.0", "255.255.255.0",
 		options.DirectoryConfig+"/ca.crt",
@@ -61,4 +70,4 @@ func (cmd *commandRun) Wait() error {
 
 func (cmd *commandRun) Kill() {
 	cmd.vpnServer.Stop()
-}
+}

server/client_fake.go

@@ -3,8 +3,8 @@ package server
 import (
 	"github.com/mysterium/node/server/dto"
 
-	log "github.com/cihub/seelog"
 	"fmt"
+	log "github.com/cihub/seelog"
 )
 
 func NewClientFake() Client {
@@ -24,15 +24,21 @@ func (client *clientFake) NodeRegister(nodeKey, connectionConfig string) (err er
 	return nil
 }
 
+func (client *clientFake) NodeSendStats(nodeKey string, sessionStats []dto.SessionStats) (err error) {
+	log.Info(MYSTERIUM_API_LOG_PREFIX, "Node stats sent: ", nodeKey)
+
+	return nil
+}
+
 func (client *clientFake) SessionCreate(nodeKey string) (session dto.Session, err error) {
 	if connectionConfig, ok := client.connectionConfigByNode[nodeKey]; ok {
 		session = dto.Session{
-			Id: nodeKey + "-session",
+			Id:               nodeKey + "-session",
 			ConnectionConfig: connectionConfig,
 		}
 		return
 	}
 
 	err = fmt.Errorf("Fake node not found: %s", nodeKey)
 	return
-}
+}

server/client_rest.go

@@ -55,6 +55,19 @@ func (client *clientRest) NodeRegister(nodeKey, connectionConfig string) (err er
 	return
 }
 
+func (client *clientRest) NodeSendStats(nodeKey string, sessionList []dto.SessionStats) (err error) {
+	response, err := client.doRequest("POST", "node_send_stats", dto.NodeStatsRequest{
+		NodeKey:  nodeKey,
+		Sessions: sessionList,
+	})
+	if err == nil {
+		defer response.Body.Close()
+		log.Info(MYSTERIUM_API_LOG_PREFIX, "Node stats sent: ", nodeKey)
+	}
+
+	return nil
+}
+
 func (client *clientRest) doRequest(method string, path string, payload interface{}) (*http.Response, error) {
 	payloadJson, err := json.Marshal(payload)
 	if err != nil {

server/dto/node_stats_request.go

@@ -0,0 +1,6 @@
+package dto
+
+type NodeStatsRequest struct {
+	NodeKey  string         `json:"node_key"`
+	Sessions []SessionStats `json:"sessions"`
+}

server/dto/session_stats.go

@@ -0,0 +1,7 @@
+package dto
+
+type SessionStats struct {
+	Id            string `json:"session_key"`
+	BytesSent     int    `json:"bytes_sent"`
+	BytesReceived int    `json:"bytes_received"`
+}

server/interface.go

@@ -4,5 +4,6 @@ import "github.com/mysterium/node/server/dto"
 
 type Client interface {
 	NodeRegister(nodeKey, connectionConfig string) (err error)
+	NodeSendStats(nodeKey string, sessionStats []dto.SessionStats) (err error)
 	SessionCreate(nodeKey string) (session dto.Session, err error)
-}
+}