feat: interactive setup

.github/workflows/build.yml

@@ -53,7 +53,7 @@ jobs:
     name: Build binary launcher
     strategy:
       matrix:
-        go-version: [ 1.15.x ]
+        go-version: [ 1.16.x ]
         os: [ linux, darwin, windows ]
         arch: [ amd64, arm64 ]
         exclude:

.github/workflows/release.yml

@@ -29,7 +29,7 @@ jobs:
     name: Build artifacts
     strategy:
       matrix:
-        go-version: [ 1.15.x ]
+        go-version: [ 1.16.x ]
         os: [ linux, darwin, windows ]
         arch: [ amd64, arm64 ]
         exclude:

launcher/cmd/console.go

@@ -1,3 +1,23 @@
 package cmd
 
-// TODO console
+import (
+	"github.com/spf13/cobra"
+)
+
+func init() {
+	rootCmd.AddCommand(consoleCmd)
+}
+
+var consoleCmd = &cobra.Command{
+	Use:   "console",
+	Short: "Start the console",
+	PreRunE: func(cmd *cobra.Command, args []string) error {
+		return launcher.Apply()
+	},
+	RunE: func(cmd *cobra.Command, args []string) error {
+		ctx, cancel := newContext()
+		defer cancel()
+		return launcher.StartConsole(ctx)
+	},
+}
+

launcher/cmd/root.go

@@ -14,20 +14,21 @@ import (
 var (
 	rootCmd = &cobra.Command{
 		Use:           "launcher",
-		Short:         fmt.Sprintf("XUD environment launcher"),
+		Short:         fmt.Sprintf("OpenDEX environment launcher"),
 		SilenceUsage:  true,
 		SilenceErrors: true,
 	}
 	launcher *core.Launcher
 )
 
 func init() {
+	var err error
+
 	if err := os.Setenv("DOCKER_API_VERSION", "1.40"); err != nil {
 		panic(err)
 	}
-	var err error
-	launcher, err = core.NewLauncher()
-	if err != nil {
+	launcher = core.NewLauncher()
+	if err := launcher.Init(); err != nil {
 		panic(err)
 	}
 	err = launcher.AddServiceFlags(rootCmd)
@@ -69,3 +70,7 @@ func newContext() (context.Context, func()) {
 
 	return ctx, _cancel
 }
+
+func CommonPreRunE(cmd *cobra.Command, args []string) error {
+	return launcher.Apply()
+}

launcher/cmd/setup.go

@@ -7,6 +7,7 @@ import (
 
 type SetupOptions struct {
 	NoPull bool
+	Interactive bool
 }
 
 var (
@@ -15,15 +16,14 @@ var (
 
 func init() {
 	setupCmd.PersistentFlags().BoolVar(&setupOpts.NoPull, "nopull", false, "don't pull images")
+	setupCmd.PersistentFlags().BoolVarP(&setupOpts.Interactive, "interactive", "i", false, "interactive setup")
 	rootCmd.AddCommand(setupCmd)
 }
 
 var setupCmd = &cobra.Command{
 	Use:   "setup",
 	Short: "Set up OpenDEX environment",
-	PreRunE: func(cmd *cobra.Command, args []string) error {
-		return launcher.Apply()
-	},
+	PreRunE: CommonPreRunE,
 	RunE: func(cmd *cobra.Command, args []string) error {
 		ctx, cancel := newContext()
 		defer cancel()

launcher/cmd/start.go

@@ -17,6 +17,7 @@ var startCmd = &cobra.Command{
 	RunE: func(cmd *cobra.Command, args []string) error {
 		ctx, cancel := newContext()
 		defer cancel()
-		return launcher.Start(ctx)
+		// FIXME enable start multiple services
+		return launcher.Start(ctx, args[1])
 	},
 }

launcher/cmd/status.go

@@ -1,32 +1,117 @@
 package cmd
 
 import (
-	"errors"
 	"fmt"
+	"github.com/opendexnetwork/opendex-docker/launcher/utils"
 	"github.com/spf13/cobra"
+	"os"
+	"os/exec"
+	"strings"
 )
 
 func init() {
 	rootCmd.AddCommand(statusCmd)
 }
 
+type StatusUpdate struct {
+	Service string
+	Status string
+}
+
 var statusCmd = &cobra.Command{
 	Use:   "status",
 	Short: "Get service status",
-	PreRunE: func(cmd *cobra.Command, args []string) error {
-		return launcher.Apply()
-	},
+	PreRunE: CommonPreRunE,
 	RunE: func(cmd *cobra.Command, args []string) error {
 		ctx, cancel := newContext()
 		defer cancel()
-		if len(args) < 1 {
-			return errors.New("service name required")
+
+		// Checking Docker
+		err := utils.Run(ctx, exec.Command("docker", "info"))
+		if err != nil {
+			return err
 		}
-		status, err := launcher.Status(ctx, args[0])
+
+		// Changing working directory
+		wd, err := os.Getwd()
 		if err != nil {
 			return err
 		}
-		fmt.Println(status)
+		defer os.Chdir(wd)
+
+		if err := os.Chdir(launcher.NetworkDir); err != nil {
+			return err
+		}
+
+		t := utils.SimpleTable{
+			Columns: []utils.TableColumn{
+				{
+					ID: "service",
+					Display: "SERVICE",
+				},
+				{
+					ID: "status",
+					Display: "STATUS",
+				},
+			},
+			Records: []utils.TableRecord{},
+		}
+
+		var statusMap = make(map[string]string)
+
+		names := args
+		if len(names) == 0 {
+			names = launcher.Services.Keys()
+		}
+
+		for _, name := range names {
+			if ! launcher.HasService(name) {
+				return fmt.Errorf("no such service: %s", name)
+			}
+			statusMap[name] = ""
+			t.Records = append(t.Records, utils.TableRecord{
+				Fields: map[string]string{
+					"service": name,
+					"status": "",
+				},
+			})
+		}
+
+		updates := make(chan StatusUpdate)
+
+		for _, name_ := range names {
+			name := name_
+			go func() {
+				status, err := launcher.Status(ctx, name)
+				if err != nil {
+					if strings.HasPrefix(err.Error(), "Error:") {
+						status = err.Error()
+					} else {
+						status = "Error: " + err.Error()
+					}
+					updates <- StatusUpdate{Service: name, Status: status}
+					return
+				}
+				updates <- StatusUpdate{Service: name, Status: status}
+			}()
+		}
+
+		t.Print()
+
+		i := 0
+
+		for i < len(names) {
+			update := <-updates
+			//fmt.Println(i, update)
+			t.PrintUpdate(utils.TableRecord{
+				Fields: map[string]string{
+					"service": update.Service,
+					"status": update.Status,
+				},
+			})
+			i++
+		}
+
 		return nil
 	},
 }

launcher/core/backupto.go

@@ -17,7 +17,7 @@ func (t *Launcher) BackupTo(ctx context.Context, location string) error {
 	if err := t.Gen(ctx); err != nil {
 		return err
 	}
-	if err := t.upOpendexd(ctx); err != nil {
+	if err := t.Opendexd.Start(ctx); err != nil {
 		return err
 	}
 	return nil

launcher/core/cleanup.go

@@ -18,10 +18,7 @@ import (
 
 func (t *Launcher) stopService(ctx context.Context, name string) error {
 	t.Logger.Debugf("Stopping %s", name)
-	s, err := t.GetService(name)
-	if err != nil {
-		return err
-	}
+	s := t.GetService(name)
 	if err := s.Stop(ctx); err != nil {
 		if strings.Contains(err.Error(), "No such container") {
 			t.Logger.Debugf("Service %s stopped already", name)
@@ -50,19 +47,7 @@ func (t *Launcher) stopService(ctx context.Context, name string) error {
 	return nil
 }
 
-func (t *Launcher) Create(ctx context.Context) error {
-	return nil
-}
-
-func (t *Launcher) Start(ctx context.Context) error {
-	return nil
-}
-
-func (t *Launcher) Restart(ctx context.Context) error {
-	return nil
-}
-
-func (t *Launcher) Stop(ctx context.Context) error {
+func (t *Launcher) Stop(ctx context.Context, services ...string) error {
 	if t.Network != types.Simnet {
 		if err := t.stopService(ctx, "boltz"); err != nil {
 			return err
@@ -145,7 +130,8 @@ func (t *Launcher) finalDown(ctx context.Context) error {
 		return fmt.Errorf("create docker client: %w", err)
 	}
 
-	for _, service := range t.ServicesOrder {
+	for _, name := range t.Services.Keys() {
+		service := t.Services.Get(name)
 		containerName := fmt.Sprintf("%s_%s_1", t.Network, service)
 		_, err := client.ContainerInspect(ctx, containerName)
 		if err != nil {
@@ -183,6 +169,17 @@ func (t *Launcher) finalDown(ctx context.Context) error {
 }
 
 func (t *Launcher) Cleanup(ctx context.Context) error {
+	// Changing working directory
+	wd, err := os.Getwd()
+	if err != nil {
+		return err
+	}
+	defer os.Chdir(wd)
+
+	if err := os.Chdir(t.NetworkDir); err != nil {
+		return err
+	}
+
 	// stop all running services
 	if err := t.Stop(ctx); err != nil {
 		return fmt.Errorf("stop: %w", err)

launcher/core/collections/ordered_map.go

@@ -0,0 +1,28 @@
+package collections
+
+type OrderedMap struct {
+	m    map[string]interface{}
+	keys []string
+}
+
+func NewOrderedMap() *OrderedMap {
+	return &OrderedMap{
+		m:    make(map[string]interface{}),
+		keys: []string{},
+	}
+}
+
+func (t *OrderedMap) Get(key string) interface{} {
+	return t.m[key]
+}
+
+func (t *OrderedMap) Put(key string, value interface{}) {
+	if _, existed := t.m[key]; !existed {
+		t.keys = append(t.keys, key)
+	}
+	t.m[key] = value
+}
+
+func (t *OrderedMap) Keys() []string {
+	return t.keys
+}