feat: bifrost cli improvements

Signed-off-by: Christian Stewart <[email protected]>

LICENSE

@@ -175,7 +175,7 @@
 
    END OF TERMS AND CONDITIONS
 
-   Copyright (c) 2018-2023 Aperture Robotics, LLC.
+   Copyright (c) 2018-2024 Aperture Robotics, LLC.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

cli/daemonflags.go

@@ -107,7 +107,6 @@ func (a *DaemonArgs) BuildFlags() []cli.Flag {
 			Name:        "pubsub",
 			Usage:       buildPubsubUsage(),
 			EnvVars:     []string{"BIFROST_PUBSUB"},
-			Value:       "floodsub",
 			Destination: &a.Pubsub,
 		},
 	}

cmd/bifrost/bifrost_daemon.yaml

@@ -3,9 +3,8 @@ hold-open:
   config: {}
 
 pubsub:
-  id: bifrost/nats
-  config:
-    peerId: any
+  id: bifrost/floodsub
+  config: {}
 
 udp:
   id: bifrost/udp

cmd/bifrost/cmd_daemon.go

@@ -151,6 +151,9 @@ func runDaemon(c *cli.Context) error {
 		}
 	}
 
+	// Apply factories
+	daemonFlags.ApplyFactories(b, sr)
+
 	// Daemon API
 	if daemonFlags.APIListen != "" {
 		_, _, apiRef, err := loader.WaitExecControllerRunning(
@@ -182,9 +185,7 @@ func runDaemon(c *cli.Context) error {
 	}
 	defer csRef.Release()
 
-	// TODO: Load these from CLI/yaml configuration.
-	// For now, hardcode it.
-	daemonFlags.ApplyFactories(b, sr)
+	// Load config sets and factories
 	if err := daemonFlags.ApplyToConfigSet(confSet, true); err != nil {
 		return err
 	}

cmd/bifrost/main.go

@@ -19,6 +19,11 @@ func main() {
 	app.Usage = "command-line node and tools for bifrost"
 	app.Commands = commands
 
+	// Metadata
+	app.Description = "Check out the docs and examples:\n\nhttps://github.com/aperturerobotics/bifrost"
+	app.Copyright = "Apache License, Version 2.0."
+
+	// Hide version if unset
 	if version == "" {
 		app.HideVersion = true
 	} else {

daemon/daemon.go

@@ -8,7 +8,6 @@ import (
 	"github.com/aperturerobotics/bifrost/keypem"
 	"github.com/aperturerobotics/bifrost/peer"
 	nctr "github.com/aperturerobotics/bifrost/peer/controller"
-	nats_controller "github.com/aperturerobotics/bifrost/pubsub/nats/controller"
 	"github.com/aperturerobotics/controllerbus/bus"
 	"github.com/aperturerobotics/controllerbus/controller"
 	"github.com/aperturerobotics/controllerbus/controller/loader"
@@ -66,7 +65,6 @@ func NewDaemon(
 	}
 
 	sr.AddFactory(api_controller.NewFactory(b))
-	sr.AddFactory(nats_controller.NewFactory(b))
 	for _, ctor := range opts.ExtraControllerFactories {
 		if ctor != nil {
 			sr.AddFactory(ctor(b))