add rpc_methods endpoint

lib-xps/Cargo.toml

@@ -11,6 +11,7 @@ log.workspace = true
 tracing.workspace = true
 tracing-subscriber.workspace = true
 serde.workspace = true
+serde_json.workspace = true
 tokio.workspace = true
 async-trait.workspace = true
 jsonrpsee.workspace = true
@@ -30,4 +31,3 @@ messaging = { path = "../messaging" }
 jsonrpsee = { workspace = true, features = ["macros", "server", "client"] }
 tokio = { workspace = true, features = ["macros", "rt", "time"] }
 futures = "0.3"
-serde_json.workspace = true

lib-xps/src/lib.rs

@@ -1,38 +1,119 @@
 pub mod rpc;
 pub mod types;
+#[cfg(test)]
 mod util;
 
 use anyhow::Result;
-use ethers::{
-    abi::Address,
-    providers::{Provider, Ws},
-};
-use jsonrpsee::server::Server;
+use ethers::{abi::Address, providers::Middleware};
+use jsonrpsee::{server::Server, RpcModule};
 use std::str::FromStr;
 use xps_types::{CONVERSATION, DID_ETH_REGISTRY};
 
 pub use crate::rpc::{XpsClient, XpsMethods, XpsServer};
 use crate::types::GatewayContext;
 
 /// Entrypoint for the xps Gateway
-pub async fn run<P: AsRef<str>>(host: String, port: u16, provider: P) -> Result<()> {
-    crate::util::init_logging();
-
+pub async fn run<P>(host: String, port: u16, provider: P) -> Result<()>
+where
+    P: Middleware + 'static,
+{
     let server_addr = format!("{}:{}", host, port);
-
-    // a port of 0 allows the OS to choose an open port
     let server = Server::builder().build(server_addr).await?;
     let addr = server.local_addr()?;
 
     let registry_contract = Address::from_str(DID_ETH_REGISTRY)?;
     let conversation_contract = Address::from_str(CONVERSATION)?;
-    let provider = Provider::<Ws>::connect(provider.as_ref()).await.unwrap();
 
     let context = GatewayContext::new(registry_contract, conversation_contract, provider).await?;
-    let xps_methods = rpc::XpsMethods::new(&context);
-    let handle = server.start(xps_methods.into_rpc());
+    let mut methods = RpcModule::new(());
+    methods.merge(rpc::XpsMethods::new(&context).into_rpc())?;
+    let methods = build_rpc_api(methods);
+
+    let handle = server.start(methods);
 
     log::info!("Server Started at {addr}");
     handle.stopped().await;
     Ok(())
 }
+
+// create an endpoint that lists all the methods available on the server, at the
+// endpoint `/rpc_methods`
+fn build_rpc_api<M: Send + Sync + 'static>(mut rpc_api: RpcModule<M>) -> RpcModule<M> {
+    let mut available_methods = rpc_api.method_names().collect::<Vec<_>>();
+    // The "rpc_methods" is defined below and we want it to be part of the reported methods.
+    available_methods.push("rpc_methods");
+    available_methods.sort();
+
+    rpc_api
+        .register_method("rpc_methods", move |_, _| {
+            serde_json::json!({
+                "methods": available_methods,
+            })
+        })
+        .expect("infallible, all other methods have their own address space");
+
+    rpc_api
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use ethers::{prelude::Provider, types::U64};
+    use jsonrpsee::{core::client::ClientT, ws_client::WsClientBuilder};
+
+    #[tokio::test]
+    async fn test_run() -> Result<()> {
+        let (provider, mock) = Provider::mocked();
+        // chainID
+        mock.push(U64::from(0x1)).unwrap();
+        let port = 43594;
+        let handle = tokio::spawn(async move {
+            match run("127.0.0.1".to_string(), 43594, provider).await {
+                Err(e) => log::error!("Error running server: {e}"),
+                Ok(_) => log::info!("Server Stopped"),
+            }
+        });
+
+        // give the server some time to start
+        tokio::time::sleep(std::time::Duration::from_millis(10)).await;
+
+        let client = WsClientBuilder::default()
+            .build(&format!("ws://127.0.0.1:{port}"))
+            .await?;
+
+        #[derive(Debug, serde::Deserialize)]
+        struct Methods {
+            methods: Vec<String>,
+        }
+
+        let methods = client
+            .request::<Methods, Vec<()>>("rpc_methods", vec![])
+            .await?;
+
+        assert_eq!(
+            methods.methods,
+            vec![
+                "rpc_methods",
+                "xps_balance",
+                "xps_fetchKeyPackages",
+                "xps_grantInstallation",
+                "xps_nonce",
+                "xps_revokeInstallation",
+                "xps_sendMessage",
+                "xps_status",
+                "xps_walletAddress",
+            ]
+        );
+
+        handle.abort();
+        Ok(())
+    }
+
+    #[test]
+    fn test_build_api() {
+        let methods = RpcModule::new(());
+        let methods = build_rpc_api(methods);
+        let methods: Vec<String> = methods.method_names().map(String::from).collect();
+        assert_eq!(methods, vec!["rpc_methods",]);
+    }
+}

lib-xps/src/util.rs

@@ -1,17 +1,9 @@
 //! Internal Utility functions for use in crate
-#[cfg(test)]
 use std::sync::Once;
 use tracing_subscriber::{fmt, layer::SubscriberExt, util::SubscriberInitExt, EnvFilter, Registry};
 
-#[cfg(test)]
 static INIT: Once = Once::new();
 
-pub(crate) fn init_logging() {
-    let fmt = fmt::layer().compact();
-    Registry::default().with(env()).with(fmt).init()
-}
-
-#[cfg(test)]
 #[ctor::ctor]
 fn __init_test_logging() {
     INIT.call_once(|| {
@@ -22,6 +14,6 @@ fn __init_test_logging() {
 
 /// Try to get the logging environment from the `RUST_LOG` environment variable.
 /// If it is not set, use the default of `info`.
-fn env() -> EnvFilter {
+pub fn env() -> EnvFilter {
     EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::new("info"))
 }

xps/Cargo.toml

@@ -8,5 +8,8 @@ edition = "2021"
 [dependencies]
 anyhow.workspace = true
 tokio.workspace = true
+ethers = { workspace = true, features = ["ws"] }
+tracing.workspace = true
+tracing-subscriber.workspace = true
 lib-xps = { path = "../lib-xps" }
 clap = { version = "4.4.18", features = ["derive"] }

xps/src/main.rs

@@ -1,6 +1,10 @@
 use anyhow::Result;
 use clap::Parser;
+use ethers::providers::{Provider, Ws};
 use lib_xps::run;
+use tracing_subscriber::{
+    filter::LevelFilter, fmt, layer::SubscriberExt, util::SubscriberInitExt, EnvFilter, Registry,
+};
 
 #[derive(Parser, Debug)]
 #[command(name = "xps", version = "0.1.0", about = "XMTP Postal Service")]
@@ -19,11 +23,21 @@
 
 #[tokio::main]
 async fn main() -> Result<()> {
+    init_logging();
     let args = Args::parse();
-    crate::run(args.host, args.port, args.endpoint).await?;
+    let provider = Provider::<Ws>::connect(&args.endpoint).await?;
+    crate::run(args.host, args.port, provider).await?;
     Ok(())
 }
 
+fn init_logging() {
+    let fmt = fmt::layer().compact();
+    let env = EnvFilter::builder()
+        .with_default_directive(LevelFilter::INFO.into())
+        .from_env_lossy();
+    Registry::default().with(env).with(fmt).init()
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;