feat: rename send package to rpc

Also makes some method names more explicit. Signed-off-by: Brian McGee <[email protected]>
brianmcgee · Apr 15, 2024 · 713b26e · 713b26e
1 parent 276e25f
commit 713b26e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/internal/cmd/cli/Invoke.go b/internal/cmd/cli/Invoke.go
@@ -9,7 +9,7 @@ import (
 	"github.com/nats-io/nats.go"
 	"golang.org/x/sync/errgroup"
 
-	"github.com/brianmcgee/cbus/pkg/send"
+	"github.com/brianmcgee/cbus/pkg/rpc"
 	nutil "github.com/numtide/nits/pkg/nats"
 )
 
@@ -23,7 +23,7 @@ type Invoke struct {
 }
 
 func (i *Invoke) Run() (err error) {
-	if err = send.Init(i.Nats); err != nil {
+	if err = rpc.Init(i.Nats); err != nil {
 		return err
 	}
 
@@ -34,7 +34,7 @@ func (i *Invoke) Run() (err error) {
 
 	eg, ctx := errgroup.WithContext(ctx)
 	eg.Go(func() error {
-		return send.Method(ctx, i.Destination, i.Path, i.Property, respCh, i.Nkeys...)
+		return rpc.InvokeMethod(ctx, i.Destination, i.Path, i.Property, respCh, i.Nkeys...)
 	})
 
 	for msg := range respCh {

diff --git a/internal/cmd/cli/get.go b/internal/cmd/cli/get.go
@@ -9,7 +9,7 @@ import (
 	"github.com/nats-io/nats.go"
 	"golang.org/x/sync/errgroup"
 
-	"github.com/brianmcgee/cbus/pkg/send"
+	"github.com/brianmcgee/cbus/pkg/rpc"
 	nutil "github.com/numtide/nits/pkg/nats"
 )
 
@@ -23,7 +23,7 @@ type Get struct {
 }
 
 func (g *Get) Run() (err error) {
-	if err = send.Init(g.Nats); err != nil {
+	if err = rpc.Init(g.Nats); err != nil {
 		return err
 	}
 
@@ -34,7 +34,7 @@ func (g *Get) Run() (err error) {
 
 	eg, ctx := errgroup.WithContext(ctx)
 	eg.Go(func() error {
-		return send.Get(ctx, g.Destination, g.Path, g.Property, respCh, g.Nkeys...)
+		return rpc.GetProperty(ctx, g.Destination, g.Path, g.Property, respCh, g.Nkeys...)
 	})
 
 	for msg := range respCh {

diff --git a/pkg/agent/agent.go b/pkg/agent/agent.go
@@ -31,7 +31,7 @@ func Init(natsConfig nutil.CliOptions) (err error) {
 		return errors.Annotate(err, "failed to connect to system dbus")
 	}
 
-	// create a separate monitor connection, it can only be used to listen for messages, not send
+	// create a separate monitor connection, it can only be used to listen for messages, not rpc
 	monitorConn, err = dbus.ConnectSystemBus()
 	if err != nil {
 		return errors.Annotate(err, "failed to connect to system dbus")

diff --git a/pkg/send/send.go → pkg/rpc/rpc.go b/pkg/send/send.go → pkg/rpc/rpc.go
@@ -1,4 +1,4 @@
-package send
+package rpc
 
 import (
 	"context"
@@ -47,7 +47,7 @@ func request(
 			name,
 		)
 
-		// send the request
+		// rpc the request
 		msg := nats.NewMsg(subject)
 		msg.Reply = inbox
 
@@ -66,7 +66,7 @@ func request(
 				name,
 			)
 
-			// send the request
+			// rpc the request
 			msg := nats.NewMsg(subject)
 			msg.Reply = inbox
 
@@ -93,7 +93,7 @@ func request(
 	}
 }
 
-func Get(
+func GetProperty(
 	ctx context.Context,
 	dest string,
 	path string,
@@ -104,7 +104,7 @@ func Get(
 	return request(ctx, dest, path, "prop", name, respCh, nkeys...)
 }
 
-func Method(
+func InvokeMethod(
 	ctx context.Context,
 	dest string,
 	path string,