Develop

.golangci.yml

@@ -71,7 +71,7 @@ linters-settings:
     #  2. you use go >= 1.10
     #  3. you do repeated runs (false for CI) or cache $GOPATH/pkg or `go env GOCACHE` dir in CI.
     use-installed-packages: false
-  golint:
+  revive:
     # minimal confidence for issues, default is 0.8
     min-confidence: 0.8
   gofmt:
@@ -139,7 +139,7 @@ linters-settings:
 
 linters:
   enable:
-    - golint
+    - revive
     - goimports
     - varcheck
     - unparam

.travis.yml

@@ -1,8 +1,8 @@
 language: go
 go:
   # - "1.11.x" At minimum the code should run make check on the latest two go versions in the default linux environment provided by Travis.
-  - "1.14.x"
-  
+  - "1.16.x"
+
 dist: xenial
 
 matrix:
@@ -15,8 +15,21 @@ matrix:
 
 install:
   - go get -u github.com/FiloSottile/vendorcheck
-  - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $GOPATH/bin v1.31.0
+  - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $GOPATH/bin v1.40.1
   - go mod vendor
 
 script:
   - make check
+
+deploy:
+  - provider: script
+    script: bash ./docker/scripts/docker-push.sh -t "$TRAVIS_BRANCH" -p
+    on:
+      branch: master
+      condition: $TRAVIS_PULL_REQUEST = false
+  - provider: script
+    script: bash ./docker/scripts/docker-push.sh -t "$TRAVIS_BRANCH" -p
+    on:
+      branch: develop
+      condition: $TRAVIS_PULL_REQUEST = false
+

Makefile

@@ -1,3 +1,5 @@
+SHELL := /bin/bash
+
 .DEFAULT_GOAL := help
 .PHONY : check lint install-linters dep test build
 
@@ -29,8 +31,8 @@ BUILDINFO_COMMIT := -X $(BUILDINFO_PATH).commit=$(COMMIT)
 
 BUILDINFO?=$(BUILDINFO_VERSION) $(BUILDINFO_DATE) $(BUILDINFO_COMMIT)
 
-BUILD_OPTS?="-ldflags=$(BUILDINFO)"
-BUILD_OPTS_DEPLOY?="-ldflags=$(BUILDINFO) -w -s"
+BUILD_OPTS?=-mod=vendor "-ldflags=$(BUILDINFO)"
+BUILD_OPTS_DEPLOY?=-mod=vendor "-ldflags=$(BUILDINFO) -w -s"
 
 check: lint test ## Run linters and tests
 
@@ -47,13 +49,12 @@ test: ## Run tests
 	${OPTS} go test ${TEST_OPTS} ./...
 
 install-linters: ## Install linters
-	- VERSION=1.23.1 ./ci_scripts/install-golangci-lint.sh
 	# GO111MODULE=off go get -u github.com/FiloSottile/vendorcheck
 	# For some reason this install method is not recommended, see https://github.com/golangci/golangci-lint#install
 	# However, they suggest `curl ... | bash` which we should not do
-	# ${OPTS} go get -u github.com/golangci/golangci-lint/cmd/golangci-lint
+	${OPTS} go get -u github.com/golangci/golangci-lint/cmd/golangci-lint
 	${OPTS} go get -u golang.org/x/tools/cmd/goimports
-	${OPTS} go get -u github.com/incu6us/goimports-reviser
+	${OPTS} go get -u github.com/incu6us/goimports-reviser/v2
 
 format: ## Formats the code. Must have goimports and goimports-reviser installed (use make install-linters).
 	${OPTS} goimports -w -local ${DMSG_REPO} .
@@ -62,13 +63,19 @@ dep: ## Sorts dependencies
 	${OPTS} go mod download
 	${OPTS} go mod tidy -v
 
+install: ## Install `dmsg-discovery`, `dmsg-server`, `dmsgget`,`dmsgpty-cli`, `dmsgpty-host`, `dmsgpty-ui`
+	${OPTS} go install ${BUILD_OPTS} ./cmd/*
+
 build: ## Build binaries into ./bin
 	mkdir -p ${BIN}; go build ${BUILD_OPTS} -o ${BIN} ./cmd/*
 
 build-deploy: ## Build for deployment Docker images
 	go build -tags netgo ${BUILD_OPTS_DEPLOY} -o /release/dmsg-discovery ./cmd/dmsg-discovery
 	go build -tags netgo ${BUILD_OPTS_DEPLOY} -o /release/dmsg-server ./cmd/dmsg-server
 
+build-docker:
+	./docker/scripts/docker-push.sh -t "develop" -b
+
 start-db: ## Init local database env.
 	source ./integration/env.sh && init_redis
 

README.md

@@ -28,7 +28,7 @@ The connection between a `dmsg.Client` and `dmsg.Server` is called a `dmsg.Sessi
 ## Dmsg tools and libraries
 
 - [`dmsgget`](./docs/dmsgget.md) - Simplified `wget` over `dmsg`.
-
+- [`dmsgpty`](./docs/dmsgpty.md) - Simplified `SSH` over `dmsg`.
 ## Additional resources
 - [`dmsg` examples.](./examples)
 - [`dmsg.Discovery` documentation.](./cmd/dmsg-discovery/README.md)

cmd/dmsg-discovery/commands/root.go

@@ -17,7 +17,6 @@ import (
 	"github.com/skycoin/dmsg/cmd/dmsg-discovery/internal/store"
 	"github.com/skycoin/dmsg/cmdutil"
 	"github.com/skycoin/dmsg/discmetrics"
-	"github.com/skycoin/dmsg/discord"
 	"github.com/skycoin/dmsg/metricsutil"
 )
 
@@ -52,15 +51,6 @@ var rootCmd = &cobra.Command{
 
 		log := sf.Logger()
 
-		if discordWebhookURL := discord.GetWebhookURLFromEnv(); discordWebhookURL != "" {
-			// Workaround for Discord logger hook. Actually, it's Info.
-			log.Error(discord.StartLogMessage)
-			defer log.Error(discord.StopLogMessage)
-		} else {
-			log.Info(discord.StartLogMessage)
-			defer log.Info(discord.StopLogMessage)
-		}
-
 		metricsutil.ServeHTTPMetrics(log, sf.MetricsAddr)
 
 		db := prepareDB(log)

cmd/dmsg-discovery/internal/store/storer.go

@@ -45,7 +45,7 @@ type Config struct {
 // Config defaults.
 const (
 	DefaultURL     = "redis://localhost:6379"
-	DefaultTimeout = time.Minute
+	DefaultTimeout = time.Minute * 3
 )
 
 // DefaultConfig returns a config with default values.

cmd/dmsg-discovery/internal/store/testing.go

@@ -117,8 +117,8 @@ func (ms *MockStore) AvailableServers(ctx context.Context, maxCount int) ([]*dis
 
 // CountEntries implements Storer CountEntries method for MockStore
 func (ms *MockStore) CountEntries(ctx context.Context) (int64, int64, error) {
-	var numberOfServers int64 = 0
-	var numberOfClients int64 = 0
+	var numberOfServers int64
+	var numberOfClients int64
 	ms.serversLock.RLock()
 	defer ms.serversLock.RUnlock()
 

cmd/dmsg-server/commands/root.go

@@ -2,13 +2,17 @@ package commands
 
 import (
 	"context"
+	"fmt"
+	"io"
+	"io/ioutil"
 	"log"
 	"net"
 	"os"
 	"time"
 
 	"github.com/go-chi/chi"
 	"github.com/go-chi/chi/middleware"
+	jsoniter "github.com/json-iterator/go"
 	"github.com/pires/go-proxyproto"
 	"github.com/spf13/cobra"
 
@@ -18,17 +22,22 @@ import (
 	"github.com/skycoin/dmsg/cmd/dmsg-server/internal/api"
 	"github.com/skycoin/dmsg/cmdutil"
 	"github.com/skycoin/dmsg/disc"
-	"github.com/skycoin/dmsg/discord"
 	"github.com/skycoin/dmsg/metricsutil"
 	"github.com/skycoin/dmsg/servermetrics"
 )
 
+const (
+	defaultDiscoveryURL = "https://dmsg.discovery.skywire.skycoin.com"
+	defaultPort         = ":8081"
+	defaultConfigPath   = "config.json"
+)
+
 var (
 	sf cmdutil.ServiceFlags
 )
 
 func init() {
-	sf.Init(rootCmd, "dmsg_srv", "config.json")
+	sf.Init(rootCmd, "dmsg_srv", defaultConfigPath)
 }
 
 var rootCmd = &cobra.Command{
@@ -42,18 +51,9 @@ var rootCmd = &cobra.Command{
 
 		log := sf.Logger()
 
-		if discordWebhookURL := discord.GetWebhookURLFromEnv(); discordWebhookURL != "" {
-			// Workaround for Discord logger hook. Actually, it's Info.
-			log.Error(discord.StartLogMessage)
-			defer log.Error(discord.StopLogMessage)
-		} else {
-			log.Info(discord.StartLogMessage)
-			defer log.Info(discord.StopLogMessage)
-		}
-
 		var conf Config
-		if err := sf.ParseConfig(os.Args, true, &conf); err != nil {
-			log.WithError(err).Fatal()
+		if err := sf.ParseConfig(os.Args, true, &conf, genDefaultConfig); err != nil {
+			log.WithError(err).Fatal("parsing config failed, generating default one...")
 		}
 
 		var m servermetrics.Metrics
@@ -71,15 +71,19 @@ var rootCmd = &cobra.Command{
 		r.Use(middleware.Logger)
 		r.Use(middleware.Recoverer)
 
-		a := api.New(r, log, m)
-		r.Get("/health", a.Health)
+		api := api.New(r, log, m)
 		ln, err := net.Listen("tcp", conf.LocalAddress)
 		if err != nil {
 			log.Fatalf("Error listening on %s: %v", conf.LocalAddress, err)
 		}
 
 		lis := &proxyproto.Listener{Listener: ln}
-		defer lis.Close() // nolint:errcheck
+		defer func(lis *proxyproto.Listener) {
+			err = lis.Close()
+			if err != nil {
+				log.Warnf("Error closing listener: %v", err)
+			}
+		}(lis)
 
 		if err != nil {
 			log.Fatalf("Error creating proxy on %s: %v", conf.LocalAddress, err)
@@ -92,15 +96,15 @@ var rootCmd = &cobra.Command{
 		srv := dmsg.NewServer(conf.PubKey, conf.SecKey, disc.NewHTTP(conf.Discovery), &srvConf, m)
 		srv.SetLogger(log)
 
-		a.SetDmsgServer(srv)
-		defer func() { log.WithError(srv.Close()).Info("Closed server.") }()
+		api.SetDmsgServer(srv)
+		defer func() { log.WithError(api.Close()).Info("Closed server.") }()
 
 		ctx, cancel := cmdutil.SignalContext(context.Background(), log)
 		defer cancel()
 
-		go a.RunBackgroundTasks(ctx)
+		go api.RunBackgroundTasks(ctx)
 		go func() {
-			if err := srv.Serve(lis, conf.PublicAddress); err != nil {
+			if err := api.Serve(lis, conf.PublicAddress); err != nil {
 				log.Errorf("Serve: %v", err)
 				cancel()
 			}
@@ -122,6 +126,31 @@ type Config struct {
 	LogLevel       string        `json:"log_level"`
 }
 
+func genDefaultConfig() (io.ReadCloser, error) {
+	pk, sk := cipher.GenerateKeyPair()
+
+	cfg := Config{
+		PubKey:        pk,
+		SecKey:        sk,
+		Discovery:     defaultDiscoveryURL,
+		LocalAddress:  fmt.Sprintf("localhost%s", defaultPort),
+		PublicAddress: defaultPort,
+		MaxSessions:   2048,
+		LogLevel:      "info",
+	}
+
+	configData, err := jsoniter.MarshalIndent(&cfg, "", " ")
+	if err != nil {
+		return nil, fmt.Errorf("failed to marshal default json config: %v", err)
+	}
+
+	if err = ioutil.WriteFile(defaultConfigPath, configData, 0600); err != nil {
+		return nil, err
+	}
+
+	return os.Open(defaultConfigPath)
+}
+
 // Execute executes root CLI command.
 func Execute() {
 	if err := rootCmd.Execute(); err != nil {

cmd/dmsg-server/internal/api/api.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"math"
 	"math/big"
+	"net"
 	"net/http"
 	"sync"
 	"time"
@@ -30,6 +31,7 @@ type API struct {
 	minuteEncValues map[*dmsg.SessionCommon]uint64
 	secondDecValues map[*dmsg.SessionCommon]uint64
 	secondEncValues map[*dmsg.SessionCommon]uint64
+	router          *chi.Mux
 }
 
 // HealthCheckResponse is struct of /health endpoint
@@ -47,8 +49,10 @@ func New(r *chi.Mux, log *logging.Logger, m servermetrics.Metrics) *API {
 		minuteEncValues: make(map[*dmsg.SessionCommon]uint64),
 		secondDecValues: make(map[*dmsg.SessionCommon]uint64),
 		secondEncValues: make(map[*dmsg.SessionCommon]uint64),
+		router:          r,
 	}
 	r.Use(httputil.SetLoggerMiddleware(log))
+	r.Get("/health", api.health)
 	return api
 }
 
@@ -80,8 +84,28 @@ func (a *API) SetDmsgServer(srv *dmsg.Server) {
 	a.dmsgServer = srv
 }
 
+// Serve runs dmsg Serve function alongside health endpoint in the same port
+func (a *API) Serve(lis net.Listener, addr string) error {
+	errCh := make(chan error)
+
+	go func(l net.Listener, address string) {
+		if err := a.dmsgServer.Serve(l, address); err != nil {
+			errCh <- err
+		}
+	}(lis, addr)
+	if err := http.Serve(lis, a.router); err != nil {
+		errCh <- err
+	}
+	return <-errCh
+}
+
+// Close closes connection to both http server and dmsg server
+func (a *API) Close() error {
+	return a.dmsgServer.Close()
+}
+
 // Health serves health page
-func (a *API) Health(w http.ResponseWriter, r *http.Request) {
+func (a *API) health(w http.ResponseWriter, r *http.Request) {
 	info := buildinfo.Get()
 	a.writeJSON(w, r, http.StatusOK, HealthCheckResponse{
 		BuildInfo: info,