Improve dmsg utilities (skycoin#302)

* go get -u github.com/skycoin/skywire@develop

* change some fatal error logging to debug logging

* retry httpC.Do(req) with dmsgcurl after non i/o deadline reached errors

* fix CI errors

* update import path for calvin library

Author: 0pcom

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

@@ -12,9 +12,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/0magnet/calvin"
 	socks5 "github.com/confiant-inc/go-socks5"
 	"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo"
+	"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/calvin"
 	"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"

cmd/dmsgcurl/commands/dmsgcurl.go

@@ -8,6 +8,7 @@ import (
 	"io"
 	"io/fs"
 	"log"
+	"net"
 	"net/http"
 	"net/url"
 	"os"
@@ -16,8 +17,8 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/0magnet/calvin"
 	"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo"
+	"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/calvin"
 	"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"
@@ -37,6 +38,7 @@ var (
 	dmsgcurlData   string
 	sk             cipher.SecKey
 	pk             cipher.PubKey
+	destPK         cipher.PubKey
 	dlog           = logging.MustGetLogger("dmsgcurl")
 	dmsgcurlAgent  string
 	logLvl         string
@@ -118,6 +120,15 @@ var RootCmd = &cobra.Command{
 			dlog.WithError(fmt.Errorf("failed to parse provided URL")).Error(errorDesc["URL_MALFORMAT"] + "\n")
 			os.Exit(errorCode["URL_MALFORMAT"])
 		}
+		destSlc := strings.Split(parsedURL.Host, ":")
+		if len(destSlc) == 1 {
+			destSlc = append(destSlc, "80")
+		}
+		err = destPK.Set(destSlc[0])
+		if err != nil {
+			dlog.WithError(err).Fatal("bad PK for host\n")
+		}
+
 		var cErr curlError
 		if useHTTP {
 			if len(dmsgDiscs) == 0 || dmsgDiscs[0] == "" {
@@ -205,14 +216,14 @@ func handleRequest(ctx context.Context, dmsgLogger *logging.Logger, pk cipher.Pu
 	if !dmsgHTTP {
 		dmsgC, closeDmsg, err = cli.StartDmsg(ctx, dmsgLogger, pk, sk, httpClient, dmsgDisc, dmsgSessions)
 	} else {
-		destination := strings.Split(parsedURL.Host, ":")[0]
-		dmsgC, closeDmsg, err = cli.StartDmsgDirect(ctx, dmsgLogger, pk, sk, httpClient, dmsgDisc, dmsgSessions, destination)
+		dmsgC, closeDmsg, err = cli.StartDmsgDirect(ctx, dmsgLogger, pk, sk, httpClient, dmsgDisc, dmsgSessions, destPK.String())
 	}
 	if err != nil {
-		return curlError{
-			Error: fmt.Errorf("%s", errorDesc["DMSG_INIT"]),
-			Code:  errorCode["DMSG_INIT"],
-		}
+		dlog.WithError(err).Debug("Error connecting to dmsg network")
+		//		return curlError{
+		//			Error: fmt.Errorf("%s", errorDesc["DMSG_INIT"]),
+		//			Code:  errorCode["DMSG_INIT"],
+		//		}
 	}
 	defer closeDmsg()
 
@@ -256,16 +267,43 @@ func handleRequest(ctx context.Context, dmsgLogger *logging.Logger, pk cipher.Pu
 			req.Header.Set("Content-Type", "text/plain")
 		}
 		resp, err := httpC.Do(req)
+		for attempts := 1; attempts <= 10; attempts++ {
+			if err != nil {
+				var netErr net.Error
+
+				if errors.As(err, &netErr) && netErr.Timeout() {
+					dlog.WithError(err).Error("Failed to perform HTTP request\n")
+					return curlError{
+						Error: fmt.Errorf("%s", errorDesc["RECV_ERROR"]),
+						Code:  errorCode["RECV_ERROR"],
+					}
+				} else if errors.Is(err, context.DeadlineExceeded) {
+					dlog.WithError(err).Error("Failed to perform HTTP request\n")
+					return curlError{
+						Error: fmt.Errorf("%s", errorDesc["RECV_ERROR"]),
+						Code:  errorCode["RECV_ERROR"],
+					}
+				}
+
+				dlog.WithError(err).Debugf("Attempt %d failed, retrying...\n", attempts)
+				time.Sleep(time.Duration(attempts) * time.Second) // Exponential backoff
+				resp, err = httpC.Do(req)
+				continue
+			}
+
+			defer resp.Body.Close() //nolint
+			dlog.Debugf("Request succeeded with status code: %d\n", resp.StatusCode)
+			break
+		}
+
 		if err != nil {
-			dlog.WithError(err).Error("Failed to preform HTTP request\n")
+			dlog.WithError(err).Debug("Failed to perform HTTP request after maximum retries\n")
 			return curlError{
 				Error: fmt.Errorf("%s", errorDesc["RECV_ERROR"]),
 				Code:  errorCode["RECV_ERROR"],
 			}
 		}
-		//		if maxSize > 0 && resp.ContentLength > maxSize*1024 {
-		//			return fmt.Errorf("requested file size is more than allowed size: %d KB > %d KB", (resp.ContentLength / 1024), maxSize)
-		//		}
+
 		n, err := cancellableCopy(ctx, file, resp.Body, resp.ContentLength)
 		if err != nil {
 			dlog.WithError(err).Error(fmt.Sprintf("download failed at %d/%dB\n", n, resp.ContentLength))
@@ -324,7 +362,7 @@ func closeAndCleanFile(file *os.File, err error) {
 
 func closeResponseBody(resp *http.Response) {
 	if err := resp.Body.Close(); err != nil {
-		dlog.WithError(err).Fatal("Failed to close response body\n")
+		dlog.WithError(err).Debug("Failed to close response body\n")
 	}
 }
 

cmd/dmsghttp/commands/dmsghttp.go

@@ -13,9 +13,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/0magnet/calvin"
 	"github.com/gin-gonic/gin"
 	"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo"
+	"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/calvin"
 	"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"
@@ -148,19 +148,19 @@ func server() {
 		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")
+		dlog.WithError(err).Debug("Error connecting to dmsg network")
 		return
 	}
 	defer closeDmsg()
 
 	lis, err := dmsgC.Listen(uint16(dmsgPort)) //nolint gosec
 	if err != nil {
-		log.WithError(err).Fatal()
+		dlog.WithError(err).Debug()
 	}
 	go func() {
 		<-ctx.Done()
 		if err := lis.Close(); err != nil {
-			log.WithError(err).Error()
+			dlog.WithError(err).Debug()
 		}
 	}()
 
@@ -186,9 +186,9 @@ func server() {
 
 	// Start serving
 	go func() {
-		log.WithField("dmsg_addr", lis.Addr().String()).Info("Serving...")
+		log.WithField("dmsg_addr", lis.Addr().String()).Debug("Serving...\n")
 		if err := serve.Serve(lis); err != nil && err != http.ErrServerClosed {
-			log.Fatalf("Serve: %v", err)
+			dlog.WithError(err).Debug("Server error\n")
 		}
 		wg.Done()
 	}()

cmd/dmsgip/commands/dmsgip.go

@@ -10,8 +10,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/0magnet/calvin"
 	"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo"
+	"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/calvin"
 	"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"
@@ -100,10 +100,9 @@ var RootCmd = &cobra.Command{
 		defer cancel()
 
 		httpClient = &http.Client{}
-		var dialer proxy.Dialer = proxy.Direct // Default dialer is direct connection
+		var dialer proxy.Dialer = proxy.Direct
 
 		if proxyAddr != "" {
-			// Use SOCKS5 proxy dialer if specified
 			dialer, err = proxy.SOCKS5("tcp", proxyAddr, nil, proxy.Direct)
 			if err != nil {
 				dlog.Fatalf("Error creating SOCKS5 dialer: %v", err)
@@ -128,11 +127,9 @@ var RootCmd = &cobra.Command{
 			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 err
+			dlog.WithError(err).Debug("Error connecting to dmsg network")
 		}
 		defer closeDmsg()
-		// Perform IP lookup using the context with the proxy dialer
 		ip, err := dmsgC.LookupIP(ctx, srvs)
 		if err != nil {
 			dlog.WithError(err).Error("failed to lookup IP")

cmd/dmsgpty-cli/commands/root.go

@@ -11,6 +11,7 @@ import (
 	"strings"
 
 	"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo"
+	"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/calvin"
 	"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/cmdutil"
 	"github.com/spf13/cobra"
 
@@ -46,11 +47,8 @@ var RootCmd = &cobra.Command{
 		return strings.Split(filepath.Base(strings.ReplaceAll(strings.ReplaceAll(fmt.Sprintf("%v", os.Args), "[", ""), "]", "")), " ")[0]
 	}(),
 	Short: "DMSG pseudoterminal command line interface",
-	Long: `
-	┌┬┐┌┬┐┌─┐┌─┐┌─┐┌┬┐┬ ┬   ┌─┐┬  ┬
-	 │││││└─┐│ ┬├─┘ │ └┬┘───│  │  │
-	─┴┘┴ ┴└─┘└─┘┴   ┴  ┴    └─┘┴─┘┴
-DMSG pseudoterminal command line interface`,
+	Long: calvin.AsciiFont("dmsgpty-cli") + `
+	DMSG pseudoterminal command line interface`,
 	SilenceErrors:         true,
 	SilenceUsage:          true,
 	DisableSuggestions:    true,

cmd/dmsgpty-host/commands/root.go

@@ -16,6 +16,7 @@ import (
 	jsoniter "github.com/json-iterator/go"
 	"github.com/sirupsen/logrus"
 	"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo"
+	"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/calvin"
 	"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"
@@ -75,11 +76,8 @@ var RootCmd = &cobra.Command{
 		return strings.Split(filepath.Base(strings.ReplaceAll(strings.ReplaceAll(fmt.Sprintf("%v", os.Args), "[", ""), "]", "")), " ")[0]
 	}(),
 	Short: "DMSG host for pseudoterminal command line interface",
-	Long: `
-	┌┬┐┌┬┐┌─┐┌─┐┌─┐┌┬┐┬ ┬   ┬ ┬┌─┐┌─┐┌┬┐
-	 │││││└─┐│ ┬├─┘ │ └┬┘───├─┤│ │└─┐ │
-	─┴┘┴ ┴└─┘└─┘┴   ┴  ┴    ┴ ┴└─┘└─┘ ┴
-DMSG host for pseudoterminal command line interface`,
+	Long: calvin.AsciiFont("dmsgpty-host") + `
+	DMSG host for pseudoterminal (pty) command line interface`,
 	SilenceErrors:         true,
 	SilenceUsage:          true,
 	DisableSuggestions:    true,

cmd/dmsgweb/commands/dmsgweb.go

@@ -16,11 +16,11 @@ import (
 	"sync"
 	"syscall"
 
-	"github.com/0magnet/calvin"
 	"github.com/chen3feng/safecast"
 	"github.com/confiant-inc/go-socks5"
 	"github.com/gin-gonic/gin"
 	"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo"
+	"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/calvin"
 	"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"

go.mod

@@ -7,75 +7,74 @@ toolchain go1.24.2
 require (
 	github.com/0magnet/calvin v0.0.0-20241204203002-126d3bcd81d8
 	github.com/ActiveState/termtest/conpty v0.5.0
-	github.com/VictoriaMetrics/metrics v1.35.1
-	github.com/bitfield/script v0.23.0
+	github.com/VictoriaMetrics/metrics v1.36.0
+	github.com/bitfield/script v0.24.1
 	github.com/chen3feng/safecast v0.0.0-20220908170618-81b2ecd47937
-	github.com/coder/websocket v1.8.12
+	github.com/coder/websocket v1.8.13
 	github.com/confiant-inc/go-socks5 v0.0.0-20210816151940-c1124825b1d6
-	github.com/creack/pty v1.1.23
+	github.com/creack/pty v1.1.24
 	github.com/gin-gonic/gin v1.10.0
-	github.com/go-chi/chi/v5 v5.2.0
+	github.com/go-chi/chi/v5 v5.2.1
 	github.com/go-redis/redis/v8 v8.11.5
 	github.com/hashicorp/yamux v0.1.2
 	github.com/ivanpirog/coloredcobra v1.0.1
 	github.com/json-iterator/go v1.1.12
-	github.com/pires/go-proxyproto v0.8.0
+	github.com/pires/go-proxyproto v0.8.1
 	github.com/sirupsen/logrus v1.9.3
 	github.com/skycoin/noise v0.0.0-20180327030543-2492fe189ae6
-	github.com/skycoin/skycoin v0.28.1-0.20241105130348-39b49a2d0a7f
-	github.com/skycoin/skywire v1.3.29-rc7.0.20250414132907-330ec8cce85f
-	github.com/spf13/cobra v1.8.1
+	github.com/skycoin/skycoin v0.28.1-0.20241105130348-39b49a2d0a7f //DO NOT MODIFY OR UPDATE v0.28.1-0.20241105130348-39b49a2d0a7f
+	github.com/skycoin/skywire v1.3.29-rc7.0.20250511174520-aee80a241891
+	github.com/spf13/cobra v1.9.1
 	github.com/stretchr/testify v1.10.0
-	golang.org/x/net v0.36.0
-	golang.org/x/sys v0.30.0
-	golang.org/x/term v0.29.0
+	golang.org/x/net v0.40.0
+	golang.org/x/sys v0.33.0
+	golang.org/x/term v0.32.0
 )
 
 require (
-	github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
-	github.com/bytedance/sonic v1.12.3 // indirect
-	github.com/bytedance/sonic/loader v0.2.0 // indirect
+	github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
+	github.com/bytedance/sonic v1.13.2 // indirect
+	github.com/bytedance/sonic/loader v0.2.4 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/cloudwego/base64x v0.1.4 // indirect
-	github.com/cloudwego/iasm v0.2.0 // indirect
+	github.com/cloudwego/base64x v0.1.5 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/fatih/color v1.18.0 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.6 // indirect
-	github.com/gin-contrib/sse v0.1.0 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.9 // indirect
+	github.com/gin-contrib/sse v1.1.0 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.22.1 // indirect
-	github.com/goccy/go-json v0.10.3 // indirect
+	github.com/go-playground/validator/v10 v10.26.0 // indirect
+	github.com/goccy/go-json v0.10.5 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/itchyny/gojq v0.12.16 // indirect
+	github.com/itchyny/gojq v0.12.17 // indirect
 	github.com/itchyny/timefmt-go v0.1.6 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.9 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.10 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/spf13/pflag v1.0.6 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.12 // indirect
 	github.com/valyala/fastrand v1.1.0 // indirect
 	github.com/valyala/histogram v1.2.0 // indirect
-	golang.org/x/arch v0.11.0 // indirect
-	golang.org/x/crypto v0.35.0 // indirect
-	golang.org/x/text v0.22.0 // indirect
-	google.golang.org/protobuf v1.35.1 // indirect
+	golang.org/x/arch v0.17.0 // indirect
+	golang.org/x/crypto v0.38.0 // indirect
+	golang.org/x/text v0.25.0 // indirect
+	google.golang.org/protobuf v1.36.6 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	mvdan.cc/sh/v3 v3.9.0 // indirect
+	mvdan.cc/sh/v3 v3.11.0 // indirect
 )
 
 // Uncomment for tests with alternate branches of 'skywire-utilities'
 //replace github.com/skycoin/skywire => ../skywire
 //replace github.com/skycoin/skywire => github.com/skycoin/skywire <commit-hash>
-//replace github.com/skycoin/skywire => github.com/skycoin/skywire v1.3.29-rc1.0.20241217211947-72c9d0b82083
+//replace github.com/skycoin/skywire => github.com/skycoin/skywire v1.3.29-rc7.0.20250511174520-aee80a241891
 
 // replace github.com/skycoin/skywire-utilities => ../skywire-utilities
 // replace github.com/skycoin/skywire-utilities => github.com/skycoin/skywire-utilities