use embedded dmsghttp config for dmsg utilities (skycoin#298)

* implement dmsg-direct using embedded dmsghttp config for dmsgcurl

* continue dmsghttp-config implementation for dmsgcurl

* slight refactorization

* fix typo

* improve logging

* continue improvements to logging

* continue improvements to logging

* continue improvements to logging

* remove unneeded logging

* fix typo

* fix CI errors

* update mohammed's revised error implementation

* fix spelling

* improve a part of code, as possible solution

* remove ineffectual assignement

* check error on PostEntry of destination

* remove //TODO comment

* standardize var naming, begin dmsghttp, add proxy for direct

* continue implementing dmsg-direct for dmsghttp filee server

* change destination pk

* fix dmsgSession issue on curl

* fix CI issues

* implement dmsg-direct for dmsgip command

* update dmsgsocks & dmsgweb to use dmsg-direect by default

* make format

* add error checks

* check for errors when conneceting to dmsg

* fix return

* remove unused

---------

Co-authored-by: Mohammed <[email protected]>

Author: 0pcom

cmd/dmsg-socks5/commands/dmsg-socks5.go

@@ -3,7 +3,6 @@ package commands
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"log"
 	"net/http"
@@ -13,25 +12,30 @@ import (
 	"strings"
 	"time"
 
+	"github.com/0magnet/calvin"
 	socks5 "github.com/confiant-inc/go-socks5"
-	"github.com/skycoin/skywire"
 	"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo"
 	"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cipher"
+	"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil"
 	"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/logging"
 	"github.com/spf13/cobra"
 
-	"github.com/skycoin/dmsg/pkg/disc"
+	"github.com/skycoin/dmsg/internal/cli"
 	dmsg "github.com/skycoin/dmsg/pkg/dmsg"
 )
 
 var (
-	sk        cipher.SecKey
-	pubk      string
-	dmsgDisc  string
-	wl        string
-	wlkeys    []cipher.PubKey
-	proxyPort int
-	dmsgPort  uint16
+	sk           cipher.SecKey
+	pubk         string
+	wl           string
+	wlkeys       []cipher.PubKey
+	proxyPort    int
+	dmsgPort     uint16
+	dmsgDisc     = dmsg.DiscAddr(false)
+	useHTTP      bool
+	httpClient   *http.Client
+	dmsgSessions int
+	dlog         *logging.Logger
 )
 
 // Execute executes root CLI command.
@@ -41,20 +45,15 @@ func Execute() {
 	}
 }
 func init() {
-	var envServices skywire.EnvServices
-	var services skywire.Services
-	if err := json.Unmarshal(skywire.ServicesJSON, &envServices); err == nil {
-		if err := json.Unmarshal(envServices.Prod, &services); err == nil {
-			dmsgDisc = services.DmsgDiscovery
-		}
-	}
 	RootCmd.AddCommand(
 		serveCmd,
 		proxyCmd,
 	)
+
 	serveCmd.Flags().Uint16VarP(&dmsgPort, "dport", "q", 1081, "dmsg port to serve socks5")
 	serveCmd.Flags().StringVarP(&wl, "wl", "w", "", "whitelist keys, comma separated")
 	serveCmd.Flags().StringVarP(&dmsgDisc, "dmsg-disc", "D", dmsgDisc, "dmsg discovery url")
+	serveCmd.Flags().BoolVarP(&useHTTP, "http", "z", false, "use regular http to connect to dmsg discovery")
 	if os.Getenv("DMSGSK") != "" {
 		sk.Set(os.Getenv("DMSGSK")) //nolint
 	}
@@ -64,6 +63,7 @@ func init() {
 	proxyCmd.Flags().Uint16VarP(&dmsgPort, "dport", "q", 1081, "dmsg port to connect to socks5 server")
 	proxyCmd.Flags().StringVarP(&pubk, "pk", "k", "", "dmsg socks5 proxy server public key to connect to")
 	proxyCmd.Flags().StringVarP(&dmsgDisc, "dmsg-disc", "D", dmsgDisc, "dmsg discovery url")
+	proxyCmd.Flags().BoolVarP(&useHTTP, "http", "z", false, "use regular http to connect to dmsg discovery")
 	if os.Getenv("DMSGSK") != "" {
 		sk.Set(os.Getenv("DMSGSK")) //nolint
 	}
@@ -77,11 +77,8 @@ var RootCmd = &cobra.Command{
 		return strings.Split(filepath.Base(strings.ReplaceAll(strings.ReplaceAll(fmt.Sprintf("%v", os.Args), "[", ""), "]", "")), " ")[0]
 	}(),
 	Short: "DMSG socks5 proxy server & client",
-	Long: `
-	┌┬┐┌┬┐┌─┐┌─┐   ┌─┐┌─┐┌─┐┬┌─┌─┐
-	 │││││└─┐│ ┬───└─┐│ ││  ├┴┐└─┐
-	─┴┘┴ ┴└─┘└─┘   └─┘└─┘└─┘┴ ┴└─┘
-DMSG socks5 proxy server & client`,
+	Long: calvin.AsciiFont("dmsg-socks") + `
+	DMSG socks5 proxy server & client`,
 	SilenceErrors:         true,
 	SilenceUsage:          true,
 	DisableSuggestions:    true,
@@ -93,17 +90,18 @@ DMSG socks5 proxy server & client`,
 var serveCmd = &cobra.Command{
 	Use:                   "server",
 	Short:                 "dmsg socks5 proxy server",
+	Long:                  "dmsg socks5 proxy server",
 	SilenceErrors:         true,
 	SilenceUsage:          true,
 	DisableSuggestions:    true,
 	DisableFlagsInUseLine: true,
 	Run: func(_ *cobra.Command, _ []string) {
-		log := logging.MustGetLogger("ssh-proxy")
+		dlog = logging.MustGetLogger("dmsg-proxy")
 		interrupt := make(chan os.Signal, 1)
 		signal.Notify(interrupt, os.Interrupt)
 		go func() {
 			<-interrupt
-			log.Info("Interrupt received. Shutting down...")
+			dlog.Info("Interrupt received. Shutting down...")
 			os.Exit(0)
 		}()
 		pk, err := sk.PubKey()
@@ -122,52 +120,66 @@ var serveCmd = &cobra.Command{
 		}
 		if len(wlkeys) > 0 {
 			if len(wlkeys) == 1 {
-				log.Info(fmt.Sprintf("%d key whitelisted", len(wlkeys)))
+				dlog.Info(fmt.Sprintf("%d key whitelisted", len(wlkeys)))
 			} else {
-				log.Info(fmt.Sprintf("%d keys whitelisted", len(wlkeys)))
+				dlog.Info(fmt.Sprintf("%d keys whitelisted", len(wlkeys)))
 			}
 		}
+
+		ctx, cancel := cmdutil.SignalContext(context.Background(), dlog)
+		defer cancel()
 		//TODO: implement whitelist logic
-		respC := dmsg.NewClient(pk, sk, disc.NewHTTP(dmsgDisc, &http.Client{}, log), dmsg.DefaultConfig())
-		go respC.Serve(context.Background())
-		log.Infof("dmsg client pk: " + pk.String())
+		var dmsgC *dmsg.Client
+		var closeDmsg func()
+
+		if useHTTP {
+			dlog.WithField("public_key", pk.String()).WithField("dmsg_disc", dmsgDisc).Debug("Connecting to dmsg network...")
+			dmsgC, closeDmsg, err = cli.StartDmsg(ctx, dlog, pk, sk, httpClient, dmsgDisc, dmsgSessions)
+		} else {
+			dlog.WithField("public_key", pk.String()).Debug("Connecting to dmsg network...")
+			dmsgC, closeDmsg, err = cli.StartDmsgDirect(ctx, dlog, pk, sk, httpClient, dmsgDisc, dmsgSessions, pk.String())
+		}
+
+		if err != nil {
+			dlog.WithError(err).Fatal("Error connecting to dmsg network")
+			return
+		}
+
+		defer closeDmsg()
+
+		dlog.Infof("dmsg client pk: " + pk.String())
 		time.Sleep(time.Second)
-		respL, err := respC.Listen(dmsgPort)
+		dmsgL, err := dmsgC.Listen(dmsgPort)
 		if err != nil {
-			log.Fatalf("Error listening on port %d: %v", dmsgPort, err)
+			dlog.Fatalf("Error listening on port %d: %v", dmsgPort, err)
 		}
 		defer func() {
-			if err := respL.Close(); err != nil {
-				log.Printf("Error closing listener: %v", err)
-			}
-		}()
-		defer func() {
-			if err := respC.Close(); err != nil {
-				log.Errorf("Error closing DMSG client: %v", err)
+			if err := dmsgL.Close(); err != nil {
+				dlog.Printf("Error closing listener: %v", err)
 			}
 		}()
 		for {
-			respConn, err := respL.Accept()
+			respConn, err := dmsgL.Accept()
 			if err != nil {
-				log.Errorf("Error accepting initiator: %v", err)
+				dlog.Errorf("Error accepting initiator: %v", err)
 				continue
 			}
-			log.Infof("Accepted connection from: %s", respConn.RemoteAddr())
+			dlog.Infof("Accepted connection from: %s", respConn.RemoteAddr())
 
 			conf := &socks5.Config{}
 			server, err := socks5.New(conf)
 			if err != nil {
-				log.Fatalf("Error creating SOCKS5 server: %v", err)
+				dlog.Fatalf("Error creating SOCKS5 server: %v", err)
 			}
 			go func() {
 				defer func() {
 					if closeErr := respConn.Close(); closeErr != nil {
-						log.Printf("Error closing client connection: %v", closeErr)
+						dlog.Printf("Error closing client connection: %v", closeErr)
 					}
 				}()
 				if err := server.ServeConn(respConn); err != nil {
-					log.Infof("Connection closed: %s", respConn.RemoteAddr())
-					log.Errorf("Error serving SOCKS5 proxy: %v", err)
+					dlog.Infof("Connection closed: %s", respConn.RemoteAddr())
+					dlog.Errorf("Error serving SOCKS5 proxy: %v", err)
 				}
 			}()
 		}
@@ -176,49 +188,72 @@ var serveCmd = &cobra.Command{
 
 // proxyCmd serves the local socks5 proxy
 var proxyCmd = &cobra.Command{
-	Use:   "client",
-	Short: "socks5 proxy client for dmsg socks5 proxy server",
+	Use:                   "client",
+	Short:                 "socks5 proxy client for dmsg socks5 proxy server",
+	Long:                  "socks5 proxy client for dmsg socks5 proxy server",
+	SilenceErrors:         true,
+	SilenceUsage:          true,
+	DisableSuggestions:    true,
+	DisableFlagsInUseLine: true,
 	Run: func(_ *cobra.Command, _ []string) {
-		log := logging.MustGetLogger("ssh-proxy-client")
+		dlog = logging.MustGetLogger("dmsg-proxy-client")
 		var pubKey cipher.PubKey
 		err := pubKey.Set(pubk)
 		if err != nil {
-			log.Fatal("Public key to connect to cannot be empty")
+			dlog.Fatal("Public key to connect to cannot be empty")
 		}
 		pk, err := sk.PubKey()
 		if err != nil {
 			pk, sk = cipher.GenerateKeyPair()
 		}
-		initC := dmsg.NewClient(pk, sk, disc.NewHTTP(dmsgDisc, &http.Client{}, log), dmsg.DefaultConfig())
-		go initC.Serve(context.Background())
-		initL, err := initC.Listen(dmsgPort)
+
+		ctx, cancel := cmdutil.SignalContext(context.Background(), dlog)
+		defer cancel()
+
+		var dmsgC *dmsg.Client
+		var closeDmsg func()
+
+		if useHTTP {
+			dlog.WithField("public_key", pk.String()).WithField("dmsg_disc", dmsgDisc).Debug("Connecting to dmsg network...")
+			dmsgC, closeDmsg, err = cli.StartDmsg(ctx, dlog, pk, sk, httpClient, dmsgDisc, dmsgSessions)
+		} else {
+			dlog.WithField("public_key", pk.String()).Debug("Connecting to dmsg network...")
+			dmsgC, closeDmsg, err = cli.StartDmsgDirect(ctx, dlog, pk, sk, httpClient, dmsgDisc, dmsgSessions, pk.String())
+		}
+		if err != nil {
+			dlog.WithError(err).Fatal("Error connecting to dmsg network")
+			return
+		}
+
+		defer closeDmsg()
+		dmsgL, err := dmsgC.Listen(dmsgPort)
 		if err != nil {
-			log.Fatalf("Error listening by initiator on port %d: %v", dmsgPort, err)
+			dlog.Fatalf("Error listening by initiator on port %d: %v", dmsgPort, err)
 		}
 		defer func() {
-			if err := initL.Close(); err != nil {
-				log.Printf("Error closing initiator's listener: %v", err)
+			if err := dmsgL.Close(); err != nil {
+				dlog.Printf("Error closing initiator's listener: %v", err)
 			}
 		}()
-		log.Infof("Socks5 proxy client connected on DMSG port %d", dmsgPort)
-		initTp, err := initC.DialStream(context.Background(), dmsg.Addr{PK: pubKey, Port: dmsgPort})
+		dlog.Infof("Socks5 proxy client connected on DMSG port %d", dmsgPort)
+		initTp, err := dmsgC.DialStream(context.Background(), dmsg.Addr{PK: pubKey, Port: dmsgPort})
 		if err != nil {
-			log.Fatalf("Error dialing responder: %v", err)
+			dlog.Fatalf("Error dialing responder: %v", err)
 		}
 		defer func() {
 			if err := initTp.Close(); err != nil {
-				log.Printf("Error closing initiator's stream: %v", err)
+				dlog.Printf("Error closing initiator's stream: %v", err)
 			}
 		}()
 		conf := &socks5.Config{}
 		server, err := socks5.New(conf)
 		if err != nil {
-			log.Fatalf("Error creating SOCKS5 server: %v", err)
+			dlog.Fatalf("Error creating SOCKS5 server: %v", err)
 		}
 		proxyListenAddr := fmt.Sprintf("127.0.0.1:%d", proxyPort)
-		log.Infof("Serving SOCKS5 proxy on %s", proxyListenAddr)
+		dlog.Infof("Serving SOCKS5 proxy on %s", proxyListenAddr)
 		if err := server.ListenAndServe("tcp", proxyListenAddr); err != nil {
-			log.Fatalf("Error serving SOCKS5 proxy: %v", err)
+			dlog.Fatalf("Error serving SOCKS5 proxy: %v", err)
 		}
 	},
 }