Merge develop into master

.github/workflows/test.yml

@@ -7,15 +7,13 @@ jobs:
       - name: Setup golang
         uses: actions/setup-go@v3
         with:
-          go-version: 1.19.x
+          go-version: 1.21.x
       - name: Check out code
         uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
       - name: Install Requirements
         run: |
           GO111MODULES=off; go mod vendor
-          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.50.1
+          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.55.2
       - name: Setup SSH Key Build and run e2e
         run : |
           make e2e-build

.golangci.yml

@@ -163,7 +163,6 @@ linters:
     - megacheck
     - misspell
     - nakedret
-    - depguard
   enable-all: false
   disable:
   disable-all: true

Makefile

@@ -14,7 +14,7 @@ DATE := $(shell date -u $(RFC_3339))
 COMMIT := $(shell git rev-list -1 HEAD)
 
 OPTS?=GO111MODULE=on
-DOCKER_OPTS?=GO111MODULE=on GOOS=linux # go options for compiling for docker container
+DOCKER_OPTS?=GO111MODULE=on GOOS=linux
 DOCKER_NETWORK?=SKYWIRE
 DOCKER_COMPOSE_FILE:=./docker/docker-compose.yml
 DOCKER_REGISTRY:=skycoin
@@ -45,78 +45,32 @@ export REGISTRY=${DOCKER_REGISTRY}
 ## : ## _ [Prepare code]
 
 dep: ## Sorts dependencies
+	@command -v yarn >/dev/null 2>&1 && yarn --cwd ./pkg/node-visualizer/web install || true
 #	GO111MODULE=on GOPRIVATE=github.com/skycoin/* go get -v github.com/skycoin/skywire@master
-	GO111MODULE=on GOPRIVATE=github.com/skycoin/* go mod vendor -v
-	yarn --cwd ./pkg/node-visualizer/web install
+#	GO111MODULE=on GOPRIVATE=github.com/skycoin/* go mod vendor -v
 
 format: dep ## Formats the code. Must have goimports and goimports-reviser installed (use make install-linters).
-	goimports -w -local github.com/skycoin/skywire-services ./pkg
-	goimports -w -local github.com/skycoin/skywire-services ./cmd
-	goimports -w -local github.com/skycoin/skywire-services ./internal
-	find . -type f -name '*.go' -not -path "./vendor/*" -exec goimports-reviser -project-name ${PROJECT_BASE} {} \;
+	goimports -w -local github.com/skycoin/skywire-services ./pkg ./cmd ./internal
+	find . -type f -name '*.go' -not -path "./.git/*" -not -path "./vendor/*"  -exec goimports-reviser -project-name ${PROJECT_BASE} {} \;
 
 ## : ## _ [Build, install, clean]
 
 build: dep ## Build binaries
-	${OPTS} go build ${BUILD_OPTS} -o ./bin/route-finder ./cmd/route-finder
-	${OPTS} go build ${BUILD_OPTS} -o ./bin/setup-node ./cmd/setup-node
-	${OPTS} go build ${BUILD_OPTS} -o ./bin/transport-discovery ./cmd/transport-discovery
-	${OPTS} go build ${BUILD_OPTS} -o ./bin/address-resolver ./cmd/address-resolver
-	${OPTS} go build ${BUILD_OPTS} -o ./bin/sw-env ./cmd/sw-env
-	${OPTS} go build ${BUILD_OPTS} -o ./bin/keys-gen ./cmd/keys-gen
-	${OPTS} go build ${BUILD_OPTS} -o ./bin/network-monitor ./cmd/network-monitor
-	${OPTS} go build ${BUILD_OPTS} -o ./apps/vpn-client ./cmd/vpn-lite-client
-	${OPTS} go build ${BUILD_OPTS} -o ./bin/transport-setup ./cmd/transport-setup
-	${OPTS} go build ${BUILD_OPTS} -o ./bin/config-bootstrapper ./cmd/config-bootstrapper
-	${OPTS} go build ${BUILD_OPTS} -o ./bin/liveness-checker ./cmd/liveness-checker
-	${OPTS} go build ${BUILD_OPTS} -o ./bin/dmsg-monitor ./cmd/dmsg-monitor
-	${OPTS} go build ${BUILD_OPTS} -o ./bin/tpd-monitor ./cmd/tpd-monitor
-	${OPTS} go build ${BUILD_OPTS} -o ./bin/vpn-monitor ./cmd/vpn-monitor
-	${OPTS} go build ${BUILD_OPTS} -o ./bin/public-visor-monitor ./cmd/public-visor-monitor
+	${OPTS} go build ${BUILD_OPTS} -o ./bin/skywire-services ./cmd/skywire-services
+
 	# yarn --cwd ./pkg/node-visualizer/web build
 	# rm -rf ./pkg/node-visualizer/api/build/static
 	# mv ./pkg/node-visualizer/web/build/* ./pkg/node-visualizer/api/build
 	# ${OPTS} go build ${BUILD_OPTS} -o ./bin/node-visualizer ./cmd/node-visualizer
 
 build-deploy: ## Build for deployment Docker images
-	go build ${BUILD_OPTS_DEPLOY} -mod=vendor -o /release/address-resolver ./cmd/address-resolver
-	go build ${BUILD_OPTS_DEPLOY} -mod=vendor -o /release/route-finder ./cmd/route-finder
-	go build ${BUILD_OPTS_DEPLOY} -mod=vendor -o /release/setup-node ./cmd/setup-node
-	go build ${BUILD_OPTS_DEPLOY} -mod=vendor -o /release/transport-discovery ./cmd/transport-discovery
-	go build ${BUILD_OPTS_DEPLOY} -mod=vendor -o /release/network-monitor ./cmd/network-monitor
-	go build ${BUILD_OPTS_DEPLOY} -mod=vendor -o /release/vpn-client ./cmd/vpn-lite-client
-	go build ${BUILD_OPTS_DEPLOY} -mod=vendor -o /release/transport-setup ./cmd/transport-setup
-	go build ${BUILD_OPTS_DEPLOY} -mod=vendor -o /release/node-visualizer ./cmd/node-visualizer
-	go build ${BUILD_OPTS_DEPLOY} -mod=vendor -o /release/dmsg-monitor ./cmd/dmsg-monitor
-	go build ${BUILD_OPTS_DEPLOY} -mod=vendor -o /release/tpd-monitor ./cmd/tpd-monitor
-	go build ${BUILD_OPTS_DEPLOY} -mod=vendor -o /release/vpn-monitor ./cmd/vpn-monitor
-	go build ${BUILD_OPTS_DEPLOY} -mod=vendor -o /release/public-visor-monitor ./cmd/public-visor-monitor
+	${DOCKER_OPTS} go build ${BUILD_OPTS_DEPLOY} -mod=vendor -o ./release/skywire-services ./cmd/skywire-services
 
 build-race: dep ## Build binaries
-	${OPTS} go build ${BUILD_OPTS} -race -o ./bin/route-finder ./cmd/route-finder
-	${OPTS} go build ${BUILD_OPTS} -race -o ./bin/setup-node ./cmd/setup-node
-	${OPTS} go build ${BUILD_OPTS} -race -o ./bin/transport-discovery ./cmd/transport-discovery
-	${OPTS} go build ${BUILD_OPTS} -race -o ./bin/address-resolver ./cmd/address-resolver
-	${OPTS} go build ${BUILD_OPTS} -race -o ./bin/sw-env ./cmd/sw-env
-	${OPTS} go build ${BUILD_OPTS} -race -o ./bin/keys-gen ./cmd/keys-gen
-	${OPTS} go build ${BUILD_OPTS} -race -o ./bin/network-monitor ./cmd/network-monitor
-	${OPTS} go build ${BUILD_OPTS} -race -o ./bin/vpn-client ./cmd/vpn-lite-client
-	${OPTS} go build ${BUILD_OPTS} -race -o ./bin/transport-setup ./cmd/transport-setup
-	${OPTS} go build ${BUILD_OPTS} -race -o ./bin/node-visualizer ./cmd/node-visualizer
-	${OPTS} go build ${BUILD_OPTS} -race -o ./bin/dmsg-monitor ./cmd/dmsg-monitor
-	${OPTS} go build ${BUILD_OPTS} -race -o ./bin/tpd-monitor ./cmd/tpd-monitor
-	${OPTS} go build ${BUILD_OPTS} -race -o ./bin/vpn-monitor ./cmd/vpn-monitor
-	${OPTS} go build ${BUILD_OPTS} -race -o ./bin/public-visor-monitor ./cmd/public-visor-monitor
+	${OPTS} go build ${BUILD_OPTS} -race -o ./bin/skywire-services ./cmd/skywire-services
 
 install: ## Install route-finder, transport-discovery, address-resolver, sw-env, keys-gen, network-monitor, node-visualizer
-	${OPTS} go install ${BUILD_OPTS} \
-		./cmd/route-finder \
-		./cmd/transport-discovery \
-		./cmd/address-resolver \
-		./cmd/sw-env \
-		./cmd/keys-gen \
-		./cmd/network-monitor \
-		./cmd/node-visualizer
+	${OPTS} go install ${BUILD_OPTS} ./cmd/skywire-services
 
 clean: ## Clean compiled binaries
 	rm -rf bin
@@ -188,9 +142,15 @@ e2e-help: ## E2E. Show env-vars and useful commands
 	@echo -e "   docker-compose up/down/start/stop"
 	@echo -e "\nConsult with:\n\n   docker-compose help\n"
 
+docker-build-test:
+	bash ./docker/docker_build.sh test ${BUILD_OPTS_DEPLOY}
+
+docker-build:
+	bash ./docker/docker_build.sh prod ${BUILD_OPTS_DEPLOY}
+
 docker-push-test:
 	bash ./docker/docker_build.sh test ${BUILD_OPTS_DEPLOY}
-	# bash ./docker/docker_push.sh test
+	bash ./docker/docker_push.sh test
 
 docker-push:
 	bash ./docker/docker_build.sh prod ${BUILD_OPTS_DEPLOY}
@@ -236,10 +196,5 @@ vendor-integration-check: ## Check compatibility of master@skywire-services with
 
 ## : ## _ [Other]
 
-run-syslog: ## Run syslog-ng in docker. Logs are mounted under /tmp/syslog
-	-mkdir -p /tmp/syslog
-	-docker container rm syslog-ng -f
-	docker run -d -p 514:514/udp  -v /tmp/syslog:/var/log  --name syslog-ng balabit/syslog-ng:latest
-
 help:
 	@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$|^##.*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'

README.md

@@ -10,6 +10,7 @@
 - Setup Node (SN)
 - Service Discovery (SD)
 - Address Resolver (AR)
+- Uptime Tracker (UT)
 
 ## Running the services locally
 
@@ -71,3 +72,4 @@ Check the [docs](docs/Deployments.md) for more documentation on the deployments.
 - [Dmsg Discovery](https://github.com/skycoin/dmsg/blob/develop/cmd/dmsg-discovery/README.md)
 - [Dmsg Server](https://github.com/skycoin/dmsg/blob/develop/cmd/dmsg-server/README.md)
 - [Service Discovery](https://github.com/skycoin/skycoin-service-discovery/blob/master/README.md#http-api)
+- [Uptime Tracker](cmd/uptime-tracker/README.md)

cmd/address-resolver/address-resolver.go

@@ -2,9 +2,40 @@
 package main
 
 import (
+	cc "github.com/ivanpirog/coloredcobra"
+	"github.com/spf13/cobra"
+
 	"github.com/skycoin/skywire-services/cmd/address-resolver/commands"
 )
 
+func init() {
+	commands.RootCmd.SetUsageTemplate(help)
+	commands.RootCmd.SetHelpCommand(&cobra.Command{Hidden: true})
+	commands.RootCmd.PersistentFlags().MarkHidden("help") //nolint
+}
+
 func main() {
+	cc.Init(&cc.Config{
+		RootCmd:         commands.RootCmd,
+		Headings:        cc.HiBlue + cc.Bold,
+		Commands:        cc.HiBlue + cc.Bold,
+		CmdShortDescr:   cc.HiBlue,
+		Example:         cc.HiBlue + cc.Italic,
+		ExecName:        cc.HiBlue + cc.Bold,
+		Flags:           cc.HiBlue + cc.Bold,
+		FlagsDescr:      cc.HiBlue,
+		NoExtraNewlines: true,
+		NoBottomNewline: true,
+	})
 	commands.Execute()
 }
+
+const help = "Usage:\r\n" +
+	"  {{.UseLine}}{{if .HasAvailableSubCommands}}{{end}} {{if gt (len .Aliases) 0}}\r\n\r\n" +
+	"{{.NameAndAliases}}{{end}}{{if .HasAvailableSubCommands}}\r\n\r\n" +
+	"Available Commands:{{range .Commands}}{{if (or .IsAvailableCommand)}}\r\n  " +
+	"{{rpad .Name .NamePadding }} {{.Short}}{{end}}{{end}}{{end}}{{if .HasAvailableLocalFlags}}\r\n\r\n" +
+	"Flags:\r\n" +
+	"{{.LocalFlags.FlagUsages | trimTrailingWhitespaces}}{{end}}{{if .HasAvailableInheritedFlags}}\r\n\r\n" +
+	"Global Flags:\r\n" +
+	"{{.InheritedFlags.FlagUsages | trimTrailingWhitespaces}}{{end}}\r\n\r\n"

cmd/address-resolver/commands/root.go

@@ -5,12 +5,12 @@ import (
 	"context"
 	"fmt"
 	"log"
-	"log/syslog"
 	"os"
+	"path/filepath"
 	"strings"
+	"time"
 
 	cc "github.com/ivanpirog/coloredcobra"
-	logrussyslog "github.com/sirupsen/logrus/hooks/syslog"
 	"github.com/skycoin/dmsg/pkg/direct"
 	"github.com/skycoin/dmsg/pkg/dmsg"
 	"github.com/skycoin/dmsg/pkg/dmsghttp"
@@ -41,7 +41,6 @@ var (
 	metricsAddr     string
 	redisURL        string
 	redisPoolSize   int
-	syslogAddr      string
 	tag             string
 	logLvl          string
 	testing         bool
@@ -53,33 +52,42 @@ var (
 )
 
 func init() {
-	rootCmd.Flags().StringVarP(&addr, "addr", "a", ":9093", "address to bind to\033[0m")
-	rootCmd.Flags().StringVarP(&metricsAddr, "metrics", "m", "", "address to bind metrics API to\033[0m")
-	rootCmd.Flags().StringVar(&redisURL, "redis", "redis://localhost:6379", "connections string for a redis store\033[0m")
-	rootCmd.Flags().IntVar(&redisPoolSize, "redis-pool-size", 10, "redis connection pool size\033[0m")
-	rootCmd.Flags().StringVarP(&logLvl, "loglvl", "l", "info", "set log level one of: info, error, warn, debug, trace, panic")
-	rootCmd.Flags().StringVar(&syslogAddr, "syslog", "", "syslog server address. E.g. localhost:514\033[0m")
-	rootCmd.Flags().StringVar(&tag, "tag", "address_resolver", "logging tag\033[0m")
-	rootCmd.Flags().BoolVarP(&testing, "testing", "t", false, "enable testing to start without redis\033[0m")
-	rootCmd.Flags().StringVar(&dmsgDisc, "dmsg-disc", "http://dmsgd.skywire.skycoin.com", "url of dmsg-discovery\033[0m")
-	rootCmd.Flags().StringVar(&whitelistKeys, "whitelist-keys", "", "list of whitelisted keys of network monitor used for deregistration\033[0m")
-	rootCmd.Flags().BoolVar(&testEnvironment, "test-environment", false, "distinguished between prod and test environment\033[0m")
-	rootCmd.Flags().Var(&sk, "sk", "dmsg secret key\r")
-	rootCmd.Flags().Uint16Var(&dmsgPort, "dmsgPort", dmsg.DefaultDmsgHTTPPort, "dmsg port value\r")
+	RootCmd.Flags().StringVarP(&addr, "addr", "a", ":9093", "address to bind to\033[0m")
+	RootCmd.Flags().StringVarP(&metricsAddr, "metrics", "m", "", "address to bind metrics API to\033[0m")
+	RootCmd.Flags().StringVar(&redisURL, "redis", "redis://localhost:6379", "connections string for a redis store\033[0m")
+	RootCmd.Flags().IntVar(&redisPoolSize, "redis-pool-size", 10, "redis connection pool size\033[0m")
+	RootCmd.Flags().StringVarP(&logLvl, "loglvl", "l", "info", "set log level one of: info, error, warn, debug, trace, panic")
+	RootCmd.Flags().StringVar(&tag, "tag", "address_resolver", "logging tag\033[0m")
+	RootCmd.Flags().BoolVarP(&testing, "testing", "t", false, "enable testing to start without redis\033[0m")
+	RootCmd.Flags().StringVar(&dmsgDisc, "dmsg-disc", "http://dmsgd.skywire.skycoin.com", "url of dmsg-discovery\033[0m")
+	RootCmd.Flags().StringVar(&whitelistKeys, "whitelist-keys", "", "list of whitelisted keys of network monitor used for deregistration\033[0m")
+	RootCmd.Flags().BoolVar(&testEnvironment, "test-environment", false, "distinguished between prod and test environment\033[0m")
+	RootCmd.Flags().Var(&sk, "sk", "dmsg secret key\r")
+	RootCmd.Flags().Uint16Var(&dmsgPort, "dmsgPort", dmsg.DefaultDmsgHTTPPort, "dmsg port value\r")
 	var helpflag bool
-	rootCmd.SetUsageTemplate(help)
-	rootCmd.PersistentFlags().BoolVarP(&helpflag, "help", "h", false, "help for "+rootCmd.Use)
-	rootCmd.SetHelpCommand(&cobra.Command{Hidden: true})
-	rootCmd.PersistentFlags().MarkHidden("help") //nolint
+	RootCmd.SetUsageTemplate(help)
+	RootCmd.PersistentFlags().BoolVarP(&helpflag, "help", "h", false, "help for address-resolver")
+	RootCmd.SetHelpCommand(&cobra.Command{Hidden: true})
+	RootCmd.PersistentFlags().MarkHidden("help") //nolint
 }
 
-var rootCmd = &cobra.Command{
-	Use:   "address-resolver",
+// RootCmd contains the root command
+var RootCmd = &cobra.Command{
+	Use: func() string {
+		return strings.Split(filepath.Base(strings.ReplaceAll(strings.ReplaceAll(fmt.Sprintf("%v", os.Args), "[", ""), "]", "")), " ")[0]
+	}(),
 	Short: "Address Resolver Server for skywire",
 	Long: `
 	┌─┐┌┬┐┌┬┐┬─┐┌─┐┌─┐┌─┐   ┬─┐┌─┐┌─┐┌─┐┬ ┬  ┬┌─┐┬─┐
 	├─┤ ││ ││├┬┘├┤ └─┐└─┐───├┬┘├┤ └─┐│ ││ └┐┌┘├┤ ├┬┘
-	┴ ┴─┴┘─┴┘┴└─└─┘└─┘└─┘   ┴└─└─┘└─┘└─┘┴─┘└┘ └─┘┴└─`,
+	┴ ┴─┴┘─┴┘┴└─└─┘└─┘└─┘   ┴└─└─┘└─┘└─┘┴─┘└┘ └─┘┴└─
+
+depends: redis
+
+Note: the specified port must be accessible from the internet ip address or port forwarded for udp
+skywire cli config gen-keys > ar-config.json
+skywire svc ar --addr ":9093" --redis "redis://localhost:6379" --sk $(tail -n1 ar-config.json)
+`,
 	SilenceErrors:         true,
 	SilenceUsage:          true,
 	DisableSuggestions:    true,
@@ -145,14 +153,6 @@ var rootCmd = &cobra.Command{
 			logger.WithError(err).Warn("No SecKey found. Skipping serving on dmsghttp.")
 		}
 
-		if syslogAddr != "" {
-			hook, err := logrussyslog.NewSyslogHook("udp", syslogAddr, syslog.LOG_INFO, tag)
-			if err != nil && logger != nil {
-				logger.Fatalf("Unable to connect to syslog daemon on %v", syslogAddr)
-			}
-			logging.AddHook(hook)
-		}
-
 		metricsutil.ServeHTTPMetrics(logger, metricsAddr)
 
 		var m armetrics.Metrics
@@ -206,10 +206,17 @@ var rootCmd = &cobra.Command{
 
 			defer closeDmsgDC()
 
+			go func() {
+				for {
+					arAPI.DmsgServers = dmsgDC.ConnectedServersPK()
+					time.Sleep(time.Second)
+				}
+			}()
+
 			go dmsghttp.UpdateServers(ctx, dClient, dmsgDisc, dmsgDC, logger)
 
 			go func() {
-				if err := dmsghttp.ListenAndServe(ctx, pk, sk, arAPI, dClient, dmsg.DefaultDmsgHTTPPort, config, dmsgDC, logger); err != nil {
+				if err := dmsghttp.ListenAndServe(ctx, sk, arAPI, dClient, dmsg.DefaultDmsgHTTPPort, dmsgDC, logger); err != nil {
 					logger.Errorf("dmsghttp.ListenAndServe: %v", err)
 					cancel()
 				}
@@ -225,7 +232,7 @@ var rootCmd = &cobra.Command{
 // Execute executes root CLI command.
 func Execute() {
 	cc.Init(&cc.Config{
-		RootCmd:       rootCmd,
+		RootCmd:       RootCmd,
 		Headings:      cc.HiBlue + cc.Bold, //+ cc.Underline,
 		Commands:      cc.HiBlue + cc.Bold,
 		CmdShortDescr: cc.HiBlue,
@@ -237,7 +244,7 @@ func Execute() {
 		NoExtraNewlines: true,
 		NoBottomNewline: true,
 	})
-	if err := rootCmd.Execute(); err != nil {
+	if err := RootCmd.Execute(); err != nil {
 		log.Fatal("Failed to execute command: ", err)
 
 	}