Return protobuf serialized ErrorResponse from APIs.

Author: G8XSU

ldk-server/src/service.rs

@@ -13,6 +13,7 @@ use crate::api::bolt12_receive::{handle_bolt12_receive_request, BOLT12_RECEIVE_P
 use crate::api::bolt12_send::{handle_bolt12_send_request, BOLT12_SEND_PATH};
 use crate::api::close_channel::{handle_close_channel_request, CLOSE_CHANNEL_PATH};
 use crate::api::error::LdkServerError;
+use crate::api::error::LdkServerErrorCode::InvalidRequestError;
 use crate::api::get_balances::{handle_get_balances_request, GET_BALANCES};
 use crate::api::get_node_info::{handle_get_node_info_request, GET_NODE_INFO};
 use crate::api::get_payment_details::{
@@ -30,6 +31,7 @@ use crate::api::update_channel_config::{
 	handle_update_channel_config_request, UPDATE_CHANNEL_CONFIG_PATH,
 };
 use crate::io::paginated_kv_store::PaginatedKVStore;
+use crate::util::proto_adapter::to_error_response;
 use std::future::Future;
 use std::pin::Pin;
 use std::sync::Arc;
@@ -129,16 +131,23 @@ async fn handle_request<
 				.body(Full::new(Bytes::from(response.encode_to_vec())))
 				// unwrap safety: body only errors when previous chained calls failed.
 				.unwrap()),
-			Err(e) => Ok(Response::builder()
-				.status(StatusCode::INTERNAL_SERVER_ERROR)
-				.body(Full::new(Bytes::from(e.to_string().into_bytes())))
+			Err(e) => {
+				let (error_response, status_code) = to_error_response(e);
+				Ok(Response::builder()
+					.status(status_code)
+					.body(Full::new(Bytes::from(error_response.encode_to_vec())))
+					// unwrap safety: body only errors when previous chained calls failed.
+					.unwrap())
+			},
+		},
+		Err(_) => {
+			let (error_response, status_code) =
+				to_error_response(LdkServerError::new(InvalidRequestError, "Malformed request."));
+			Ok(Response::builder()
+				.status(status_code)
+				.body(Full::new(Bytes::from(error_response.encode_to_vec())))
 				// unwrap safety: body only errors when previous chained calls failed.
-				.unwrap()),
+				.unwrap())
 		},
-		Err(_) => Ok(Response::builder()
-			.status(StatusCode::BAD_REQUEST)
-			.body(Full::new(Bytes::from(b"Error parsing request".to_vec())))
-			// unwrap safety: body only errors when previous chained calls failed.
-			.unwrap()),
 	}
 }

ldk-server/src/util/proto_adapter.rs

@@ -1,7 +1,10 @@
 use crate::api::error::LdkServerError;
-use crate::api::error::LdkServerErrorCode::InvalidRequestError;
+use crate::api::error::LdkServerErrorCode::{
+	AuthError, InternalServerError, InvalidRequestError, LightningError,
+};
 use bytes::Bytes;
 use hex::prelude::*;
+use hyper::StatusCode;
 use ldk_node::bitcoin::hashes::sha256;
 use ldk_node::bitcoin::secp256k1::PublicKey;
 use ldk_node::config::{ChannelConfig, MaxDustHTLCExposure};
@@ -11,6 +14,7 @@ use ldk_node::payment::{
 	ConfirmationStatus, PaymentDetails, PaymentDirection, PaymentKind, PaymentStatus,
 };
 use ldk_node::{ChannelDetails, LightningBalance, PendingSweepBalance, UserChannelId};
+use ldk_server_protos::error::{ErrorCode, ErrorResponse};
 use ldk_server_protos::types::confirmation_status::Status::{Confirmed, Unconfirmed};
 use ldk_server_protos::types::lightning_balance::BalanceType::{
 	ClaimableAwaitingConfirmations, ClaimableOnChannelClose, ContentiousClaimable,
@@ -409,3 +413,23 @@ pub(crate) fn proto_to_bolt11_description(
 		},
 	})
 }
+
+pub(crate) fn to_error_response(ldk_error: LdkServerError) -> (ErrorResponse, StatusCode) {
+	let error_code = match ldk_error.error_code {
+		InvalidRequestError => ErrorCode::InvalidRequestError,
+		AuthError => ErrorCode::AuthError,
+		LightningError => ErrorCode::LightningError,
+		InternalServerError => ErrorCode::InternalServerError,
+	} as i32;
+
+	let status = match ldk_error.error_code {
+		InvalidRequestError => StatusCode::BAD_REQUEST,
+		AuthError => StatusCode::UNAUTHORIZED,
+		LightningError => StatusCode::INTERNAL_SERVER_ERROR,
+		InternalServerError => StatusCode::INTERNAL_SERVER_ERROR,
+	};
+
+	let error_response = ErrorResponse { message: ldk_error.message, error_code };
+
+	(error_response, status)
+}