Basic connect/disconnect/status implemented. Added configuration

Author: brokenCursor

README.md

@@ -1,2 +1,2 @@
 # usb-modem-cli
-CLI tool for managing USB modems with HTTP API
+CLI tool for managing USB modems with HTTP API

args.go

@@ -3,25 +3,26 @@ package main
 // CLI argument definitions
 type (
 	SMSActionArgs struct {
-		// Send *SMSSendArgs `validate:"-" subcommand:"send" help:"Send SMS"`
-		// Read *SMSReadArgs `validate:"-" subcommand:"read" help:"Read SMS"`
+		Send *SMSSendArgs `validate:"-" arg:"subcommand:send" help:"Send SMS"`
+		Read *SMSReadArgs `validate:"-" arg:"subcommand:read" help:"Read SMS"`
 	}
 
-	// SMSSendArgs struct {
-	// 	PhoneNumber string `validate:"e164" arg:"-n,required" help:"Receiver's phone number"`
-	// 	Message     string `validate:"printascii" arg:"-m,required" help:"Message to be sent"`
-	// }
+	SMSSendArgs struct {
+		PhoneNumber string `validate:"e164" arg:"-p,--phone,required" help:"Receiver's phone number"`
+		Message     string `validate:"printascii" arg:"-m,--msg,required" help:"Message to be sent"`
+	}
 
-	// SMSReadArgs struct {
-	// }
+	SMSReadArgs struct {
+	}
 
 	ConnectionArgs struct {
 		Action string `arg:"positional,required" help:"up/down/status" validate:"oneof=up down status"`
 	}
 
 	BaseArgs struct {
-		Connection *ConnectionArgs `validate:"-" arg:"subcommand:conn" help:"Manage cell connection"`
-		SMS        *SMSActionArgs  `validate:"-" arg:"subcommand:sms" help:"Manage SMS"`
-		Ip         string          `validate:"ipv4" arg:"--ip" help:"Override IP in config file"`
+		Connection   *ConnectionArgs `validate:"-" arg:"subcommand:conn" help:"Manage cell connection"`
+		SMS          *SMSActionArgs  `validate:"-" arg:"subcommand:sms" help:"Manage SMS"`
+		Ip           string          `validate:"omitempty,ipv4" arg:"--ip" help:"Override IP in config file"`
+		DisableColor bool            `arg:"-p,--plain" help:"Disable color for better software interaction"`
 	}
 )

drivers/8810ft.go

@@ -22,7 +22,7 @@ type (
 	}
 
 	pppConnected struct {
-		Connected string `json:"ppp_connected"`
+		Connected string `json:"ppp_status"`
 	}
 )
 
@@ -38,7 +38,7 @@ func newZTE8810FT(ip string) BaseModem {
 }
 
 func (m *zte8810ft) getBaseURL(path string) *url.URL {
-	return &url.URL{Scheme: "https", Host: m.ip, Path: path}
+	return &url.URL{Scheme: "http", Host: m.ip, Path: path}
 }
 
 func (m *zte8810ft) getNewRequest(method string, url *url.URL) *http.Request {
@@ -113,7 +113,6 @@ func (m *zte8810ft) DisconnectCell() error {
 	request := m.getNewRequest("GET", u)
 
 	resp, err := httpClient.Do(request)
-
 	// Process errors
 	switch {
 	case err != nil:
@@ -141,49 +140,57 @@ func (m *zte8810ft) DisconnectCell() error {
 	return nil
 }
 
-func (m *zte8810ft) GetCellConnStatus() (bool, error) {
+func (m *zte8810ft) GetCellConnStatus() (*LinkStatus, error) {
 	// Lines 251-258
 	// /goform/goform_get_cmd_process?isTest=False&cmd=ppp_connected,multi_data=1&sms_received_flag_flag=0&sts_received_flag_flag=0&_=<curr_time>
 
 	// Build URL
 	u := m.getBaseURL("/goform/goform_get_cmd_process")
 	query := u.Query()
 	query.Add("isTest", "False")
-	query.Add("cmd", "ppp_connected")
+	query.Add("cmd", "ppp_status")
 	query.Add("multi_data", "1")
 	query.Add("sms_received_flag_flag", "0")
 	query.Add("sts_received_flag_flag", "0")
 	query.Add("_", strconv.FormatInt((time.Now().UnixMilli)(), 10))
 	u.RawQuery = query.Encode()
 
-	request := m.getNewRequest("POST", u)
+	request := m.getNewRequest("GET", u)
 
 	resp, err := httpClient.Do(request)
 
 	// Process errors
 	switch {
 	case err != nil:
-		return false, ActionError{Action: "status", Err: err}
+		return nil, ActionError{Action: "status", Err: err}
 	case resp.StatusCode != 200:
-		return false, ActionError{Action: "status", Err: fmt.Errorf("response status %d", resp.StatusCode)}
+		return nil, ActionError{Action: "status", Err: fmt.Errorf("response status %d", resp.StatusCode)}
 	}
 
 	// Read the response
 	defer resp.Body.Close()
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
-		return false, ErrUnknown
+		return nil, ErrUnknown
 	}
 
 	result := new(pppConnected)
 	if err := json.Unmarshal(body, result); err != nil {
-		return false, ActionError{Action: "status", Err: UnmarshalError{RawData: &body, Err: err}}
+		return nil, ActionError{Action: "status", Err: UnmarshalError{RawData: &body, Err: err}}
 	}
 
 	// Process the result
-	if result.Connected != "ppp_connected" {
-		return false, nil
+	switch result.Connected {
+	case "ppp_connected":
+		return &LinkStatus{Up: true}, nil
+	case "ppp_connecting":
+		return &LinkStatus{Connecting: true}, nil
+	case "ppp_disconnecting":
+		return &LinkStatus{Disconnecting: true}, nil
+	case "ppp_disconnected":
+		return &LinkStatus{Down: true}, nil
+	default:
+		// Unknown link status occurred
+		return nil, ErrUnknown
 	}
-
-	return true, nil
 }

drivers/common.go

@@ -14,7 +14,7 @@ type (
 	ModemCell interface {
 		BaseModem
 
-		GetCellConnStatus() (bool, error)
+		GetCellConnStatus() (*LinkStatus, error)
 		ConnectCell() error
 		DisconnectCell() error
 	}
@@ -32,6 +32,14 @@ type (
 		Sender  string
 		Message string
 	}
+
+	// Link statuses
+	LinkStatus struct {
+		Up            bool
+		Down          bool
+		Connecting    bool
+		Disconnecting bool
+	}
 )
 
 var drivers map[string]func(ip string) BaseModem = map[string]func(ip string) BaseModem{}

drivers/dummy.go

@@ -1,7 +1,5 @@
 package drivers
 
-import "fmt"
-
 // DO NOT USE DIRECTLY
 type (
 	dummy struct {
@@ -14,7 +12,7 @@ func init() {
 }
 
 func newDummy(ip string) BaseModem {
-	fmt.Println("Dummy driver enabled!")
+	// fmt.Println("Dummy driver enabled!")
 	return &dummy{ip: ip}
 }
 

go.mod

@@ -14,7 +14,9 @@ require (
 	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
+	github.com/gookit/color v1.3.2 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/i582/cfmt v1.4.0 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect

go.sum

@@ -22,8 +22,12 @@ github.com/go-playground/validator/v10 v10.22.0 h1:k6HsTZ0sTnROkhS//R0O+55JgM8C4
 github.com/go-playground/validator/v10 v10.22.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/gookit/color v1.3.2 h1:WO8+16ZZtx+HlOb6cueziUAF8VtALZKRr/jOvuDk0X0=
+github.com/gookit/color v1.3.2/go.mod h1:R3ogXq2B9rTbXoSHJ1HyUVAZ3poOJHpd9nQmyGZsfvQ=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
+github.com/i582/cfmt v1.4.0 h1:DNugs+dvy3xjJSUk9Oita0udy1YVQh2vDP6cWYhDCIQ=
+github.com/i582/cfmt v1.4.0/go.mod h1:tpHWAxhE4Y7yy7sliaNe0pnnEs1SZe67KLljyOlEYI8=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=

mcli.go

@@ -7,6 +7,7 @@ import (
 	"github.com/alexflint/go-arg"
 	"github.com/brokenCursor/usb-modem-cli/drivers"
 	"github.com/go-playground/validator/v10"
+	"github.com/i582/cfmt/cmd/cfmt"
 	"github.com/spf13/viper"
 )
 
@@ -32,16 +33,20 @@ func init() {
 	config.SetConfigType("yaml")
 
 	sep := string(os.PathSeparator)
-	config.AddConfigPath(dir + sep + "modem-cli" + sep + "config.yaml")
+	config.AddConfigPath(dir + sep + "modem-cli")
 
 	config.SetDefault("modem.model", "dummy")
 	config.SetDefault("modem.ip", "127.0.0.1")
 
+	err = config.ReadInConfig()
+	if err != nil { // Handle errors reading the config file
+		panic(fmt.Errorf("fatal error config file: %w", err))
+	}
 }
 
 func main() {
 	if err := run(); err != nil {
-		fmt.Fprintf(os.Stderr, "error: %v\n", err)
+		cfmt.Fprintf(os.Stderr, "{{error:}}::red %v\n", err)
 	}
 }
 
@@ -54,16 +59,20 @@ func run() error {
 	model := modemConfig.GetString("model")
 	ip := modemConfig.GetString("ip")
 
-	// if args.Ip != "" {
-	// 	ip = args.Ip
-	// }
-
 	if err := validate.Struct(args); err != nil {
 		// TODO: add actual error output
-		fmt.Printf("%s\n%v\n", err.Error(), ip)
 		parser.Fail("invalid value for \"--ip\" ")
 	}
 
+	if args.DisableColor {
+		cfmt.DisableColors()
+	}
+
+	// If IP has been overridden
+	if len(args.Ip) > 0 {
+		ip = args.Ip
+	}
+
 	modem, err := drivers.GetModemDriver(model, ip)
 	if err != nil {
 		return err
@@ -82,40 +91,55 @@ func run() error {
 		}
 
 		switch args.Connection.Action {
+		case "up":
+			err := cell.ConnectCell()
+
+			if err != nil {
+				return err
+			}
+		case "down":
+			err := cell.DisconnectCell()
+
+			if err != nil {
+				return err
+			}
 		case "status":
-			isConnected, err := cell.GetCellConnStatus()
+			status, err := cell.GetCellConnStatus()
 
 			if err != nil {
 				return err
 			}
 
-			if isConnected {
-				fmt.Println("Status: up")
-			} else {
-				fmt.Println("Status: down")
+			// Process and output status
+			switch {
+			case status.Up:
+				cfmt.Println("Status: {{up}}::green|bold")
+			case status.Down:
+				cfmt.Println("Status: {{down}}::red|bold")
+			case status.Connecting:
+				cfmt.Println("Status: {{connecting}}::yellow|bold")
+			case status.Disconnecting:
+				cfmt.Println("Status: {{disconnecting}}::#FA8100|bold")
+			}
+		}
+	case args.SMS != nil:
+		// None of this is implemented :)
+		sms, ok := modem.(drivers.ModemSMS)
+		if !ok {
+			return DriverSupportError{Driver: modem, Function: "SMS"}
+		}
+
+		switch {
+		case args.SMS.Send != nil:
+			err := validate.Struct(args.SMS.Send)
+			if err != nil {
+				parser.FailSubcommand("Unknown action", "sms")
 			}
-			return nil
+			sms.SendSMS(args.SMS.Send.PhoneNumber, args.SMS.Send.PhoneNumber)
 		}
-	// case args.SMS != nil:
-	// 	// None of this is implemented :)
-	// 	sms, ok := modem.(drivers.ModemSMS)
-	// 	if !ok {
-	// 		return DriverSupportError{Driver: modem, Function: "SMS"}
-	// 	}
-
-	// 	switch {
-	// 	case args.SMS.Read != nil:
-	// 		err := validate.Struct(args.SMS.Send)
-	// 		if err != nil {
-	// 			parser.FailSubcommand("Unknown action", "sms")
-	// 		}
-	// 		sms.SendSMS(args.SMS.Send.PhoneNumber, args.SMS.Send.PhoneNumber)
-	// 	}
 	case parser.Subcommand() == nil:
 		parser.Fail("Missing or unknown command")
 	}
 
-	fmt.Printf("Modem cmd: %s\n", args.Ip)
-
 	return nil
 }