Switch from custom socket API to rpcx

cmd/itctl/firmware.go

@@ -8,7 +8,6 @@ import (
 	"github.com/cheggaaa/pb/v3"
 	"github.com/urfave/cli/v2"
 	"go.arsenm.dev/itd/api"
-	"go.arsenm.dev/itd/internal/types"
 )
 
 func fwUpgrade(c *cli.Context) error {
@@ -19,11 +18,11 @@ func fwUpgrade(c *cli.Context) error {
 	// Get relevant data struct
 	if c.String("archive") != "" {
 		// Get archive data struct
-		upgType = types.UpgradeTypeArchive
+		upgType = api.UpgradeTypeArchive
 		files = []string{c.String("archive")}
 	} else if c.String("init-packet") != "" && c.String("firmware") != "" {
 		// Get files data struct
-		upgType = types.UpgradeTypeFiles
+		upgType = api.UpgradeTypeFiles
 		files = []string{c.String("init-packet"), c.String("firmware")}
 	} else {
 		return cli.Exit("Upgrade command requires either archive or init packet and firmware.", 1)
@@ -43,9 +42,9 @@ func fwUpgrade(c *cli.Context) error {
 		// Set total bytes in progress bar
 		bar.SetTotal(event.Total)
 		// Set amount of bytes received in progress bar
-		bar.SetCurrent(event.Received)
+		bar.SetCurrent(int64(event.Received))
 		// If transfer finished, break
-		if event.Sent == event.Total {
+		if int64(event.Sent) == event.Total {
 			break
 		}
 	}

cmd/itctl/fs.go

@@ -76,7 +76,7 @@ func fsRead(c *cli.Context) error {
 		}
 	}
 
-	progress, err := client.ReadFile(path, c.Args().Get(0))
+	progress, err := client.Download(path, c.Args().Get(0))
 	if err != nil {
 		return err
 	}
@@ -91,12 +91,8 @@ func fsRead(c *cli.Context) error {
 		bar.SetTotal(int64(event.Total))
 		// Set amount of bytes sent in progress bar
 		bar.SetCurrent(int64(event.Sent))
-		// If transfer finished, break
-		if event.Done {
-			bar.Finish()
-			break
-		}
 	}
+	bar.Finish()
 
 	if c.Args().Get(1) == "-" {
 		io.Copy(os.Stdout, tmpFile)
@@ -148,7 +144,7 @@ func fsWrite(c *cli.Context) error {
 		defer os.Remove(path)
 	}
 
-	progress, err := client.WriteFile(path, c.Args().Get(1))
+	progress, err := client.Upload(c.Args().Get(1), path)
 	if err != nil {
 		return err
 	}
@@ -163,11 +159,6 @@ func fsWrite(c *cli.Context) error {
 		bar.SetTotal(int64(event.Total))
 		// Set amount of bytes sent in progress bar
 		bar.SetCurrent(int64(event.Sent))
-		// If transfer finished, break
-		if event.Done {
-			bar.Finish()
-			break
-		}
 	}
 
 	return nil

cmd/itctl/set.go

@@ -13,7 +13,7 @@ func setTime(c *cli.Context) error {
 	}
 
 	if c.Args().Get(0) == "now" {
-		return client.SetTimeNow()
+		return client.SetTime(time.Now())
 	} else {
 		parsed, err := time.Parse(time.RFC3339, c.Args().Get(0))
 		if err != nil {

cmd/itctl/update.go

@@ -3,5 +3,5 @@ package main
 import "github.com/urfave/cli/v2"
 
 func updateWeather(c *cli.Context) error {
-	return client.UpdateWeather()
+	return client.WeatherUpdate()
 }

cmd/itgui/time.go

@@ -49,7 +49,7 @@ func timeTab(parent fyne.Window, client *api.Client) *fyne.Container {
 func setTime(client *api.Client, current bool, t ...time.Time) error {
 	var err error
 	if current {
-		err = client.SetTimeNow()
+		err = client.SetTime(time.Now())
 	} else {
 		err = client.SetTime(t[0])
 	}

cmd/itgui/upgrade.go

@@ -11,7 +11,6 @@ import (
 	"fyne.io/fyne/v2/storage"
 	"fyne.io/fyne/v2/widget"
 	"go.arsenm.dev/itd/api"
-	"go.arsenm.dev/itd/internal/types"
 )
 
 func upgradeTab(parent fyne.Window, client *api.Client) *fyne.Container {
@@ -119,10 +118,10 @@ func upgradeTab(parent fyne.Window, client *api.Client) *fyne.Container {
 		// Get appropriate upgrade type and file paths
 		switch upgradeTypeSelect.Selected {
 		case "Archive":
-			fwUpgType = types.UpgradeTypeArchive
+			fwUpgType = api.UpgradeTypeArchive
 			files = append(files, archivePath)
 		case "Files":
-			fwUpgType = types.UpgradeTypeFiles
+			fwUpgType = api.UpgradeTypeFiles
 			files = append(files, initPktPath, firmwarePath)
 		}
 
@@ -144,7 +143,7 @@ func upgradeTab(parent fyne.Window, client *api.Client) *fyne.Container {
 			// Refresh progress bar
 			progressBar.Refresh()
 			// If transfer finished, break
-			if event.Sent == event.Total {
+			if int64(event.Sent) == event.Total {
 				break
 			}
 		}