Refactor/sky rev fwd

.gitignore

@@ -7,17 +7,18 @@
 *.out
 .DS_Store
 *.pem
+*.db
 
 .idea/
 .vscode/
 
+./skywire-config.json
 ./skywire.json
 ./build/
 build/
 ./apps/
 ./skywire/
-./local/*
-./local*/*
+local*/
 ./transport_logs
 ./dmsgpty
 ./rewards
@@ -26,16 +27,16 @@ rewards
 ./pkg/visor/apps/
 ./pkg/visor/bar/
 ./pkg/visor/foo/
+./skywire-config.json
 
 ./bin
 ./node
-./users.db
 ./hypervisor
 ./*-node
 ./*-visor
 ./*-cli
 ./*-server
-./*.json
+*.json
 !/dmsghttp-config.json
 !/services-config.json
 ./*.sh

cmd/skywire-cli/commands/net/connect.go

@@ -0,0 +1,157 @@
+// Package net cmd/skywire-cli/commands/net/connect.go
+package net
+
+import (
+	"bytes"
+	"fmt"
+	"os"
+	"strconv"
+	"strings"
+	"text/tabwriter"
+
+	"github.com/google/uuid"
+	"github.com/spf13/cobra"
+
+	"github.com/skycoin/skywire-utilities/pkg/cipher"
+	clirpc "github.com/skycoin/skywire/cmd/skywire-cli/commands/rpc"
+	"github.com/skycoin/skywire/cmd/skywire-cli/internal"
+	"github.com/skycoin/skywire/pkg/app/appnet"
+)
+
+var (
+	localPort int
+)
+
+func init() {
+	conCmd.Flags().IntVarP(&localPort, "port", "p", 0, "local port to serve the remote app on")
+	conCmd.Flags().StringVarP(&netType, "type", "t", "http", "type of the remote app connection (http, tcp, udp)")
+
+	conCmd.AddCommand(lsCmd)
+	conCmd.AddCommand(stopCmd)
+	RootCmd.AddCommand(conCmd)
+}
+
+// conCmd contains commands to connect to a published app on the skywire network
+var conCmd = &cobra.Command{
+	Use:   "con <remote_pk:remote_port> [flags]",
+	Short: "Connect to a published app on the skywire network",
+	Long:  "Connect to a published app on the skywire network.\n This will allow you to access the remote app via the skywire network.",
+	Args:  cobra.MinimumNArgs(1),
+	Run: func(cmd *cobra.Command, args []string) {
+
+		rpcClient, err := clirpc.Client(cmd.Flags())
+		if err != nil {
+			os.Exit(1)
+		}
+
+		if len(args) == 0 {
+			cmd.Help() //nolint
+			os.Exit(0)
+		}
+
+		var remotePK cipher.PubKey
+		var remotePort int
+
+		parts := strings.Split(args[0], ":")
+
+		if len(parts) != 2 {
+			cmd.Help() //nolint
+			os.Exit(0)
+		}
+
+		internal.Catch(cmd.Flags(), remotePK.Set(parts[0]))
+
+		if remotePort, err = strconv.Atoi(parts[1]); err != nil {
+			internal.PrintFatalError(cmd.Flags(), fmt.Errorf("invalid port: %s", parts[1]))
+		}
+
+		if remotePort == 0 || localPort == 0 {
+			internal.PrintFatalError(cmd.Flags(), fmt.Errorf("port cannot be 0"))
+		}
+		//65535 is the highest TCP port number
+		if 65536 < remotePort || 65536 < localPort {
+			internal.PrintFatalError(cmd.Flags(), fmt.Errorf("port cannot be greater than 65535"))
+		}
+
+		var appType appnet.AppType
+
+		switch netType {
+		case "http":
+			appType = appnet.HTTP
+		case "tcp":
+			appType = appnet.TCP
+		case "udp":
+			appType = appnet.UDP
+		default:
+			internal.PrintFatalError(cmd.Flags(), fmt.Errorf("invalid type"))
+		}
+
+		connInfo, err := rpcClient.Connect(remotePK, remotePort, localPort, appType)
+		internal.Catch(cmd.Flags(), err)
+
+		internal.PrintOutput(cmd.Flags(), connInfo, fmt.Sprintf("Connected to %s with ID: %s\n", connInfo.RemoteAddr.String(), connInfo.ID.String()))
+		internal.PrintOutput(cmd.Flags(), connInfo, fmt.Sprintf("%v available on localhost:%d\n", connInfo.AppType, connInfo.WebPort))
+	},
+}
+
+// lsCmd contains commands to list connected apps on the skywire network
+var lsCmd = &cobra.Command{
+	Use:   "ls",
+	Short: "List connected apps on the skywire network",
+	Long:  "List connected apps on the skywire network.\nThis will show you the ID, address, and web port of the connected apps.",
+	Args:  cobra.MinimumNArgs(0),
+	Run: func(cmd *cobra.Command, args []string) {
+
+		if len(args) != 0 {
+			cmd.Help() //nolint
+			os.Exit(0)
+		}
+
+		rpcClient, err := clirpc.Client(cmd.Flags())
+		if err != nil {
+			os.Exit(1)
+		}
+
+		connectConns, err := rpcClient.ListConnected()
+		internal.Catch(cmd.Flags(), err)
+
+		var b bytes.Buffer
+		w := tabwriter.NewWriter(&b, 0, 0, 3, ' ', tabwriter.TabIndent)
+		_, err = fmt.Fprintln(w, "id\taddr\tweb_port\tapp_type")
+		internal.Catch(cmd.Flags(), err)
+
+		for _, connectConn := range connectConns {
+			_, err = fmt.Fprintf(w, "%v\t%v\t%v\t%v\n", connectConn.ID, connectConn.RemoteAddr,
+				connectConn.WebPort, connectConn.AppType)
+			internal.Catch(cmd.Flags(), err)
+		}
+		internal.Catch(cmd.Flags(), w.Flush())
+		internal.PrintOutput(cmd.Flags(), connectConns, b.String())
+	},
+}
+
+// stopCmd contains commands to stop a connection to a published app on the skywire network
+var stopCmd = &cobra.Command{
+	Use:   "stop <id>",
+	Short: "Stop a connection to a published app on the skywire network",
+	Long:  "Stop a connection to a published app on the skywire network.\nThis will disconnect you from the remote app.",
+	Args:  cobra.MinimumNArgs(1),
+	Run: func(cmd *cobra.Command, args []string) {
+
+		if len(args) == 0 {
+			cmd.Help() //nolint
+			os.Exit(0)
+		}
+
+		rpcClient, err := clirpc.Client(cmd.Flags())
+		if err != nil {
+			os.Exit(1)
+		}
+
+		id, err := uuid.Parse(args[0])
+		internal.Catch(cmd.Flags(), err)
+		err = rpcClient.Disconnect(id)
+		internal.Catch(cmd.Flags(), err)
+		internal.PrintOutput(cmd.Flags(), "OK", "OK\n")
+	},
+}

cmd/skywire-cli/commands/net/publish.go

@@ -0,0 +1,149 @@
+// Package net cmd/skywire-cli/commands/net/publish.go
+package net
+
+import (
+	"bytes"
+	"fmt"
+	"os"
+	"text/tabwriter"
+
+	"github.com/google/uuid"
+	"github.com/spf13/cobra"
+
+	clirpc "github.com/skycoin/skywire/cmd/skywire-cli/commands/rpc"
+	"github.com/skycoin/skywire/cmd/skywire-cli/internal"
+	"github.com/skycoin/skywire/pkg/app/appnet"
+)
+
+var (
+	netType string
+	skyPort int
+)
+
+func init() {
+	pubCmd.PersistentFlags().IntVarP(&localPort, "port", "p", 0, "local port of the external (http, tcp, udp) app")
+	pubCmd.PersistentFlags().IntVarP(&skyPort, "skyport", "s", localPort, "skywire port for the external (http, tcp, udp) app")
+	pubCmd.PersistentFlags().StringVarP(&netType, "type", "t", "http", "type of the external app connection (http, tcp, udp)")
+
+	pubCmd.AddCommand(lsPubCmd)
+	pubCmd.AddCommand(stopPubCmd)
+	RootCmd.AddCommand(pubCmd)
+}
+
+// pubCmd contains commands to publish over the skywire network
+var pubCmd = &cobra.Command{
+	Use:   "pub [flags]",
+	Short: "Publish over skywire network",
+	Long:  "Publish over skywire network\nPublish a local port over the skywire network. This will allow other nodes to access the local port via the skywire network.",
+	Args:  cobra.MinimumNArgs(0),
+	Run: func(cmd *cobra.Command, _ []string) {
+
+		rpcClient, err := clirpc.Client(cmd.Flags())
+		if err != nil {
+			os.Exit(1)
+		}
+
+		if skyPort == 0 {
+			skyPort = localPort
+		}
+
+		if localPort == 0 && skyPort == 0 {
+			cmd.Help() //nolint
+			os.Exit(0)
+		}
+
+		//port 0 is reserved / not usable
+		if localPort == 0 {
+			internal.PrintFatalError(cmd.Flags(), fmt.Errorf("port cannot be 0"))
+		}
+
+		//skyPort 0 is reserved / not usable
+		if skyPort == 0 {
+			internal.PrintFatalError(cmd.Flags(), fmt.Errorf("skyPort cannot be 0"))
+		}
+
+		//65535 is the highest TCP port number
+		if 65536 < localPort {
+			internal.PrintFatalError(cmd.Flags(), fmt.Errorf("port cannot be greater than 65535"))
+		}
+
+		var appType appnet.AppType
+
+		switch netType {
+		case "http":
+			appType = appnet.HTTP
+		case "tcp":
+			appType = appnet.TCP
+		case "udp":
+			appType = appnet.UDP
+		default:
+			internal.PrintFatalError(cmd.Flags(), fmt.Errorf("invalid type"))
+		}
+
+		internal.Catch(cmd.Flags(), err)
+		pubInfo, err := rpcClient.Publish(localPort, skyPort, appType)
+		internal.Catch(cmd.Flags(), err)
+
+		internal.PrintOutput(cmd.Flags(), pubInfo, fmt.Sprintf("Published on %s with ID: %s\n", pubInfo.SkyAddr.String(), pubInfo.ID.String()))
+
+	},
+}
+
+// lsPubCmd lists all the publised apps on the skywire network by the visor
+var lsPubCmd = &cobra.Command{
+	Use:   "ls",
+	Short: "List published apps on the skywire network by the visor",
+	Long:  "List published apps on the skywire network by the visor\nThe list contains the id and the local port of the published app.",
+	Args:  cobra.MinimumNArgs(0),
+	Run: func(cmd *cobra.Command, args []string) {
+
+		if len(args) != 0 {
+			cmd.Help() //nolint
+			os.Exit(0)
+		}
+
+		rpcClient, err := clirpc.Client(cmd.Flags())
+		if err != nil {
+			os.Exit(1)
+		}
+
+		liss, err := rpcClient.ListPublished()
+		internal.Catch(cmd.Flags(), err)
+		var b bytes.Buffer
+		w := tabwriter.NewWriter(&b, 0, 0, 2, ' ', tabwriter.TabIndent)
+		_, err = fmt.Fprintln(w, "id\tsky_port\tlocal_port\tapp_type")
+		internal.Catch(cmd.Flags(), err)
+		for _, lis := range liss {
+			_, err = fmt.Fprintf(w, "%v\t%v\t%v\t%v\n", lis.ID, lis.SkyAddr.GetPort(), lis.LocalPort, lis.AppType)
+			internal.Catch(cmd.Flags(), err)
+		}
+		internal.Catch(cmd.Flags(), w.Flush())
+		internal.PrintOutput(cmd.Flags(), liss, b.String())
+	},
+}
+
+// stopPubCmd stops a published app on the skywire network published by the visor
+var stopPubCmd = &cobra.Command{
+	Use:   "stop <id>",
+	Short: "Stop a published app on the skywire network by the visor",
+	Long:  "Stop a published app on the skywire network by the visor.\nThis will stop the published app and remove it from the skywire network.",
+	Args:  cobra.MinimumNArgs(1),
+	Run: func(cmd *cobra.Command, args []string) {
+
+		if len(args) == 0 {
+			cmd.Help() //nolint
+			os.Exit(0)
+		}
+
+		rpcClient, err := clirpc.Client(cmd.Flags())
+		if err != nil {
+			os.Exit(1)
+		}
+
+		id, err := uuid.Parse(args[0])
+		internal.Catch(cmd.Flags(), err)
+		err = rpcClient.Depublish(id)
+		internal.Catch(cmd.Flags(), err)
+		internal.PrintOutput(cmd.Flags(), "OK", "OK\n")
+	},
+}

cmd/skywire-cli/commands/net/root.go

@@ -0,0 +1,18 @@
+// Package net cmd/skywire-cli/commands/net/root.go
+package net
+
+import (
+	"github.com/spf13/cobra"
+
+	clirpc "github.com/skycoin/skywire/cmd/skywire-cli/commands/rpc"
+)
+
+func init() {
+	RootCmd.PersistentFlags().StringVar(&clirpc.Addr, "rpc", "localhost:3435", "RPC server address")
+}
+
+// RootCmd contains commands that interact with the skywire network
+var RootCmd = &cobra.Command{
+	Use:   "net",
+	Short: "Publish and connect to skywire network",
+}

cmd/skywire-cli/commands/root.go

@@ -23,8 +23,8 @@ import (
 	clireward "github.com/skycoin/skywire/cmd/skywire-cli/commands/reward"
 	clirewards "github.com/skycoin/skywire/cmd/skywire-cli/commands/rewards"
 	cliroute "github.com/skycoin/skywire/cmd/skywire-cli/commands/route"
-	cliskyfwd "github.com/skycoin/skywire/cmd/skywire-cli/commands/skyfwd"
-	cliskyrev "github.com/skycoin/skywire/cmd/skywire-cli/commands/skyrev"
+
+	clinet "github.com/skycoin/skywire/cmd/skywire-cli/commands/net"
 	clisurvey "github.com/skycoin/skywire/cmd/skywire-cli/commands/survey"
 	clitp "github.com/skycoin/skywire/cmd/skywire-cli/commands/tp"
 	cliut "github.com/skycoin/skywire/cmd/skywire-cli/commands/ut"
@@ -40,8 +40,7 @@ func init() {
 		clivisor.RootCmd,
 		clivpn.RootCmd,
 		cliut.RootCmd,
-		cliskyfwd.RootCmd,
-		cliskyrev.RootCmd,
+		clinet.RootCmd,
 		clireward.RootCmd,
 		clirewards.RootCmd,
 		clisurvey.RootCmd,