Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions cli/src/main.rs
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
use clap::{Parser, Subcommand};
use client::client::LdkNodeServerClient;
use client::error::LdkNodeServerError;
use client::client::LdkServerClient;
use client::error::LdkServerError;
use client::protos::api::{
Bolt11ReceiveRequest, Bolt11SendRequest, Bolt12ReceiveRequest, Bolt12SendRequest,
OnchainReceiveRequest, OnchainSendRequest, OpenChannelRequest,
Expand DownExpand Up@@ -78,7 +78,7 @@ enum Commands {
#[tokio::main]
async fn main() {
let cli = Cli::parse();
let client = LdkNodeServerClient::new(cli.base_url);
let client = LdkServerClient::new(cli.base_url);

match cli.command {
Commands::OnchainReceive => {
Expand DownExpand Up@@ -141,7 +141,7 @@ async fn main() {
}
}

fn handle_response<Rs: ::prost::Message>(response: Result<Rs, LdkNodeServerError>) {
fn handle_response<Rs: ::prost::Message>(response: Result<Rs, LdkServerError>) {
match response {
Ok(response) => {
println!("{:?}", response);
Expand Down
34 changes: 17 additions & 17 deletions client/src/client.rs
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
use prost::Message;

use crate::error::LdkNodeServerError;
use crate::error::LdkServerError;
use protos::api::{
Bolt11ReceiveRequest, Bolt11ReceiveResponse, Bolt11SendRequest, Bolt11SendResponse,
Bolt12ReceiveRequest, Bolt12ReceiveResponse, Bolt12SendRequest, Bolt12SendResponse,
Expand All@@ -23,15 +23,15 @@ const OPEN_CHANNEL_PATH: &str = "OpenChannel";
const CLOSE_CHANNEL_PATH: &str = "CloseChannel";
const LIST_CHANNELS_PATH: &str = "ListChannels";

/// Client to access a hosted instance of LDK Node Server.
/// Client to access a hosted instance of LDK Server.
#[derive(Clone)]
pub struct LdkNodeServerClient {
pub struct LdkServerClient {
base_url: String,
client: Client,
}

impl LdkNodeServerClient {
/// Constructs a [`LdkNodeServerClient`] using `base_url` as the server endpoint.
impl LdkServerClient {
/// Constructs a [`LdkServerClient`] using `base_url` as the server endpoint.
pub fn new(base_url: String) -> Self {
Self { base_url, client: Client::new() }
}
Expand All@@ -40,7 +40,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`OnchainReceiveRequest`] and [`OnchainReceiveResponse`].
pub async fn onchain_receive(
&self, request: OnchainReceiveRequest,
) -> Result<OnchainReceiveResponse, LdkNodeServerError> {
) -> Result<OnchainReceiveResponse, LdkServerError> {
let url = format!("http://{}/{ONCHAIN_RECEIVE_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -49,7 +49,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`OnchainSendRequest`] and [`OnchainSendResponse`].
pub async fn onchain_send(
&self, request: OnchainSendRequest,
) -> Result<OnchainSendResponse, LdkNodeServerError> {
) -> Result<OnchainSendResponse, LdkServerError> {
let url = format!("http://{}/{ONCHAIN_SEND_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -58,7 +58,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`Bolt11ReceiveRequest`] and [`Bolt11ReceiveResponse`].
pub async fn bolt11_receive(
&self, request: Bolt11ReceiveRequest,
) -> Result<Bolt11ReceiveResponse, LdkNodeServerError> {
) -> Result<Bolt11ReceiveResponse, LdkServerError> {
let url = format!("http://{}/{BOLT11_RECEIVE_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -67,7 +67,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`Bolt11SendRequest`] and [`Bolt11SendResponse`].
pub async fn bolt11_send(
&self, request: Bolt11SendRequest,
) -> Result<Bolt11SendResponse, LdkNodeServerError> {
) -> Result<Bolt11SendResponse, LdkServerError> {
let url = format!("http://{}/{BOLT11_SEND_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -76,7 +76,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`Bolt12ReceiveRequest`] and [`Bolt12ReceiveResponse`].
pub async fn bolt12_receive(
&self, request: Bolt12ReceiveRequest,
) -> Result<Bolt12ReceiveResponse, LdkNodeServerError> {
) -> Result<Bolt12ReceiveResponse, LdkServerError> {
let url = format!("http://{}/{BOLT12_RECEIVE_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -85,7 +85,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`Bolt12SendRequest`] and [`Bolt12SendResponse`].
pub async fn bolt12_send(
&self, request: Bolt12SendRequest,
) -> Result<Bolt12SendResponse, LdkNodeServerError> {
) -> Result<Bolt12SendResponse, LdkServerError> {
let url = format!("http://{}/{BOLT12_SEND_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -94,7 +94,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`OpenChannelRequest`] and [`OpenChannelResponse`].
pub async fn open_channel(
&self, request: OpenChannelRequest,
) -> Result<OpenChannelResponse, LdkNodeServerError> {
) -> Result<OpenChannelResponse, LdkServerError> {
let url = format!("http://{}/{OPEN_CHANNEL_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -103,7 +103,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`CloseChannelRequest`] and [`CloseChannelResponse`].
pub async fn close_channel(
&self, request: CloseChannelRequest,
) -> Result<CloseChannelResponse, LdkNodeServerError> {
) -> Result<CloseChannelResponse, LdkServerError> {
let url = format!("http://{}/{CLOSE_CHANNEL_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -112,14 +112,14 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`ListChannelsRequest`] and [`ListChannelsResponse`].
pub async fn list_channels(
&self, request: ListChannelsRequest,
) -> Result<ListChannelsResponse, LdkNodeServerError> {
) -> Result<ListChannelsResponse, LdkServerError> {
let url = format!("http://{}/{LIST_CHANNELS_PATH}", self.base_url);
self.post_request(&request, &url).await
}

async fn post_request<Rq: Message, Rs: Message + Default>(
&self, request: &Rq, url: &str,
) -> Result<Rs, LdkNodeServerError> {
) -> Result<Rs, LdkServerError> {
let request_body = request.encode_to_vec();
let response_raw = match self
.client
Expand All@@ -131,7 +131,7 @@ impl LdkNodeServerClient {
{
Ok(response) => response,
Err(e) => {
return Err(LdkNodeServerError::InternalError(e.to_string()));
return Err(LdkServerError::InternalError(e.to_string()));
},
};
let status = response_raw.status();
Expand All@@ -141,7 +141,7 @@ impl LdkNodeServerClient {
Ok(Rs::decode(&payload[..])?)
} else {
//TODO: Error handling and error response parsing.
Err(LdkNodeServerError::InternalError("Unknown Error".to_string()))
Err(LdkServerError::InternalError("Unknown Error".to_string()))
}
}
}
12 changes: 6 additions & 6 deletions client/src/error.rs
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
use prost::DecodeError;

/// When there is an error in request to LDK Node Server, the response contains a relevant error code.
/// When there is an error in request to LDK Server, the response contains a relevant error code.
#[derive(Debug)]
pub enum LdkNodeServerError {
pub enum LdkServerError {
/// There is an unknown error. (Placeholder until error handling is done.)
InternalError(String),
}

impl From<DecodeError> for LdkNodeServerError {
impl From<DecodeError> for LdkServerError {
fn from(err: DecodeError) -> Self {
LdkNodeServerError::InternalError(err.to_string())
LdkServerError::InternalError(err.to_string())
}
}

impl From<reqwest::Error> for LdkNodeServerError {
impl From<reqwest::Error> for LdkServerError {
fn from(err: reqwest::Error) -> Self {
LdkNodeServerError::InternalError(err.to_string())
LdkServerError::InternalError(err.to_string())
}
}
6 changes: 3 additions & 3 deletions client/src/lib.rs
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
//! Client-side library to interact with LDK Node Server.
//! Client-side library to interact with LDK Server.

#![deny(rustdoc::broken_intra_doc_links)]
#![deny(rustdoc::private_intra_doc_links)]
#![deny(missing_docs)]

/// Implements a client ([`client::LdkNodeServerClient`]) to access a hosted instance of LDK Node Server.
/// Implements a client ([`client::LdkServerClient`]) to access a hosted instance of LDK Server.
pub mod client;

/// Implements the error type ([`error::LdkNodeServerError`]) returned on interacting with [`client::LdkNodeServerClient`]
/// Implements the error type ([`error::LdkServerError`]) returned on interacting with [`client::LdkServerClient`]
pub mod error;

/// Request/Response structs required for interacting with the client.
Expand Down
2 changes: 1 addition & 1 deletion server/Cargo.toml
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
[package]
name = "ldk-node-server"
name = "ldk-server"
version = "0.1.0"
edition = "2021"

Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Rename to LdkServer. by G8XSU · Pull Request #24 · lightningdevkit/ldk-server · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions cli/src/main.rs
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
use clap::{Parser, Subcommand};
use client::client::LdkNodeServerClient;
use client::error::LdkNodeServerError;
use client::client::LdkServerClient;
use client::error::LdkServerError;
use client::protos::api::{
Bolt11ReceiveRequest, Bolt11SendRequest, Bolt12ReceiveRequest, Bolt12SendRequest,
OnchainReceiveRequest, OnchainSendRequest, OpenChannelRequest,
Expand DownExpand Up@@ -78,7 +78,7 @@ enum Commands {
#[tokio::main]
async fn main() {
let cli = Cli::parse();
let client = LdkNodeServerClient::new(cli.base_url);
let client = LdkServerClient::new(cli.base_url);

match cli.command {
Commands::OnchainReceive => {
Expand DownExpand Up@@ -141,7 +141,7 @@ async fn main() {
}
}

fn handle_response<Rs: ::prost::Message>(response: Result<Rs, LdkNodeServerError>) {
fn handle_response<Rs: ::prost::Message>(response: Result<Rs, LdkServerError>) {
match response {
Ok(response) => {
println!("{:?}", response);
Expand Down
34 changes: 17 additions & 17 deletions client/src/client.rs
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
use prost::Message;

use crate::error::LdkNodeServerError;
use crate::error::LdkServerError;
use protos::api::{
Bolt11ReceiveRequest, Bolt11ReceiveResponse, Bolt11SendRequest, Bolt11SendResponse,
Bolt12ReceiveRequest, Bolt12ReceiveResponse, Bolt12SendRequest, Bolt12SendResponse,
Expand All@@ -23,15 +23,15 @@ const OPEN_CHANNEL_PATH: &str = "OpenChannel";
const CLOSE_CHANNEL_PATH: &str = "CloseChannel";
const LIST_CHANNELS_PATH: &str = "ListChannels";

/// Client to access a hosted instance of LDK Node Server.
/// Client to access a hosted instance of LDK Server.
#[derive(Clone)]
pub struct LdkNodeServerClient {
pub struct LdkServerClient {
base_url: String,
client: Client,
}

impl LdkNodeServerClient {
/// Constructs a [`LdkNodeServerClient`] using `base_url` as the server endpoint.
impl LdkServerClient {
/// Constructs a [`LdkServerClient`] using `base_url` as the server endpoint.
pub fn new(base_url: String) -> Self {
Self { base_url, client: Client::new() }
}
Expand All@@ -40,7 +40,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`OnchainReceiveRequest`] and [`OnchainReceiveResponse`].
pub async fn onchain_receive(
&self, request: OnchainReceiveRequest,
) -> Result<OnchainReceiveResponse, LdkNodeServerError> {
) -> Result<OnchainReceiveResponse, LdkServerError> {
let url = format!("http://{}/{ONCHAIN_RECEIVE_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -49,7 +49,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`OnchainSendRequest`] and [`OnchainSendResponse`].
pub async fn onchain_send(
&self, request: OnchainSendRequest,
) -> Result<OnchainSendResponse, LdkNodeServerError> {
) -> Result<OnchainSendResponse, LdkServerError> {
let url = format!("http://{}/{ONCHAIN_SEND_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -58,7 +58,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`Bolt11ReceiveRequest`] and [`Bolt11ReceiveResponse`].
pub async fn bolt11_receive(
&self, request: Bolt11ReceiveRequest,
) -> Result<Bolt11ReceiveResponse, LdkNodeServerError> {
) -> Result<Bolt11ReceiveResponse, LdkServerError> {
let url = format!("http://{}/{BOLT11_RECEIVE_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -67,7 +67,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`Bolt11SendRequest`] and [`Bolt11SendResponse`].
pub async fn bolt11_send(
&self, request: Bolt11SendRequest,
) -> Result<Bolt11SendResponse, LdkNodeServerError> {
) -> Result<Bolt11SendResponse, LdkServerError> {
let url = format!("http://{}/{BOLT11_SEND_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -76,7 +76,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`Bolt12ReceiveRequest`] and [`Bolt12ReceiveResponse`].
pub async fn bolt12_receive(
&self, request: Bolt12ReceiveRequest,
) -> Result<Bolt12ReceiveResponse, LdkNodeServerError> {
) -> Result<Bolt12ReceiveResponse, LdkServerError> {
let url = format!("http://{}/{BOLT12_RECEIVE_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -85,7 +85,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`Bolt12SendRequest`] and [`Bolt12SendResponse`].
pub async fn bolt12_send(
&self, request: Bolt12SendRequest,
) -> Result<Bolt12SendResponse, LdkNodeServerError> {
) -> Result<Bolt12SendResponse, LdkServerError> {
let url = format!("http://{}/{BOLT12_SEND_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -94,7 +94,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`OpenChannelRequest`] and [`OpenChannelResponse`].
pub async fn open_channel(
&self, request: OpenChannelRequest,
) -> Result<OpenChannelResponse, LdkNodeServerError> {
) -> Result<OpenChannelResponse, LdkServerError> {
let url = format!("http://{}/{OPEN_CHANNEL_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -103,7 +103,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`CloseChannelRequest`] and [`CloseChannelResponse`].
pub async fn close_channel(
&self, request: CloseChannelRequest,
) -> Result<CloseChannelResponse, LdkNodeServerError> {
) -> Result<CloseChannelResponse, LdkServerError> {
let url = format!("http://{}/{CLOSE_CHANNEL_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -112,14 +112,14 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`ListChannelsRequest`] and [`ListChannelsResponse`].
pub async fn list_channels(
&self, request: ListChannelsRequest,
) -> Result<ListChannelsResponse, LdkNodeServerError> {
) -> Result<ListChannelsResponse, LdkServerError> {
let url = format!("http://{}/{LIST_CHANNELS_PATH}", self.base_url);
self.post_request(&request, &url).await
}

async fn post_request<Rq: Message, Rs: Message + Default>(
&self, request: &Rq, url: &str,
) -> Result<Rs, LdkNodeServerError> {
) -> Result<Rs, LdkServerError> {
let request_body = request.encode_to_vec();
let response_raw = match self
.client
Expand All@@ -131,7 +131,7 @@ impl LdkNodeServerClient {
{
Ok(response) => response,
Err(e) => {
return Err(LdkNodeServerError::InternalError(e.to_string()));
return Err(LdkServerError::InternalError(e.to_string()));
},
};
let status = response_raw.status();
Expand All@@ -141,7 +141,7 @@ impl LdkNodeServerClient {
Ok(Rs::decode(&payload[..])?)
} else {
//TODO: Error handling and error response parsing.
Err(LdkNodeServerError::InternalError("Unknown Error".to_string()))
Err(LdkServerError::InternalError("Unknown Error".to_string()))
}
}
}
12 changes: 6 additions & 6 deletions client/src/error.rs
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
use prost::DecodeError;

/// When there is an error in request to LDK Node Server, the response contains a relevant error code.
/// When there is an error in request to LDK Server, the response contains a relevant error code.
#[derive(Debug)]
pub enum LdkNodeServerError {
pub enum LdkServerError {
/// There is an unknown error. (Placeholder until error handling is done.)
InternalError(String),
}

impl From<DecodeError> for LdkNodeServerError {
impl From<DecodeError> for LdkServerError {
fn from(err: DecodeError) -> Self {
LdkNodeServerError::InternalError(err.to_string())
LdkServerError::InternalError(err.to_string())
}
}

impl From<reqwest::Error> for LdkNodeServerError {
impl From<reqwest::Error> for LdkServerError {
fn from(err: reqwest::Error) -> Self {
LdkNodeServerError::InternalError(err.to_string())
LdkServerError::InternalError(err.to_string())
}
}
6 changes: 3 additions & 3 deletions client/src/lib.rs
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
//! Client-side library to interact with LDK Node Server.
//! Client-side library to interact with LDK Server.

#![deny(rustdoc::broken_intra_doc_links)]
#![deny(rustdoc::private_intra_doc_links)]
#![deny(missing_docs)]

/// Implements a client ([`client::LdkNodeServerClient`]) to access a hosted instance of LDK Node Server.
/// Implements a client ([`client::LdkServerClient`]) to access a hosted instance of LDK Server.
pub mod client;

/// Implements the error type ([`error::LdkNodeServerError`]) returned on interacting with [`client::LdkNodeServerClient`]
/// Implements the error type ([`error::LdkServerError`]) returned on interacting with [`client::LdkServerClient`]
pub mod error;

/// Request/Response structs required for interacting with the client.
Expand Down
2 changes: 1 addition & 1 deletion server/Cargo.toml
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
[package]
name = "ldk-node-server"
name = "ldk-server"
version = "0.1.0"
edition = "2021"

Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Rename to LdkServer. by G8XSU · Pull Request #24 · lightningdevkit/ldk-server · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions cli/src/main.rs
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
use clap::{Parser, Subcommand};
use client::client::LdkNodeServerClient;
use client::error::LdkNodeServerError;
use client::client::LdkServerClient;
use client::error::LdkServerError;
use client::protos::api::{
Bolt11ReceiveRequest, Bolt11SendRequest, Bolt12ReceiveRequest, Bolt12SendRequest,
OnchainReceiveRequest, OnchainSendRequest, OpenChannelRequest,
Expand DownExpand Up@@ -78,7 +78,7 @@ enum Commands {
#[tokio::main]
async fn main() {
let cli = Cli::parse();
let client = LdkNodeServerClient::new(cli.base_url);
let client = LdkServerClient::new(cli.base_url);

match cli.command {
Commands::OnchainReceive => {
Expand DownExpand Up@@ -141,7 +141,7 @@ async fn main() {
}
}

fn handle_response<Rs: ::prost::Message>(response: Result<Rs, LdkNodeServerError>) {
fn handle_response<Rs: ::prost::Message>(response: Result<Rs, LdkServerError>) {
match response {
Ok(response) => {
println!("{:?}", response);
Expand Down
34 changes: 17 additions & 17 deletions client/src/client.rs
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
use prost::Message;

use crate::error::LdkNodeServerError;
use crate::error::LdkServerError;
use protos::api::{
Bolt11ReceiveRequest, Bolt11ReceiveResponse, Bolt11SendRequest, Bolt11SendResponse,
Bolt12ReceiveRequest, Bolt12ReceiveResponse, Bolt12SendRequest, Bolt12SendResponse,
Expand All@@ -23,15 +23,15 @@ const OPEN_CHANNEL_PATH: &str = "OpenChannel";
const CLOSE_CHANNEL_PATH: &str = "CloseChannel";
const LIST_CHANNELS_PATH: &str = "ListChannels";

/// Client to access a hosted instance of LDK Node Server.
/// Client to access a hosted instance of LDK Server.
#[derive(Clone)]
pub struct LdkNodeServerClient {
pub struct LdkServerClient {
base_url: String,
client: Client,
}

impl LdkNodeServerClient {
/// Constructs a [`LdkNodeServerClient`] using `base_url` as the server endpoint.
impl LdkServerClient {
/// Constructs a [`LdkServerClient`] using `base_url` as the server endpoint.
pub fn new(base_url: String) -> Self {
Self { base_url, client: Client::new() }
}
Expand All@@ -40,7 +40,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`OnchainReceiveRequest`] and [`OnchainReceiveResponse`].
pub async fn onchain_receive(
&self, request: OnchainReceiveRequest,
) -> Result<OnchainReceiveResponse, LdkNodeServerError> {
) -> Result<OnchainReceiveResponse, LdkServerError> {
let url = format!("http://{}/{ONCHAIN_RECEIVE_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -49,7 +49,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`OnchainSendRequest`] and [`OnchainSendResponse`].
pub async fn onchain_send(
&self, request: OnchainSendRequest,
) -> Result<OnchainSendResponse, LdkNodeServerError> {
) -> Result<OnchainSendResponse, LdkServerError> {
let url = format!("http://{}/{ONCHAIN_SEND_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -58,7 +58,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`Bolt11ReceiveRequest`] and [`Bolt11ReceiveResponse`].
pub async fn bolt11_receive(
&self, request: Bolt11ReceiveRequest,
) -> Result<Bolt11ReceiveResponse, LdkNodeServerError> {
) -> Result<Bolt11ReceiveResponse, LdkServerError> {
let url = format!("http://{}/{BOLT11_RECEIVE_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -67,7 +67,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`Bolt11SendRequest`] and [`Bolt11SendResponse`].
pub async fn bolt11_send(
&self, request: Bolt11SendRequest,
) -> Result<Bolt11SendResponse, LdkNodeServerError> {
) -> Result<Bolt11SendResponse, LdkServerError> {
let url = format!("http://{}/{BOLT11_SEND_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -76,7 +76,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`Bolt12ReceiveRequest`] and [`Bolt12ReceiveResponse`].
pub async fn bolt12_receive(
&self, request: Bolt12ReceiveRequest,
) -> Result<Bolt12ReceiveResponse, LdkNodeServerError> {
) -> Result<Bolt12ReceiveResponse, LdkServerError> {
let url = format!("http://{}/{BOLT12_RECEIVE_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -85,7 +85,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`Bolt12SendRequest`] and [`Bolt12SendResponse`].
pub async fn bolt12_send(
&self, request: Bolt12SendRequest,
) -> Result<Bolt12SendResponse, LdkNodeServerError> {
) -> Result<Bolt12SendResponse, LdkServerError> {
let url = format!("http://{}/{BOLT12_SEND_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -94,7 +94,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`OpenChannelRequest`] and [`OpenChannelResponse`].
pub async fn open_channel(
&self, request: OpenChannelRequest,
) -> Result<OpenChannelResponse, LdkNodeServerError> {
) -> Result<OpenChannelResponse, LdkServerError> {
let url = format!("http://{}/{OPEN_CHANNEL_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -103,7 +103,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`CloseChannelRequest`] and [`CloseChannelResponse`].
pub async fn close_channel(
&self, request: CloseChannelRequest,
) -> Result<CloseChannelResponse, LdkNodeServerError> {
) -> Result<CloseChannelResponse, LdkServerError> {
let url = format!("http://{}/{CLOSE_CHANNEL_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -112,14 +112,14 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`ListChannelsRequest`] and [`ListChannelsResponse`].
pub async fn list_channels(
&self, request: ListChannelsRequest,
) -> Result<ListChannelsResponse, LdkNodeServerError> {
) -> Result<ListChannelsResponse, LdkServerError> {
let url = format!("http://{}/{LIST_CHANNELS_PATH}", self.base_url);
self.post_request(&request, &url).await
}

async fn post_request<Rq: Message, Rs: Message + Default>(
&self, request: &Rq, url: &str,
) -> Result<Rs, LdkNodeServerError> {
) -> Result<Rs, LdkServerError> {
let request_body = request.encode_to_vec();
let response_raw = match self
.client
Expand All@@ -131,7 +131,7 @@ impl LdkNodeServerClient {
{
Ok(response) => response,
Err(e) => {
return Err(LdkNodeServerError::InternalError(e.to_string()));
return Err(LdkServerError::InternalError(e.to_string()));
},
};
let status = response_raw.status();
Expand All@@ -141,7 +141,7 @@ impl LdkNodeServerClient {
Ok(Rs::decode(&payload[..])?)
} else {
//TODO: Error handling and error response parsing.
Err(LdkNodeServerError::InternalError("Unknown Error".to_string()))
Err(LdkServerError::InternalError("Unknown Error".to_string()))
}
}
}
12 changes: 6 additions & 6 deletions client/src/error.rs
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
use prost::DecodeError;

/// When there is an error in request to LDK Node Server, the response contains a relevant error code.
/// When there is an error in request to LDK Server, the response contains a relevant error code.
#[derive(Debug)]
pub enum LdkNodeServerError {
pub enum LdkServerError {
/// There is an unknown error. (Placeholder until error handling is done.)
InternalError(String),
}

impl From<DecodeError> for LdkNodeServerError {
impl From<DecodeError> for LdkServerError {
fn from(err: DecodeError) -> Self {
LdkNodeServerError::InternalError(err.to_string())
LdkServerError::InternalError(err.to_string())
}
}

impl From<reqwest::Error> for LdkNodeServerError {
impl From<reqwest::Error> for LdkServerError {
fn from(err: reqwest::Error) -> Self {
LdkNodeServerError::InternalError(err.to_string())
LdkServerError::InternalError(err.to_string())
}
}
6 changes: 3 additions & 3 deletions client/src/lib.rs
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
//! Client-side library to interact with LDK Node Server.
//! Client-side library to interact with LDK Server.

#![deny(rustdoc::broken_intra_doc_links)]
#![deny(rustdoc::private_intra_doc_links)]
#![deny(missing_docs)]

/// Implements a client ([`client::LdkNodeServerClient`]) to access a hosted instance of LDK Node Server.
/// Implements a client ([`client::LdkServerClient`]) to access a hosted instance of LDK Server.
pub mod client;

/// Implements the error type ([`error::LdkNodeServerError`]) returned on interacting with [`client::LdkNodeServerClient`]
/// Implements the error type ([`error::LdkServerError`]) returned on interacting with [`client::LdkServerClient`]
pub mod error;

/// Request/Response structs required for interacting with the client.
Expand Down
2 changes: 1 addition & 1 deletion server/Cargo.toml
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
[package]
name = "ldk-node-server"
name = "ldk-server"
version = "0.1.0"
edition = "2021"

Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Rename to LdkServer. by G8XSU · Pull Request #24 · lightningdevkit/ldk-server · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions cli/src/main.rs
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
use clap::{Parser, Subcommand};
use client::client::LdkNodeServerClient;
use client::error::LdkNodeServerError;
use client::client::LdkServerClient;
use client::error::LdkServerError;
use client::protos::api::{
Bolt11ReceiveRequest, Bolt11SendRequest, Bolt12ReceiveRequest, Bolt12SendRequest,
OnchainReceiveRequest, OnchainSendRequest, OpenChannelRequest,
Expand DownExpand Up@@ -78,7 +78,7 @@ enum Commands {
#[tokio::main]
async fn main() {
let cli = Cli::parse();
let client = LdkNodeServerClient::new(cli.base_url);
let client = LdkServerClient::new(cli.base_url);

match cli.command {
Commands::OnchainReceive => {
Expand DownExpand Up@@ -141,7 +141,7 @@ async fn main() {
}
}

fn handle_response<Rs: ::prost::Message>(response: Result<Rs, LdkNodeServerError>) {
fn handle_response<Rs: ::prost::Message>(response: Result<Rs, LdkServerError>) {
match response {
Ok(response) => {
println!("{:?}", response);
Expand Down
34 changes: 17 additions & 17 deletions client/src/client.rs
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
use prost::Message;

use crate::error::LdkNodeServerError;
use crate::error::LdkServerError;
use protos::api::{
Bolt11ReceiveRequest, Bolt11ReceiveResponse, Bolt11SendRequest, Bolt11SendResponse,
Bolt12ReceiveRequest, Bolt12ReceiveResponse, Bolt12SendRequest, Bolt12SendResponse,
Expand All@@ -23,15 +23,15 @@ const OPEN_CHANNEL_PATH: &str = "OpenChannel";
const CLOSE_CHANNEL_PATH: &str = "CloseChannel";
const LIST_CHANNELS_PATH: &str = "ListChannels";

/// Client to access a hosted instance of LDK Node Server.
/// Client to access a hosted instance of LDK Server.
#[derive(Clone)]
pub struct LdkNodeServerClient {
pub struct LdkServerClient {
base_url: String,
client: Client,
}

impl LdkNodeServerClient {
/// Constructs a [`LdkNodeServerClient`] using `base_url` as the server endpoint.
impl LdkServerClient {
/// Constructs a [`LdkServerClient`] using `base_url` as the server endpoint.
pub fn new(base_url: String) -> Self {
Self { base_url, client: Client::new() }
}
Expand All@@ -40,7 +40,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`OnchainReceiveRequest`] and [`OnchainReceiveResponse`].
pub async fn onchain_receive(
&self, request: OnchainReceiveRequest,
) -> Result<OnchainReceiveResponse, LdkNodeServerError> {
) -> Result<OnchainReceiveResponse, LdkServerError> {
let url = format!("http://{}/{ONCHAIN_RECEIVE_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -49,7 +49,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`OnchainSendRequest`] and [`OnchainSendResponse`].
pub async fn onchain_send(
&self, request: OnchainSendRequest,
) -> Result<OnchainSendResponse, LdkNodeServerError> {
) -> Result<OnchainSendResponse, LdkServerError> {
let url = format!("http://{}/{ONCHAIN_SEND_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -58,7 +58,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`Bolt11ReceiveRequest`] and [`Bolt11ReceiveResponse`].
pub async fn bolt11_receive(
&self, request: Bolt11ReceiveRequest,
) -> Result<Bolt11ReceiveResponse, LdkNodeServerError> {
) -> Result<Bolt11ReceiveResponse, LdkServerError> {
let url = format!("http://{}/{BOLT11_RECEIVE_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -67,7 +67,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`Bolt11SendRequest`] and [`Bolt11SendResponse`].
pub async fn bolt11_send(
&self, request: Bolt11SendRequest,
) -> Result<Bolt11SendResponse, LdkNodeServerError> {
) -> Result<Bolt11SendResponse, LdkServerError> {
let url = format!("http://{}/{BOLT11_SEND_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -76,7 +76,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`Bolt12ReceiveRequest`] and [`Bolt12ReceiveResponse`].
pub async fn bolt12_receive(
&self, request: Bolt12ReceiveRequest,
) -> Result<Bolt12ReceiveResponse, LdkNodeServerError> {
) -> Result<Bolt12ReceiveResponse, LdkServerError> {
let url = format!("http://{}/{BOLT12_RECEIVE_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -85,7 +85,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`Bolt12SendRequest`] and [`Bolt12SendResponse`].
pub async fn bolt12_send(
&self, request: Bolt12SendRequest,
) -> Result<Bolt12SendResponse, LdkNodeServerError> {
) -> Result<Bolt12SendResponse, LdkServerError> {
let url = format!("http://{}/{BOLT12_SEND_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -94,7 +94,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`OpenChannelRequest`] and [`OpenChannelResponse`].
pub async fn open_channel(
&self, request: OpenChannelRequest,
) -> Result<OpenChannelResponse, LdkNodeServerError> {
) -> Result<OpenChannelResponse, LdkServerError> {
let url = format!("http://{}/{OPEN_CHANNEL_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -103,7 +103,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`CloseChannelRequest`] and [`CloseChannelResponse`].
pub async fn close_channel(
&self, request: CloseChannelRequest,
) -> Result<CloseChannelResponse, LdkNodeServerError> {
) -> Result<CloseChannelResponse, LdkServerError> {
let url = format!("http://{}/{CLOSE_CHANNEL_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -112,14 +112,14 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`ListChannelsRequest`] and [`ListChannelsResponse`].
pub async fn list_channels(
&self, request: ListChannelsRequest,
) -> Result<ListChannelsResponse, LdkNodeServerError> {
) -> Result<ListChannelsResponse, LdkServerError> {
let url = format!("http://{}/{LIST_CHANNELS_PATH}", self.base_url);
self.post_request(&request, &url).await
}

async fn post_request<Rq: Message, Rs: Message + Default>(
&self, request: &Rq, url: &str,
) -> Result<Rs, LdkNodeServerError> {
) -> Result<Rs, LdkServerError> {
let request_body = request.encode_to_vec();
let response_raw = match self
.client
Expand All@@ -131,7 +131,7 @@ impl LdkNodeServerClient {
{
Ok(response) => response,
Err(e) => {
return Err(LdkNodeServerError::InternalError(e.to_string()));
return Err(LdkServerError::InternalError(e.to_string()));
},
};
let status = response_raw.status();
Expand All@@ -141,7 +141,7 @@ impl LdkNodeServerClient {
Ok(Rs::decode(&payload[..])?)
} else {
//TODO: Error handling and error response parsing.
Err(LdkNodeServerError::InternalError("Unknown Error".to_string()))
Err(LdkServerError::InternalError("Unknown Error".to_string()))
}
}
}
12 changes: 6 additions & 6 deletions client/src/error.rs
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
use prost::DecodeError;

/// When there is an error in request to LDK Node Server, the response contains a relevant error code.
/// When there is an error in request to LDK Server, the response contains a relevant error code.
#[derive(Debug)]
pub enum LdkNodeServerError {
pub enum LdkServerError {
/// There is an unknown error. (Placeholder until error handling is done.)
InternalError(String),
}

impl From<DecodeError> for LdkNodeServerError {
impl From<DecodeError> for LdkServerError {
fn from(err: DecodeError) -> Self {
LdkNodeServerError::InternalError(err.to_string())
LdkServerError::InternalError(err.to_string())
}
}

impl From<reqwest::Error> for LdkNodeServerError {
impl From<reqwest::Error> for LdkServerError {
fn from(err: reqwest::Error) -> Self {
LdkNodeServerError::InternalError(err.to_string())
LdkServerError::InternalError(err.to_string())
}
}
6 changes: 3 additions & 3 deletions client/src/lib.rs
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
//! Client-side library to interact with LDK Node Server.
//! Client-side library to interact with LDK Server.

#![deny(rustdoc::broken_intra_doc_links)]
#![deny(rustdoc::private_intra_doc_links)]
#![deny(missing_docs)]

/// Implements a client ([`client::LdkNodeServerClient`]) to access a hosted instance of LDK Node Server.
/// Implements a client ([`client::LdkServerClient`]) to access a hosted instance of LDK Server.
pub mod client;

/// Implements the error type ([`error::LdkNodeServerError`]) returned on interacting with [`client::LdkNodeServerClient`]
/// Implements the error type ([`error::LdkServerError`]) returned on interacting with [`client::LdkServerClient`]
pub mod error;

/// Request/Response structs required for interacting with the client.
Expand Down
2 changes: 1 addition & 1 deletion server/Cargo.toml
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
[package]
name = "ldk-node-server"
name = "ldk-server"
version = "0.1.0"
edition = "2021"

Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Rename to LdkServer. by G8XSU · Pull Request #24 · lightningdevkit/ldk-server · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions cli/src/main.rs
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
use clap::{Parser, Subcommand};
use client::client::LdkNodeServerClient;
use client::error::LdkNodeServerError;
use client::client::LdkServerClient;
use client::error::LdkServerError;
use client::protos::api::{
Bolt11ReceiveRequest, Bolt11SendRequest, Bolt12ReceiveRequest, Bolt12SendRequest,
OnchainReceiveRequest, OnchainSendRequest, OpenChannelRequest,
Expand DownExpand Up@@ -78,7 +78,7 @@ enum Commands {
#[tokio::main]
async fn main() {
let cli = Cli::parse();
let client = LdkNodeServerClient::new(cli.base_url);
let client = LdkServerClient::new(cli.base_url);

match cli.command {
Commands::OnchainReceive => {
Expand DownExpand Up@@ -141,7 +141,7 @@ async fn main() {
}
}

fn handle_response<Rs: ::prost::Message>(response: Result<Rs, LdkNodeServerError>) {
fn handle_response<Rs: ::prost::Message>(response: Result<Rs, LdkServerError>) {
match response {
Ok(response) => {
println!("{:?}", response);
Expand Down
34 changes: 17 additions & 17 deletions client/src/client.rs
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
use prost::Message;

use crate::error::LdkNodeServerError;
use crate::error::LdkServerError;
use protos::api::{
Bolt11ReceiveRequest, Bolt11ReceiveResponse, Bolt11SendRequest, Bolt11SendResponse,
Bolt12ReceiveRequest, Bolt12ReceiveResponse, Bolt12SendRequest, Bolt12SendResponse,
Expand All@@ -23,15 +23,15 @@ const OPEN_CHANNEL_PATH: &str = "OpenChannel";
const CLOSE_CHANNEL_PATH: &str = "CloseChannel";
const LIST_CHANNELS_PATH: &str = "ListChannels";

/// Client to access a hosted instance of LDK Node Server.
/// Client to access a hosted instance of LDK Server.
#[derive(Clone)]
pub struct LdkNodeServerClient {
pub struct LdkServerClient {
base_url: String,
client: Client,
}

impl LdkNodeServerClient {
/// Constructs a [`LdkNodeServerClient`] using `base_url` as the server endpoint.
impl LdkServerClient {
/// Constructs a [`LdkServerClient`] using `base_url` as the server endpoint.
pub fn new(base_url: String) -> Self {
Self { base_url, client: Client::new() }
}
Expand All@@ -40,7 +40,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`OnchainReceiveRequest`] and [`OnchainReceiveResponse`].
pub async fn onchain_receive(
&self, request: OnchainReceiveRequest,
) -> Result<OnchainReceiveResponse, LdkNodeServerError> {
) -> Result<OnchainReceiveResponse, LdkServerError> {
let url = format!("http://{}/{ONCHAIN_RECEIVE_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -49,7 +49,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`OnchainSendRequest`] and [`OnchainSendResponse`].
pub async fn onchain_send(
&self, request: OnchainSendRequest,
) -> Result<OnchainSendResponse, LdkNodeServerError> {
) -> Result<OnchainSendResponse, LdkServerError> {
let url = format!("http://{}/{ONCHAIN_SEND_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -58,7 +58,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`Bolt11ReceiveRequest`] and [`Bolt11ReceiveResponse`].
pub async fn bolt11_receive(
&self, request: Bolt11ReceiveRequest,
) -> Result<Bolt11ReceiveResponse, LdkNodeServerError> {
) -> Result<Bolt11ReceiveResponse, LdkServerError> {
let url = format!("http://{}/{BOLT11_RECEIVE_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -67,7 +67,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`Bolt11SendRequest`] and [`Bolt11SendResponse`].
pub async fn bolt11_send(
&self, request: Bolt11SendRequest,
) -> Result<Bolt11SendResponse, LdkNodeServerError> {
) -> Result<Bolt11SendResponse, LdkServerError> {
let url = format!("http://{}/{BOLT11_SEND_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -76,7 +76,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`Bolt12ReceiveRequest`] and [`Bolt12ReceiveResponse`].
pub async fn bolt12_receive(
&self, request: Bolt12ReceiveRequest,
) -> Result<Bolt12ReceiveResponse, LdkNodeServerError> {
) -> Result<Bolt12ReceiveResponse, LdkServerError> {
let url = format!("http://{}/{BOLT12_RECEIVE_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -85,7 +85,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`Bolt12SendRequest`] and [`Bolt12SendResponse`].
pub async fn bolt12_send(
&self, request: Bolt12SendRequest,
) -> Result<Bolt12SendResponse, LdkNodeServerError> {
) -> Result<Bolt12SendResponse, LdkServerError> {
let url = format!("http://{}/{BOLT12_SEND_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -94,7 +94,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`OpenChannelRequest`] and [`OpenChannelResponse`].
pub async fn open_channel(
&self, request: OpenChannelRequest,
) -> Result<OpenChannelResponse, LdkNodeServerError> {
) -> Result<OpenChannelResponse, LdkServerError> {
let url = format!("http://{}/{OPEN_CHANNEL_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -103,7 +103,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`CloseChannelRequest`] and [`CloseChannelResponse`].
pub async fn close_channel(
&self, request: CloseChannelRequest,
) -> Result<CloseChannelResponse, LdkNodeServerError> {
) -> Result<CloseChannelResponse, LdkServerError> {
let url = format!("http://{}/{CLOSE_CHANNEL_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -112,14 +112,14 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`ListChannelsRequest`] and [`ListChannelsResponse`].
pub async fn list_channels(
&self, request: ListChannelsRequest,
) -> Result<ListChannelsResponse, LdkNodeServerError> {
) -> Result<ListChannelsResponse, LdkServerError> {
let url = format!("http://{}/{LIST_CHANNELS_PATH}", self.base_url);
self.post_request(&request, &url).await
}

async fn post_request<Rq: Message, Rs: Message + Default>(
&self, request: &Rq, url: &str,
) -> Result<Rs, LdkNodeServerError> {
) -> Result<Rs, LdkServerError> {
let request_body = request.encode_to_vec();
let response_raw = match self
.client
Expand All@@ -131,7 +131,7 @@ impl LdkNodeServerClient {
{
Ok(response) => response,
Err(e) => {
return Err(LdkNodeServerError::InternalError(e.to_string()));
return Err(LdkServerError::InternalError(e.to_string()));
},
};
let status = response_raw.status();
Expand All@@ -141,7 +141,7 @@ impl LdkNodeServerClient {
Ok(Rs::decode(&payload[..])?)
} else {
//TODO: Error handling and error response parsing.
Err(LdkNodeServerError::InternalError("Unknown Error".to_string()))
Err(LdkServerError::InternalError("Unknown Error".to_string()))
}
}
}
12 changes: 6 additions & 6 deletions client/src/error.rs
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
use prost::DecodeError;

/// When there is an error in request to LDK Node Server, the response contains a relevant error code.
/// When there is an error in request to LDK Server, the response contains a relevant error code.
#[derive(Debug)]
pub enum LdkNodeServerError {
pub enum LdkServerError {
/// There is an unknown error. (Placeholder until error handling is done.)
InternalError(String),
}

impl From<DecodeError> for LdkNodeServerError {
impl From<DecodeError> for LdkServerError {
fn from(err: DecodeError) -> Self {
LdkNodeServerError::InternalError(err.to_string())
LdkServerError::InternalError(err.to_string())
}
}

impl From<reqwest::Error> for LdkNodeServerError {
impl From<reqwest::Error> for LdkServerError {
fn from(err: reqwest::Error) -> Self {
LdkNodeServerError::InternalError(err.to_string())
LdkServerError::InternalError(err.to_string())
}
}
6 changes: 3 additions & 3 deletions client/src/lib.rs
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
//! Client-side library to interact with LDK Node Server.
//! Client-side library to interact with LDK Server.

#![deny(rustdoc::broken_intra_doc_links)]
#![deny(rustdoc::private_intra_doc_links)]
#![deny(missing_docs)]

/// Implements a client ([`client::LdkNodeServerClient`]) to access a hosted instance of LDK Node Server.
/// Implements a client ([`client::LdkServerClient`]) to access a hosted instance of LDK Server.
pub mod client;

/// Implements the error type ([`error::LdkNodeServerError`]) returned on interacting with [`client::LdkNodeServerClient`]
/// Implements the error type ([`error::LdkServerError`]) returned on interacting with [`client::LdkServerClient`]
pub mod error;

/// Request/Response structs required for interacting with the client.
Expand Down
2 changes: 1 addition & 1 deletion server/Cargo.toml
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
[package]
name = "ldk-node-server"
name = "ldk-server"
version = "0.1.0"
edition = "2021"

Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Rename to LdkServer. by G8XSU · Pull Request #24 · lightningdevkit/ldk-server · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions cli/src/main.rs
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
use clap::{Parser, Subcommand};
use client::client::LdkNodeServerClient;
use client::error::LdkNodeServerError;
use client::client::LdkServerClient;
use client::error::LdkServerError;
use client::protos::api::{
Bolt11ReceiveRequest, Bolt11SendRequest, Bolt12ReceiveRequest, Bolt12SendRequest,
OnchainReceiveRequest, OnchainSendRequest, OpenChannelRequest,
Expand DownExpand Up@@ -78,7 +78,7 @@ enum Commands {
#[tokio::main]
async fn main() {
let cli = Cli::parse();
let client = LdkNodeServerClient::new(cli.base_url);
let client = LdkServerClient::new(cli.base_url);

match cli.command {
Commands::OnchainReceive => {
Expand DownExpand Up@@ -141,7 +141,7 @@ async fn main() {
}
}

fn handle_response<Rs: ::prost::Message>(response: Result<Rs, LdkNodeServerError>) {
fn handle_response<Rs: ::prost::Message>(response: Result<Rs, LdkServerError>) {
match response {
Ok(response) => {
println!("{:?}", response);
Expand Down
34 changes: 17 additions & 17 deletions client/src/client.rs
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
use prost::Message;

use crate::error::LdkNodeServerError;
use crate::error::LdkServerError;
use protos::api::{
Bolt11ReceiveRequest, Bolt11ReceiveResponse, Bolt11SendRequest, Bolt11SendResponse,
Bolt12ReceiveRequest, Bolt12ReceiveResponse, Bolt12SendRequest, Bolt12SendResponse,
Expand All@@ -23,15 +23,15 @@ const OPEN_CHANNEL_PATH: &str = "OpenChannel";
const CLOSE_CHANNEL_PATH: &str = "CloseChannel";
const LIST_CHANNELS_PATH: &str = "ListChannels";

/// Client to access a hosted instance of LDK Node Server.
/// Client to access a hosted instance of LDK Server.
#[derive(Clone)]
pub struct LdkNodeServerClient {
pub struct LdkServerClient {
base_url: String,
client: Client,
}

impl LdkNodeServerClient {
/// Constructs a [`LdkNodeServerClient`] using `base_url` as the server endpoint.
impl LdkServerClient {
/// Constructs a [`LdkServerClient`] using `base_url` as the server endpoint.
pub fn new(base_url: String) -> Self {
Self { base_url, client: Client::new() }
}
Expand All@@ -40,7 +40,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`OnchainReceiveRequest`] and [`OnchainReceiveResponse`].
pub async fn onchain_receive(
&self, request: OnchainReceiveRequest,
) -> Result<OnchainReceiveResponse, LdkNodeServerError> {
) -> Result<OnchainReceiveResponse, LdkServerError> {
let url = format!("http://{}/{ONCHAIN_RECEIVE_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -49,7 +49,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`OnchainSendRequest`] and [`OnchainSendResponse`].
pub async fn onchain_send(
&self, request: OnchainSendRequest,
) -> Result<OnchainSendResponse, LdkNodeServerError> {
) -> Result<OnchainSendResponse, LdkServerError> {
let url = format!("http://{}/{ONCHAIN_SEND_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -58,7 +58,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`Bolt11ReceiveRequest`] and [`Bolt11ReceiveResponse`].
pub async fn bolt11_receive(
&self, request: Bolt11ReceiveRequest,
) -> Result<Bolt11ReceiveResponse, LdkNodeServerError> {
) -> Result<Bolt11ReceiveResponse, LdkServerError> {
let url = format!("http://{}/{BOLT11_RECEIVE_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -67,7 +67,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`Bolt11SendRequest`] and [`Bolt11SendResponse`].
pub async fn bolt11_send(
&self, request: Bolt11SendRequest,
) -> Result<Bolt11SendResponse, LdkNodeServerError> {
) -> Result<Bolt11SendResponse, LdkServerError> {
let url = format!("http://{}/{BOLT11_SEND_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -76,7 +76,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`Bolt12ReceiveRequest`] and [`Bolt12ReceiveResponse`].
pub async fn bolt12_receive(
&self, request: Bolt12ReceiveRequest,
) -> Result<Bolt12ReceiveResponse, LdkNodeServerError> {
) -> Result<Bolt12ReceiveResponse, LdkServerError> {
let url = format!("http://{}/{BOLT12_RECEIVE_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -85,7 +85,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`Bolt12SendRequest`] and [`Bolt12SendResponse`].
pub async fn bolt12_send(
&self, request: Bolt12SendRequest,
) -> Result<Bolt12SendResponse, LdkNodeServerError> {
) -> Result<Bolt12SendResponse, LdkServerError> {
let url = format!("http://{}/{BOLT12_SEND_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -94,7 +94,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`OpenChannelRequest`] and [`OpenChannelResponse`].
pub async fn open_channel(
&self, request: OpenChannelRequest,
) -> Result<OpenChannelResponse, LdkNodeServerError> {
) -> Result<OpenChannelResponse, LdkServerError> {
let url = format!("http://{}/{OPEN_CHANNEL_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -103,7 +103,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`CloseChannelRequest`] and [`CloseChannelResponse`].
pub async fn close_channel(
&self, request: CloseChannelRequest,
) -> Result<CloseChannelResponse, LdkNodeServerError> {
) -> Result<CloseChannelResponse, LdkServerError> {
let url = format!("http://{}/{CLOSE_CHANNEL_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -112,14 +112,14 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`ListChannelsRequest`] and [`ListChannelsResponse`].
pub async fn list_channels(
&self, request: ListChannelsRequest,
) -> Result<ListChannelsResponse, LdkNodeServerError> {
) -> Result<ListChannelsResponse, LdkServerError> {
let url = format!("http://{}/{LIST_CHANNELS_PATH}", self.base_url);
self.post_request(&request, &url).await
}

async fn post_request<Rq: Message, Rs: Message + Default>(
&self, request: &Rq, url: &str,
) -> Result<Rs, LdkNodeServerError> {
) -> Result<Rs, LdkServerError> {
let request_body = request.encode_to_vec();
let response_raw = match self
.client
Expand All@@ -131,7 +131,7 @@ impl LdkNodeServerClient {
{
Ok(response) => response,
Err(e) => {
return Err(LdkNodeServerError::InternalError(e.to_string()));
return Err(LdkServerError::InternalError(e.to_string()));
},
};
let status = response_raw.status();
Expand All@@ -141,7 +141,7 @@ impl LdkNodeServerClient {
Ok(Rs::decode(&payload[..])?)
} else {
//TODO: Error handling and error response parsing.
Err(LdkNodeServerError::InternalError("Unknown Error".to_string()))
Err(LdkServerError::InternalError("Unknown Error".to_string()))
}
}
}
12 changes: 6 additions & 6 deletions client/src/error.rs
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
use prost::DecodeError;

/// When there is an error in request to LDK Node Server, the response contains a relevant error code.
/// When there is an error in request to LDK Server, the response contains a relevant error code.
#[derive(Debug)]
pub enum LdkNodeServerError {
pub enum LdkServerError {
/// There is an unknown error. (Placeholder until error handling is done.)
InternalError(String),
}

impl From<DecodeError> for LdkNodeServerError {
impl From<DecodeError> for LdkServerError {
fn from(err: DecodeError) -> Self {
LdkNodeServerError::InternalError(err.to_string())
LdkServerError::InternalError(err.to_string())
}
}

impl From<reqwest::Error> for LdkNodeServerError {
impl From<reqwest::Error> for LdkServerError {
fn from(err: reqwest::Error) -> Self {
LdkNodeServerError::InternalError(err.to_string())
LdkServerError::InternalError(err.to_string())
}
}
6 changes: 3 additions & 3 deletions client/src/lib.rs
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
//! Client-side library to interact with LDK Node Server.
//! Client-side library to interact with LDK Server.

#![deny(rustdoc::broken_intra_doc_links)]
#![deny(rustdoc::private_intra_doc_links)]
#![deny(missing_docs)]

/// Implements a client ([`client::LdkNodeServerClient`]) to access a hosted instance of LDK Node Server.
/// Implements a client ([`client::LdkServerClient`]) to access a hosted instance of LDK Server.
pub mod client;

/// Implements the error type ([`error::LdkNodeServerError`]) returned on interacting with [`client::LdkNodeServerClient`]
/// Implements the error type ([`error::LdkServerError`]) returned on interacting with [`client::LdkServerClient`]
pub mod error;

/// Request/Response structs required for interacting with the client.
Expand Down
2 changes: 1 addition & 1 deletion server/Cargo.toml
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
[package]
name = "ldk-node-server"
name = "ldk-server"
version = "0.1.0"
edition = "2021"

Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Rename to LdkServer. by G8XSU · Pull Request #24 · lightningdevkit/ldk-server · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions cli/src/main.rs
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
use clap::{Parser, Subcommand};
use client::client::LdkNodeServerClient;
use client::error::LdkNodeServerError;
use client::client::LdkServerClient;
use client::error::LdkServerError;
use client::protos::api::{
Bolt11ReceiveRequest, Bolt11SendRequest, Bolt12ReceiveRequest, Bolt12SendRequest,
OnchainReceiveRequest, OnchainSendRequest, OpenChannelRequest,
Expand DownExpand Up@@ -78,7 +78,7 @@ enum Commands {
#[tokio::main]
async fn main() {
let cli = Cli::parse();
let client = LdkNodeServerClient::new(cli.base_url);
let client = LdkServerClient::new(cli.base_url);

match cli.command {
Commands::OnchainReceive => {
Expand DownExpand Up@@ -141,7 +141,7 @@ async fn main() {
}
}

fn handle_response<Rs: ::prost::Message>(response: Result<Rs, LdkNodeServerError>) {
fn handle_response<Rs: ::prost::Message>(response: Result<Rs, LdkServerError>) {
match response {
Ok(response) => {
println!("{:?}", response);
Expand Down
34 changes: 17 additions & 17 deletions client/src/client.rs
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
use prost::Message;

use crate::error::LdkNodeServerError;
use crate::error::LdkServerError;
use protos::api::{
Bolt11ReceiveRequest, Bolt11ReceiveResponse, Bolt11SendRequest, Bolt11SendResponse,
Bolt12ReceiveRequest, Bolt12ReceiveResponse, Bolt12SendRequest, Bolt12SendResponse,
Expand All@@ -23,15 +23,15 @@ const OPEN_CHANNEL_PATH: &str = "OpenChannel";
const CLOSE_CHANNEL_PATH: &str = "CloseChannel";
const LIST_CHANNELS_PATH: &str = "ListChannels";

/// Client to access a hosted instance of LDK Node Server.
/// Client to access a hosted instance of LDK Server.
#[derive(Clone)]
pub struct LdkNodeServerClient {
pub struct LdkServerClient {
base_url: String,
client: Client,
}

impl LdkNodeServerClient {
/// Constructs a [`LdkNodeServerClient`] using `base_url` as the server endpoint.
impl LdkServerClient {
/// Constructs a [`LdkServerClient`] using `base_url` as the server endpoint.
pub fn new(base_url: String) -> Self {
Self { base_url, client: Client::new() }
}
Expand All@@ -40,7 +40,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`OnchainReceiveRequest`] and [`OnchainReceiveResponse`].
pub async fn onchain_receive(
&self, request: OnchainReceiveRequest,
) -> Result<OnchainReceiveResponse, LdkNodeServerError> {
) -> Result<OnchainReceiveResponse, LdkServerError> {
let url = format!("http://{}/{ONCHAIN_RECEIVE_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -49,7 +49,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`OnchainSendRequest`] and [`OnchainSendResponse`].
pub async fn onchain_send(
&self, request: OnchainSendRequest,
) -> Result<OnchainSendResponse, LdkNodeServerError> {
) -> Result<OnchainSendResponse, LdkServerError> {
let url = format!("http://{}/{ONCHAIN_SEND_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -58,7 +58,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`Bolt11ReceiveRequest`] and [`Bolt11ReceiveResponse`].
pub async fn bolt11_receive(
&self, request: Bolt11ReceiveRequest,
) -> Result<Bolt11ReceiveResponse, LdkNodeServerError> {
) -> Result<Bolt11ReceiveResponse, LdkServerError> {
let url = format!("http://{}/{BOLT11_RECEIVE_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -67,7 +67,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`Bolt11SendRequest`] and [`Bolt11SendResponse`].
pub async fn bolt11_send(
&self, request: Bolt11SendRequest,
) -> Result<Bolt11SendResponse, LdkNodeServerError> {
) -> Result<Bolt11SendResponse, LdkServerError> {
let url = format!("http://{}/{BOLT11_SEND_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -76,7 +76,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`Bolt12ReceiveRequest`] and [`Bolt12ReceiveResponse`].
pub async fn bolt12_receive(
&self, request: Bolt12ReceiveRequest,
) -> Result<Bolt12ReceiveResponse, LdkNodeServerError> {
) -> Result<Bolt12ReceiveResponse, LdkServerError> {
let url = format!("http://{}/{BOLT12_RECEIVE_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -85,7 +85,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`Bolt12SendRequest`] and [`Bolt12SendResponse`].
pub async fn bolt12_send(
&self, request: Bolt12SendRequest,
) -> Result<Bolt12SendResponse, LdkNodeServerError> {
) -> Result<Bolt12SendResponse, LdkServerError> {
let url = format!("http://{}/{BOLT12_SEND_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -94,7 +94,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`OpenChannelRequest`] and [`OpenChannelResponse`].
pub async fn open_channel(
&self, request: OpenChannelRequest,
) -> Result<OpenChannelResponse, LdkNodeServerError> {
) -> Result<OpenChannelResponse, LdkServerError> {
let url = format!("http://{}/{OPEN_CHANNEL_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -103,7 +103,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`CloseChannelRequest`] and [`CloseChannelResponse`].
pub async fn close_channel(
&self, request: CloseChannelRequest,
) -> Result<CloseChannelResponse, LdkNodeServerError> {
) -> Result<CloseChannelResponse, LdkServerError> {
let url = format!("http://{}/{CLOSE_CHANNEL_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -112,14 +112,14 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`ListChannelsRequest`] and [`ListChannelsResponse`].
pub async fn list_channels(
&self, request: ListChannelsRequest,
) -> Result<ListChannelsResponse, LdkNodeServerError> {
) -> Result<ListChannelsResponse, LdkServerError> {
let url = format!("http://{}/{LIST_CHANNELS_PATH}", self.base_url);
self.post_request(&request, &url).await
}

async fn post_request<Rq: Message, Rs: Message + Default>(
&self, request: &Rq, url: &str,
) -> Result<Rs, LdkNodeServerError> {
) -> Result<Rs, LdkServerError> {
let request_body = request.encode_to_vec();
let response_raw = match self
.client
Expand All@@ -131,7 +131,7 @@ impl LdkNodeServerClient {
{
Ok(response) => response,
Err(e) => {
return Err(LdkNodeServerError::InternalError(e.to_string()));
return Err(LdkServerError::InternalError(e.to_string()));
},
};
let status = response_raw.status();
Expand All@@ -141,7 +141,7 @@ impl LdkNodeServerClient {
Ok(Rs::decode(&payload[..])?)
} else {
//TODO: Error handling and error response parsing.
Err(LdkNodeServerError::InternalError("Unknown Error".to_string()))
Err(LdkServerError::InternalError("Unknown Error".to_string()))
}
}
}
12 changes: 6 additions & 6 deletions client/src/error.rs
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
use prost::DecodeError;

/// When there is an error in request to LDK Node Server, the response contains a relevant error code.
/// When there is an error in request to LDK Server, the response contains a relevant error code.
#[derive(Debug)]
pub enum LdkNodeServerError {
pub enum LdkServerError {
/// There is an unknown error. (Placeholder until error handling is done.)
InternalError(String),
}

impl From<DecodeError> for LdkNodeServerError {
impl From<DecodeError> for LdkServerError {
fn from(err: DecodeError) -> Self {
LdkNodeServerError::InternalError(err.to_string())
LdkServerError::InternalError(err.to_string())
}
}

impl From<reqwest::Error> for LdkNodeServerError {
impl From<reqwest::Error> for LdkServerError {
fn from(err: reqwest::Error) -> Self {
LdkNodeServerError::InternalError(err.to_string())
LdkServerError::InternalError(err.to_string())
}
}
6 changes: 3 additions & 3 deletions client/src/lib.rs
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
//! Client-side library to interact with LDK Node Server.
//! Client-side library to interact with LDK Server.

#![deny(rustdoc::broken_intra_doc_links)]
#![deny(rustdoc::private_intra_doc_links)]
#![deny(missing_docs)]

/// Implements a client ([`client::LdkNodeServerClient`]) to access a hosted instance of LDK Node Server.
/// Implements a client ([`client::LdkServerClient`]) to access a hosted instance of LDK Server.
pub mod client;

/// Implements the error type ([`error::LdkNodeServerError`]) returned on interacting with [`client::LdkNodeServerClient`]
/// Implements the error type ([`error::LdkServerError`]) returned on interacting with [`client::LdkServerClient`]
pub mod error;

/// Request/Response structs required for interacting with the client.
Expand Down
2 changes: 1 addition & 1 deletion server/Cargo.toml
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
[package]
name = "ldk-node-server"
name = "ldk-server"
version = "0.1.0"
edition = "2021"

Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Rename to LdkServer. by G8XSU · Pull Request #24 · lightningdevkit/ldk-server · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions cli/src/main.rs
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
use clap::{Parser, Subcommand};
use client::client::LdkNodeServerClient;
use client::error::LdkNodeServerError;
use client::client::LdkServerClient;
use client::error::LdkServerError;
use client::protos::api::{
Bolt11ReceiveRequest, Bolt11SendRequest, Bolt12ReceiveRequest, Bolt12SendRequest,
OnchainReceiveRequest, OnchainSendRequest, OpenChannelRequest,
Expand DownExpand Up@@ -78,7 +78,7 @@ enum Commands {
#[tokio::main]
async fn main() {
let cli = Cli::parse();
let client = LdkNodeServerClient::new(cli.base_url);
let client = LdkServerClient::new(cli.base_url);

match cli.command {
Commands::OnchainReceive => {
Expand DownExpand Up@@ -141,7 +141,7 @@ async fn main() {
}
}

fn handle_response<Rs: ::prost::Message>(response: Result<Rs, LdkNodeServerError>) {
fn handle_response<Rs: ::prost::Message>(response: Result<Rs, LdkServerError>) {
match response {
Ok(response) => {
println!("{:?}", response);
Expand Down
34 changes: 17 additions & 17 deletions client/src/client.rs
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
use prost::Message;

use crate::error::LdkNodeServerError;
use crate::error::LdkServerError;
use protos::api::{
Bolt11ReceiveRequest, Bolt11ReceiveResponse, Bolt11SendRequest, Bolt11SendResponse,
Bolt12ReceiveRequest, Bolt12ReceiveResponse, Bolt12SendRequest, Bolt12SendResponse,
Expand All@@ -23,15 +23,15 @@ const OPEN_CHANNEL_PATH: &str = "OpenChannel";
const CLOSE_CHANNEL_PATH: &str = "CloseChannel";
const LIST_CHANNELS_PATH: &str = "ListChannels";

/// Client to access a hosted instance of LDK Node Server.
/// Client to access a hosted instance of LDK Server.
#[derive(Clone)]
pub struct LdkNodeServerClient {
pub struct LdkServerClient {
base_url: String,
client: Client,
}

impl LdkNodeServerClient {
/// Constructs a [`LdkNodeServerClient`] using `base_url` as the server endpoint.
impl LdkServerClient {
/// Constructs a [`LdkServerClient`] using `base_url` as the server endpoint.
pub fn new(base_url: String) -> Self {
Self { base_url, client: Client::new() }
}
Expand All@@ -40,7 +40,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`OnchainReceiveRequest`] and [`OnchainReceiveResponse`].
pub async fn onchain_receive(
&self, request: OnchainReceiveRequest,
) -> Result<OnchainReceiveResponse, LdkNodeServerError> {
) -> Result<OnchainReceiveResponse, LdkServerError> {
let url = format!("http://{}/{ONCHAIN_RECEIVE_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -49,7 +49,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`OnchainSendRequest`] and [`OnchainSendResponse`].
pub async fn onchain_send(
&self, request: OnchainSendRequest,
) -> Result<OnchainSendResponse, LdkNodeServerError> {
) -> Result<OnchainSendResponse, LdkServerError> {
let url = format!("http://{}/{ONCHAIN_SEND_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -58,7 +58,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`Bolt11ReceiveRequest`] and [`Bolt11ReceiveResponse`].
pub async fn bolt11_receive(
&self, request: Bolt11ReceiveRequest,
) -> Result<Bolt11ReceiveResponse, LdkNodeServerError> {
) -> Result<Bolt11ReceiveResponse, LdkServerError> {
let url = format!("http://{}/{BOLT11_RECEIVE_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -67,7 +67,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`Bolt11SendRequest`] and [`Bolt11SendResponse`].
pub async fn bolt11_send(
&self, request: Bolt11SendRequest,
) -> Result<Bolt11SendResponse, LdkNodeServerError> {
) -> Result<Bolt11SendResponse, LdkServerError> {
let url = format!("http://{}/{BOLT11_SEND_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -76,7 +76,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`Bolt12ReceiveRequest`] and [`Bolt12ReceiveResponse`].
pub async fn bolt12_receive(
&self, request: Bolt12ReceiveRequest,
) -> Result<Bolt12ReceiveResponse, LdkNodeServerError> {
) -> Result<Bolt12ReceiveResponse, LdkServerError> {
let url = format!("http://{}/{BOLT12_RECEIVE_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -85,7 +85,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`Bolt12SendRequest`] and [`Bolt12SendResponse`].
pub async fn bolt12_send(
&self, request: Bolt12SendRequest,
) -> Result<Bolt12SendResponse, LdkNodeServerError> {
) -> Result<Bolt12SendResponse, LdkServerError> {
let url = format!("http://{}/{BOLT12_SEND_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -94,7 +94,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`OpenChannelRequest`] and [`OpenChannelResponse`].
pub async fn open_channel(
&self, request: OpenChannelRequest,
) -> Result<OpenChannelResponse, LdkNodeServerError> {
) -> Result<OpenChannelResponse, LdkServerError> {
let url = format!("http://{}/{OPEN_CHANNEL_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -103,7 +103,7 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`CloseChannelRequest`] and [`CloseChannelResponse`].
pub async fn close_channel(
&self, request: CloseChannelRequest,
) -> Result<CloseChannelResponse, LdkNodeServerError> {
) -> Result<CloseChannelResponse, LdkServerError> {
let url = format!("http://{}/{CLOSE_CHANNEL_PATH}", self.base_url);
self.post_request(&request, &url).await
}
Expand All@@ -112,14 +112,14 @@ impl LdkNodeServerClient {
/// For API contract/usage, refer to docs for [`ListChannelsRequest`] and [`ListChannelsResponse`].
pub async fn list_channels(
&self, request: ListChannelsRequest,
) -> Result<ListChannelsResponse, LdkNodeServerError> {
) -> Result<ListChannelsResponse, LdkServerError> {
let url = format!("http://{}/{LIST_CHANNELS_PATH}", self.base_url);
self.post_request(&request, &url).await
}

async fn post_request<Rq: Message, Rs: Message + Default>(
&self, request: &Rq, url: &str,
) -> Result<Rs, LdkNodeServerError> {
) -> Result<Rs, LdkServerError> {
let request_body = request.encode_to_vec();
let response_raw = match self
.client
Expand All@@ -131,7 +131,7 @@ impl LdkNodeServerClient {
{
Ok(response) => response,
Err(e) => {
return Err(LdkNodeServerError::InternalError(e.to_string()));
return Err(LdkServerError::InternalError(e.to_string()));
},
};
let status = response_raw.status();
Expand All@@ -141,7 +141,7 @@ impl LdkNodeServerClient {
Ok(Rs::decode(&payload[..])?)
} else {
//TODO: Error handling and error response parsing.
Err(LdkNodeServerError::InternalError("Unknown Error".to_string()))
Err(LdkServerError::InternalError("Unknown Error".to_string()))
}
}
}
12 changes: 6 additions & 6 deletions client/src/error.rs
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
use prost::DecodeError;

/// When there is an error in request to LDK Node Server, the response contains a relevant error code.
/// When there is an error in request to LDK Server, the response contains a relevant error code.
#[derive(Debug)]
pub enum LdkNodeServerError {
pub enum LdkServerError {
/// There is an unknown error. (Placeholder until error handling is done.)
InternalError(String),
}

impl From<DecodeError> for LdkNodeServerError {
impl From<DecodeError> for LdkServerError {
fn from(err: DecodeError) -> Self {
LdkNodeServerError::InternalError(err.to_string())
LdkServerError::InternalError(err.to_string())
}
}

impl From<reqwest::Error> for LdkNodeServerError {
impl From<reqwest::Error> for LdkServerError {
fn from(err: reqwest::Error) -> Self {
LdkNodeServerError::InternalError(err.to_string())
LdkServerError::InternalError(err.to_string())
}
}
6 changes: 3 additions & 3 deletions client/src/lib.rs
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
//! Client-side library to interact with LDK Node Server.
//! Client-side library to interact with LDK Server.

#![deny(rustdoc::broken_intra_doc_links)]
#![deny(rustdoc::private_intra_doc_links)]
#![deny(missing_docs)]

/// Implements a client ([`client::LdkNodeServerClient`]) to access a hosted instance of LDK Node Server.
/// Implements a client ([`client::LdkServerClient`]) to access a hosted instance of LDK Server.
pub mod client;

/// Implements the error type ([`error::LdkNodeServerError`]) returned on interacting with [`client::LdkNodeServerClient`]
/// Implements the error type ([`error::LdkServerError`]) returned on interacting with [`client::LdkServerClient`]
pub mod error;

/// Request/Response structs required for interacting with the client.
Expand Down
2 changes: 1 addition & 1 deletion server/Cargo.toml
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
[package]
name = "ldk-node-server"
name = "ldk-server"
version = "0.1.0"
edition = "2021"

Expand Down