add uptime tracker code from skywire-ut develop branch

cmd/uptime-tracker/commands/root.go

@@ -12,6 +12,13 @@ import (
 	"github.com/skycoin/dmsg/pkg/direct"
 	"github.com/skycoin/dmsg/pkg/dmsg"
 	"github.com/skycoin/dmsg/pkg/dmsghttp"
+	"github.com/skycoin/skywire-ut/internal/pg"
+	"github.com/skycoin/skywire-ut/internal/utmetrics"
+	"github.com/skycoin/skywire-ut/pkg/uptime-tracker/api"
+	"github.com/skycoin/skywire-ut/pkg/uptime-tracker/store"
+	"github.com/spf13/cobra"
+	"gorm.io/gorm"
+
 	"github.com/skycoin/skywire-utilities/pkg/buildinfo"
 	"github.com/skycoin/skywire-utilities/pkg/cipher"
 	"github.com/skycoin/skywire-utilities/pkg/cmdutil"
@@ -21,13 +28,6 @@ import (
 	"github.com/skycoin/skywire-utilities/pkg/metricsutil"
 	"github.com/skycoin/skywire-utilities/pkg/storeconfig"
 	"github.com/skycoin/skywire-utilities/pkg/tcpproxy"
-	"github.com/spf13/cobra"
-	"gorm.io/gorm"
-
-	"github.com/skycoin/skywire-services/internal/pg"
-	"github.com/skycoin/skywire-services/internal/utmetrics"
-	"github.com/skycoin/skywire-services/pkg/uptime-tracker/api"
-	"github.com/skycoin/skywire-services/pkg/uptime-tracker/store"
 )
 
 const (
@@ -53,7 +53,6 @@ var (
 	dmsgDisc          string
 	sk                cipher.SecKey
 	dmsgPort          uint16
-	dmsgServerType    string
 	storeDataCutoff   int
 	storeDataPath     string
 )
@@ -77,7 +76,6 @@ func init() {
 	rootCmd.Flags().StringVar(&dmsgDisc, "dmsg-disc", "http://dmsgd.skywire.skycoin.com", "url of dmsg-discovery")
 	rootCmd.Flags().Var(&sk, "sk", "dmsg secret key")
 	rootCmd.Flags().Uint16Var(&dmsgPort, "dmsgPort", dmsg.DefaultDmsgHTTPPort, "dmsg port value\r")
-	rootCmd.Flags().StringVar(&dmsgServerType, "dmsg-server-type", "", "type of dmsg server on dmsghttp handler")
 }
 
 var rootCmd = &cobra.Command{
@@ -180,15 +178,14 @@ var rootCmd = &cobra.Command{
 		}()
 
 		if !pk.Null() {
-			servers := dmsghttp.GetServers(ctx, dmsgDisc, dmsgServerType, logger)
+			servers := dmsghttp.GetServers(ctx, dmsgDisc, logger)
 
 			var keys cipher.PubKeys
 			keys = append(keys, pk)
 			dClient := direct.NewClient(direct.GetAllEntries(keys, servers), logger)
 			config := &dmsg.Config{
-				MinSessions:          0, // listen on all available servers
-				UpdateInterval:       dmsg.DefaultUpdateInterval,
-				ConnectedServersType: dmsgServerType,
+				MinSessions:    0, // listen on all available servers
+				UpdateInterval: dmsg.DefaultUpdateInterval,
 			}
 
 			dmsgDC, closeDmsgDC, err := direct.StartDmsg(ctx, logger, pk, sk, dClient, config)
@@ -205,7 +202,7 @@ var rootCmd = &cobra.Command{
 				}
 			}()
 
-			go dmsghttp.UpdateServers(ctx, dClient, dmsgDisc, dmsgDC, dmsgServerType, logger)
+			go dmsghttp.UpdateServers(ctx, dClient, dmsgDisc, dmsgDC, logger)
 
 			go func() {
 				if err := dmsghttp.ListenAndServe(ctx, sk, utAPI, dClient, dmsg.DefaultDmsgHTTPPort, dmsgDC, logger); err != nil {

cmd/uptime-tracker/uptime-tracker.go

@@ -2,7 +2,7 @@
 package main
 
 import (
-	"github.com/skycoin/skywire-services/cmd/uptime-tracker/commands"
+	"github.com/skycoin/skywire-ut/cmd/uptime-tracker/commands"
 )
 
 func main() {

internal/armetrics/victoria_metrics.go

@@ -1,6 +1,8 @@
 package armetrics
 
-import "github.com/skycoin/skywire-utilities/pkg/metricsutil"
+import (
+	"github.com/skycoin/skywire-utilities/pkg/metricsutil"
+)
 
 // VictoriaMetrics implements `Metrics` using `VictoriaMetrics`.
 type VictoriaMetrics struct {

internal/config/default_environments_test.go

@@ -1,6 +1,8 @@
 package config
 
-import "fmt"
+import (
+	"fmt"
+)
 
 func ExampleEnvConfig_AddThreeChatVisors() {
 	globalEnv := &EnvConfig{

internal/config/runners.go

@@ -1,6 +1,8 @@
 package config
 
-import "fmt"
+import (
+	"fmt"
+)
 
 const (
 	// DockerRedisCmdTemplate is a template for running dockerized redis

internal/lc/data.go

@@ -1,7 +1,9 @@
 // Package lc internal/lc/data.go
 package lc
 
-import "github.com/skycoin/skywire-utilities/pkg/httputil"
+import (
+	"github.com/skycoin/skywire-utilities/pkg/httputil"
+)
 
 // ServiceSummary summary of a visor connection
 type ServiceSummary struct {

internal/nmmetrics/victoria_metrics.go

@@ -1,6 +1,8 @@
 package nmmetrics
 
-import "github.com/skycoin/skywire-utilities/pkg/metricsutil"
+import (
+	"github.com/skycoin/skywire-utilities/pkg/metricsutil"
+)
 
 // VictoriaMetrics implements `Metrics` using `VictoriaMetrics`.
 type VictoriaMetrics struct {

internal/tpdiscmetrics/empty.go

@@ -1,7 +1,9 @@
 // Package tpdiscmetrics internal/tpdiscmetrics/empty.go
 package tpdiscmetrics
 
-import "github.com/skycoin/skywire/pkg/transport/network"
+import (
+	"github.com/skycoin/skywire/pkg/transport/network"
+)
 
 // NewEmpty constructs new empty metrics.
 func NewEmpty() Empty {

internal/tpdiscmetrics/metrics.go

@@ -1,6 +1,8 @@
 package tpdiscmetrics
 
-import "github.com/skycoin/skywire/pkg/transport/network"
+import (
+	"github.com/skycoin/skywire/pkg/transport/network"
+)
 
 // Metrics collects metrics for metrics tracking system.
 type Metrics interface {

internal/utmetrics/victoria_metrics.go

@@ -1,6 +1,8 @@
 package utmetrics
 
-import "github.com/skycoin/skywire-utilities/pkg/metricsutil"
+import (
+	"github.com/skycoin/skywire-utilities/pkg/metricsutil"
+)
 
 // VictoriaMetrics implements `Metrics` using `VictoriaMetrics`.
 type VictoriaMetrics struct {

internal/vpn/client_config.go

@@ -1,6 +1,8 @@
 package vpn
 
-import "github.com/skycoin/skywire-utilities/pkg/cipher"
+import (
+	"github.com/skycoin/skywire-utilities/pkg/cipher"
+)
 
 // ClientConfig is a configuration for VPN client.
 type ClientConfig struct {

internal/vpn/handshake_status.go

@@ -1,6 +1,8 @@
 package vpn
 
-import "errors"
+import (
+	"errors"
+)
 
 // HandshakeStatus is a status of Client/Server handshake.
 type HandshakeStatus int

internal/vpn/hello.go

@@ -1,6 +1,8 @@
 package vpn
 
-import "net"
+import (
+	"net"
+)
 
 // ClientHello is a message sent by client during the Client/Server handshake.
 type ClientHello struct {

internal/vpn/tun_device.go

@@ -1,6 +1,8 @@
 package vpn
 
-import "io"
+import (
+	"io"
+)
 
 // TUNDevice is a wrapper for TUN interface.
 type TUNDevice interface {

pkg/uptime-tracker/api/api.go

@@ -21,6 +21,9 @@ import (
 	"github.com/go-echarts/go-echarts/v2/charts"
 	"github.com/go-echarts/go-echarts/v2/opts"
 	"github.com/sirupsen/logrus"
+	"github.com/skycoin/skywire-ut/internal/utmetrics"
+	"github.com/skycoin/skywire-ut/pkg/uptime-tracker/store"
+
 	"github.com/skycoin/skywire-utilities/pkg/buildinfo"
 	"github.com/skycoin/skywire-utilities/pkg/cipher"
 	"github.com/skycoin/skywire-utilities/pkg/geo"
@@ -29,9 +32,6 @@ import (
 	"github.com/skycoin/skywire-utilities/pkg/logging"
 	"github.com/skycoin/skywire-utilities/pkg/metricsutil"
 	"github.com/skycoin/skywire-utilities/pkg/netutil"
-
-	"github.com/skycoin/skywire-services/internal/utmetrics"
-	"github.com/skycoin/skywire-services/pkg/uptime-tracker/store"
 )
 
 const (

pkg/uptime-tracker/api/api_test.go

@@ -10,15 +10,15 @@ import (
 	"net/http/httptest"
 	"testing"
 
+	"github.com/skycoin/skywire-ut/internal/utmetrics"
+	"github.com/skycoin/skywire-ut/pkg/uptime-tracker/store"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
 	"github.com/skycoin/skywire-utilities/pkg/cipher"
 	"github.com/skycoin/skywire-utilities/pkg/geo"
 	"github.com/skycoin/skywire-utilities/pkg/httpauth"
 	"github.com/skycoin/skywire-utilities/pkg/storeconfig"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	"github.com/skycoin/skywire-services/internal/utmetrics"
-	"github.com/skycoin/skywire-services/pkg/uptime-tracker/store"
 )
 
 var testPubKey, testSec = cipher.GenerateKeyPair()

pkg/uptime-tracker/store/memory_store_test.go

@@ -9,9 +9,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/skycoin/skywire-utilities/pkg/cipher"
 	"github.com/skycoin/skywire-utilities/pkg/geo"
-	"github.com/stretchr/testify/require"
 )
 
 func TestMemory(t *testing.T) {

pkg/uptime-tracker/store/postgres_store.go

@@ -8,9 +8,10 @@ import (
 	"sync"
 	"time"
 
+	"gorm.io/gorm"
+
 	"github.com/skycoin/skywire-utilities/pkg/geo"
 	"github.com/skycoin/skywire-utilities/pkg/logging"
-	"gorm.io/gorm"
 )
 
 type postgresStore struct {

pkg/uptime-tracker/store/store.go

@@ -3,9 +3,10 @@ package store
 import (
 	"time"
 
+	"gorm.io/gorm"
+
 	"github.com/skycoin/skywire-utilities/pkg/geo"
 	"github.com/skycoin/skywire-utilities/pkg/logging"
-	"gorm.io/gorm"
 )
 
 const (