Updated pub and sub commands

Author: djthorpe

Diff for: Makefile

@@ -14,10 +14,12 @@ GOLDFLAGS += -X $(GOPI).GoBuildTime=$(shell date -u '+%Y-%m-%dT%H:%M:%SZ')
 GOFLAGS = -ldflags "-s -w $(GOLDFLAGS)" 
 
 install:
-	$(GOINSTALL) $(GOFLAGS) ./cmd/mosquittosub
+	$(GOINSTALL) $(GOFLAGS) ./cmd/mqttsub
+	$(GOINSTALL) $(GOFLAGS) ./cmd/mqttpub
 
 test: 
-	$(GOTEST) -v ./...
+	$(GOTEST) -v ./sys/...
+	$(GOTEST) -v ./unit/...
 
 clean: 
 	$(GOCLEAN)

Diff for: cmd/mqttpub/main.go

@@ -0,0 +1,62 @@
+package main
+
+import (
+	"context"
+	"sync"
+
+	// Frameworks
+	gopi "github.com/djthorpe/gopi/v2"
+	mosquitto "github.com/djthorpe/mosquitto"
+)
+
+var (
+	wg sync.WaitGroup
+)
+
+////////////////////////////////////////////////////////////////////////////////
+
+func Main(app gopi.App, args []string) error {
+	client := app.UnitInstance("mosquitto").(mosquitto.Client)
+
+	// Connect to client
+	if topic := app.Flags().GetString("topic", gopi.FLAG_NS_DEFAULT); topic == "" {
+		return gopi.ErrBadParameter.WithPrefix("topic")
+	} else if len(args) == 0 {
+		return gopi.ErrHelp
+	} else if err := client.Connect(mosquitto.MOSQ_FLAG_EVENT_ALL); err != nil {
+		return err
+	} else {
+		// Wait for connect
+		wg.Add(1)
+
+		// Wait for all publish acknowledgements
+		wg.Wait()
+	}
+
+	// Return success
+	return nil
+}
+
+func EventHandler(_ context.Context, app gopi.App, evt_ gopi.Event) {
+	evt := evt_.(mosquitto.Event)
+	client := app.UnitInstance("mosquitto").(mosquitto.Client)
+	topic := app.Flags().GetString("topic", gopi.FLAG_NS_DEFAULT)
+	qos := app.Flags().GetInt("qos", gopi.FLAG_NS_DEFAULT)
+
+	if evt.Type() == mosquitto.MOSQ_FLAG_EVENT_CONNECT && evt.ReturnCode() == 0 {
+		for _, arg := range app.Flags().Args() {
+			if id, err := client.Publish(topic, []byte(arg), mosquitto.OptQOS(qos)); err != nil {
+				app.Log().Error(err)
+			} else {
+				app.Log().Info("PUBLISH:", id)
+				wg.Add(1)
+			}
+		}
+		wg.Done()
+	}
+
+	if evt.Type() == mosquitto.MOSQ_FLAG_EVENT_PUBLISH {
+		app.Log().Info("PUBACK:", evt.Id())
+		wg.Done()
+	}
+}

Diff for: cmd/mqttpub/units.go

@@ -0,0 +1,37 @@
+package main
+
+import (
+	"fmt"
+	"os"
+
+	// Frameworks
+	gopi "github.com/djthorpe/gopi/v2"
+	app "github.com/djthorpe/gopi/v2/app"
+
+	// Units
+	_ "github.com/djthorpe/gopi/v2/unit/bus"
+	_ "github.com/djthorpe/gopi/v2/unit/logger"
+	_ "github.com/djthorpe/mosquitto/unit/mosquitto"
+)
+
+var (
+	Events = []gopi.EventHandler{
+		gopi.EventHandler{Name: "mosquitto.Event", Handler: EventHandler},
+	}
+)
+
+////////////////////////////////////////////////////////////////////////////////
+// BOOTSTRAP
+
+func main() {
+	if app, err := app.NewCommandLineTool(Main, Events, "mosquitto"); err != nil {
+		fmt.Fprintln(os.Stderr, err)
+	} else {
+		// Set flags
+		app.Flags().FlagString("topic", "", "MQTT Topic")
+		app.Flags().FlagInt("qos", 1, "MQTT Quality of service")
+
+		// Run and exit
+		os.Exit(app.Run())
+	}
+}