Basic logging for main & drivers complete

Author: brokenCursor

drivers/8810ft.go

@@ -4,14 +4,12 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"log/slog"
 	"net/http"
 	"net/url"
 	"strconv"
 	"strings"
 	"time"
 
-	"github.com/brokenCursor/usb-modem-cli/logging"
 	"github.com/warthog618/sms/encoding/gsm7"
 )
 
@@ -31,16 +29,9 @@ type (
 	}
 )
 
-var (
-	httpClient *http.Client
-	l          *slog.Logger
-)
-
 func init() {
-	l = logging.GetDriverLogger("ZTE 8810FT")
-	httpClient = &http.Client{Timeout: time.Second * 30}
 	registerDriver("ZTE 8810FT", newZTE8810FT)
-	l.Debug("driver registered")
+	// dLogger.Debug("driver registered")
 }
 
 func newZTE8810FT(host string) BaseModem {
@@ -84,6 +75,8 @@ func (m *zte8810ft) ConnectCell() error {
 	u.RawQuery = query.Encode()
 	request := m.getNewRequest("GET", u, http.Header{})
 
+	dLogger.With("driver", "8810FT").Debug("request", request.URL.String(), nil)
+
 	resp, err := httpClient.Do(request)
 
 	// Process errors
@@ -122,6 +115,8 @@ func (m *zte8810ft) DisconnectCell() error {
 	u.RawQuery = query.Encode()
 	request := m.getNewRequest("GET", u, http.Header{})
 
+	dLogger.With("driver", "8810FT").Debug("request", request.URL.String(), nil)
+
 	resp, err := httpClient.Do(request)
 	// Process errors
 	switch {
@@ -151,9 +146,6 @@ func (m *zte8810ft) DisconnectCell() 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()
@@ -167,6 +159,8 @@ func (m *zte8810ft) GetCellConnStatus() (*LinkStatus, error) {
 
 	request := m.getNewRequest("GET", u, http.Header{})
 
+	dLogger.With("driver", "8810FT").Debug("request", request.URL.String(), nil)
+
 	resp, err := httpClient.Do(request)
 
 	// Process errors
@@ -192,13 +186,13 @@ func (m *zte8810ft) GetCellConnStatus() (*LinkStatus, error) {
 	// Process the result
 	switch result.Connected {
 	case "ppp_connected":
-		return &LinkStatus{Up: true}, nil
+		return &LinkStatus{State: 3}, nil
 	case "ppp_connecting":
-		return &LinkStatus{Connecting: true}, nil
+		return &LinkStatus{State: 2}, nil
 	case "ppp_disconnecting":
-		return &LinkStatus{Disconnecting: true}, nil
+		return &LinkStatus{State: 1}, nil
 	case "ppp_disconnected":
-		return &LinkStatus{Down: true}, nil
+		return &LinkStatus{State: 0}, nil
 	default:
 		// Unknown link status occurred
 		return nil, ErrUnknown
@@ -245,10 +239,13 @@ func (m *zte8810ft) SendSMS(phone string, message string) error {
 		"Content-Type": {"application/x-www-form-urlencoded", "charset=UTF-8"}})
 
 	// Some Go-level string manipulation
-	stringReader := strings.NewReader(query.Encode())
+	encoded := query.Encode()
+	stringReader := strings.NewReader(encoded)
 	stringReadCloser := io.NopCloser(stringReader)
 	request.Body = stringReadCloser
 
+	dLogger.With("driver", "8810FT").Debug("url", request.URL.String(), "body", encoded, nil)
+
 	resp, err := httpClient.Do(request)
 
 	// Process errors

drivers/common.go

@@ -3,7 +3,10 @@ package drivers
 import (
 	"fmt"
 	"log/slog"
+	"net/http"
+	"time"
 
+	"github.com/brokenCursor/usb-modem-cli/config"
 	"github.com/brokenCursor/usb-modem-cli/logging"
 )
 
@@ -40,20 +43,26 @@ type (
 
 	// Link statuses
 	LinkStatus struct {
-		Up            bool
-		Down          bool
-		Connecting    bool
-		Disconnecting bool
+		State int8
 	}
 )
 
 var (
-	drivers map[string]func(host string) BaseModem = map[string]func(host string) BaseModem{}
+	drivers    map[string]func(host string) BaseModem = map[string]func(host string) BaseModem{}
+	httpClient *http.Client
+
 	logger  *slog.Logger
+	dLogger *slog.Logger
 )
 
 func init() {
 	logger = logging.GetGeneralLogger()
+	// TODO: fix per-driver logging while keeping the dependency three sane-ish
+	dLogger = logging.GetDriverLogger("common")
+
+	driverConfig := config.Sub("driver")
+	// logger.Debug("ttl", driverConfig.GetDuration("cmd_ttl")*time.Second)
+	httpClient = &http.Client{Timeout: driverConfig.GetDuration("cmd_ttl") * time.Second}
 }
 
 func isRegistered(name string) bool {

drivers/dummy.go

@@ -3,28 +3,28 @@ package drivers
 // DO NOT USE DIRECTLY
 type (
 	dummy struct {
-		ip string
+		host string
 	}
 )
 
 func init() {
 	registerDriver("dummy", newDummy)
+	dLogger.With("driver", "dummy").Debug("dummy driver registered")
 }
 
-func newDummy(ip string) BaseModem {
-	// fmt.Println("Dummy driver enabled!")
-	return &dummy{ip: ip}
+func newDummy(host string) BaseModem {
+	return &dummy{host: host}
 }
 
 func (m *dummy) GetModel() string {
 	return "Dummy"
 }
 
 func (m *dummy) SetHost(ip string) error {
-	m.ip = ip
+	m.host = ip
 	return nil
 }
 
 func (m *dummy) GetHost() string {
-	return m.ip
+	return m.host
 }

logging/logging.go

@@ -65,5 +65,5 @@ func GetGeneralLogger() *slog.Logger {
 }
 
 func GetDriverLogger(name string) *slog.Logger {
-	return driver.With("driver", name)
+	return driver
 }

mcli.go

@@ -90,14 +90,14 @@ func run() error {
 			}
 
 			// Process and output status
-			switch {
-			case status.Up:
+			switch status.State {
+			case 3:
 				cfmt.Println("Status: {{up}}::green|bold")
-			case status.Down:
+			case 0:
 				cfmt.Println("Status: {{down}}::red|bold")
-			case status.Connecting:
+			case 2:
 				cfmt.Println("Status: {{connecting}}::yellow|bold")
-			case status.Disconnecting:
+			case 1:
 				cfmt.Println("Status: {{disconnecting}}::#FA8100|bold")
 			}
 		}