Clean up browser bridge and mutation helpers

cmd/keepassgo-browser-bridge/main.go

@@ -11,6 +11,7 @@ import (
 
 	"git.julianfamily.org/keepassgo/internal/browserbridge"
 	"git.julianfamily.org/keepassgo/internal/grpcaddr"
+	"google.golang.org/grpc"
 )
 
 func main() {
@@ -91,11 +92,7 @@ func runStatus(args []string) error {
 		GRPCAddress: strings.TrimSpace(*grpcAddr),
 		BearerToken: strings.TrimSpace(*token),
 	}
-	connCfg, err := req.Connection()
-	if err != nil {
-		return err
-	}
-	conn, client, ctx, err := browserbridge.Dial(context.Background(), connCfg)
+	conn, client, ctx, err := dialBridge(context.Background(), req)
 	if err != nil {
 		return err
 	}
@@ -111,11 +108,7 @@ func runNativeMessage() error {
 	if err != nil {
 		return err
 	}
-	connCfg, err := req.Connection()
-	if err != nil {
-		return browserbridge.WriteResponse(os.Stdout, browserbridge.Response{Success: false, Error: err.Error()})
-	}
-	conn, client, ctx, err := browserbridge.Dial(context.Background(), connCfg)
+	conn, client, ctx, err := dialBridge(context.Background(), req)
 	if err != nil {
 		return browserbridge.WriteResponse(os.Stdout, browserbridge.Response{Success: false, Error: err.Error()})
 	}
@@ -123,6 +116,14 @@ func runNativeMessage() error {
 	return browserbridge.WriteResponse(os.Stdout, browserbridge.HandleRequest(ctx, req, client))
 }
 
+func dialBridge(ctx context.Context, req browserbridge.Request) (*grpc.ClientConn, *browserbridge.GRPCClient, context.Context, error) {
+	connCfg, err := req.Connection()
+	if err != nil {
+		return nil, nil, nil, err
+	}
+	return browserbridge.Dial(ctx, connCfg)
+}
+
 func defaultBinaryPath() (string, error) {
 	return browserbridge.ResolveBridgeBinaryPath("")
 }