Add partial CLN support with potential for others in the future

Cargo.toml

@@ -33,6 +33,7 @@ axum-extra = { version = "0.9.3", features = ["cookie"] }
 axum_typed_multipart = "0.11.0"
 tempfile = "3.10.1"
 tower-http = { version = "0.5.2", features = ["fs", "cors"] }
+async-trait = "0.1.81"
 
 [build-dependencies]
 configure_me_codegen = "0.4.1"

config_spec.toml

@@ -8,16 +8,6 @@ name = "sound_dir"
 type = "String"
 doc = "The location to store boost sounds."
 
-[[param]]
-name = "macaroon"
-type = "String"
-doc = "The location of the macaroon file."
-
-[[param]]
-name = "cert"
-type = "String"
-doc = "The location of the tls certificate file."
-
 [[param]]
 name = "listen_port"
 type = "u16"
@@ -31,4 +21,24 @@ doc = "The password to use to access Helipad."
 [[param]]
 name = "lnd_url"
 type = "String"
-doc = "The url and port of the LND grpc api."
+doc = "The url and port of the LND grpc api."
+
+[[param]]
+name = "macaroon"
+type = "String"
+doc = "The location of the LND macaroon file."
+
+[[param]]
+name = "cert"
+type = "String"
+doc = "The location of the LND tls certificate file."
+
+[[param]]
+name = "cln_rest_url"
+type = "String"
+doc = "The url and port of the CLN REST API (e.g. localhost:3001)."
+
+[[param]]
+name = "cln_rest_rune_path"
+type = "String"
+doc = "The location of the CLN REST Rune."

src/handler.rs

@@ -25,6 +25,8 @@ use std::string::String;
 use url::Url;
 use tempfile::NamedTempFile;
 
+use crate::lnclient;
+
 //Structs and Enums ------------------------------------------------------------------------------------------
 #[derive(Debug, Serialize, Deserialize)]
 struct JwtClaims {
@@ -461,10 +463,12 @@ pub async fn api_v1_reply(
     });
 
     let helipad_config = state.helipad_config.clone();
-    let lightning = match lightning::connect_to_lnd(helipad_config.node_address, helipad_config.cert_path, helipad_config.macaroon_path).await {
-        Some(lndconn) => lndconn,
-        None => {
-            return (StatusCode::INTERNAL_SERVER_ERROR, "** Error connecting to LND.").into_response();
+
+    let lightning = match lnclient::connect(&helipad_config).await {
+        Ok(conn) => conn,
+        Err(e) => {
+            eprintln!("** Error connecting to node: {}", e);
+            return (StatusCode::INTERNAL_SERVER_ERROR, "** Error connecting to node.").into_response();
         }
     };