feat: replace address and port with URL for RPC CLI

crates/bins/wafl/Cargo.toml

@@ -39,6 +39,7 @@ wasmflow-oci = { path = "../../wasmflow/wasmflow-oci" }
 anyhow = "1.0"
 markup-converter = "0.2"
 jaq-core = "0.7"
+url = "2.3.0"
 
 [dev-dependencies]
 trycmd = "0.13"

crates/bins/wafl/src/commands/rpc.rs

@@ -1,6 +1,7 @@
 use std::path::PathBuf;
 
 use clap::{Args, Subcommand};
+use url::Url;
 
 pub(crate) mod invoke;
 pub(crate) mod list;
@@ -23,13 +24,9 @@ pub(crate) enum SubCommands {
 
 #[derive(Debug, Clone, Args)]
 pub(crate) struct ConnectOptions {
-  /// RPC port.
-  #[clap(short, long, env = wasmflow_collection_cli::options::env::WAFL_RPC_PORT,action)]
-  pub(crate) port: u16,
-
-  /// RPC address.
-  #[clap(short, long, default_value = "127.0.0.1", env = wasmflow_collection_cli::options::env::WAFL_RPC_ADDRESS,action)]
-  pub(crate) address: String,
+  /// RPC Url
+  #[clap(short, long)]
+  pub(crate) url: Url,
 
   /// Path to pem file for TLS connections.
   #[clap(long, action)]
@@ -47,3 +44,13 @@ pub(crate) struct ConnectOptions {
   #[clap(long, action)]
   pub(crate) domain: Option<String>,
 }
+
+impl ConnectOptions {
+  pub(crate) fn host(&self) -> String {
+    self.url.host().unwrap().to_string()
+  }
+
+  pub(crate) fn port(&self) -> u16 {
+    self.url.port().unwrap()
+  }
+}

crates/bins/wafl/src/commands/rpc/invoke.rs

@@ -53,7 +53,7 @@ pub(crate) async fn handle(opts: Options) -> Result<()> {
   let _guard = crate::utils::init_logger(&opts.logging)?;
 
   let mut client = wasmflow_rpc::make_rpc_client(
-    format!("http://{}:{}", opts.connection.address, opts.connection.port),
+    format!("http://{}:{}", opts.connection.host(), opts.connection.port()),
     opts.connection.pem,
     opts.connection.key,
     opts.connection.ca,

crates/bins/wafl/src/commands/rpc/list.rs

@@ -14,7 +14,7 @@ pub(crate) struct Options {
 pub(crate) async fn handle(opts: Options) -> Result<()> {
   let _guard = crate::utils::init_logger(&opts.logging)?;
   let mut client = wasmflow_rpc::make_rpc_client(
-    format!("http://{}:{}", opts.connection.address, opts.connection.port),
+    format!("http://{}:{}", opts.connection.host(), opts.connection.port()),
     opts.connection.pem,
     opts.connection.key,
     opts.connection.ca,

crates/bins/wafl/src/commands/rpc/stats.rs

@@ -16,7 +16,7 @@ pub(crate) struct Options {
 pub(crate) async fn handle(opts: Options) -> Result<()> {
   let _guard = crate::utils::init_logger(&opts.logging)?;
   let mut client = wasmflow_rpc::make_rpc_client(
-    format!("http://{}:{}", opts.connection.address, opts.connection.port),
+    format!("http://{}:{}", opts.connection.host(), opts.connection.port()),
     opts.connection.pem,
     opts.connection.key,
     opts.connection.ca,