Skip to content

Tor Socks Proxy #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 1, 2025
Merged

Tor Socks Proxy #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f147f44
tor socks lnd
ntheile Mar 28, 2025
651b1c3
cln and phoenix tor socks
ntheile Mar 28, 2025
38680c7
update docs
ntheile Mar 30, 2025
0bd9eb3
rebrand LNI Remote
ntheile Mar 30, 2025
77a4a77
revert to reqwest blocking with timeout
ntheile Apr 1, 2025
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 bindings/lni_nodejs/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ async-trait = "0.1"
thiserror = "1.0"
serde = { version = "1", features=["derive"] }
serde_json = "1"
reqwest = { version = "0.10", default-features = false, features = ["json", "rustls-tls", "blocking"] }
reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls", "blocking", "socks"] }
tokio = { version = "1", features = ["full"] }
napi = { version = "2.12.2", default-features = false, features = ["napi4", "tokio_rt", "async"] }
napi-derive = "2.12.2"
Expand Down
18 changes: 12 additions & 6 deletions bindings/lni_nodejs/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@
export interface PhoenixdConfig {
url: string
password: string
socks5Proxy?: string
acceptInvalidCerts?: boolean
httpTimeout?: number
}
export interface PhoenixdNode {
url: string
password: string
config: PhoenixdConfig
}
export interface Bolt11Resp {
amountSat: number
Expand All @@ -26,18 +28,22 @@ export interface PhoenixPayInvoiceResp {
export interface ClnConfig {
url: string
rune: string
socks5Proxy?: string
acceptInvalidCerts?: boolean
httpTimeout?: number
}
export interface ClnNode {
url: string
rune: string
config: ClnConfig
}
export interface LndConfig {
url: string
macaroon: string
socks5Proxy?: string
acceptInvalidCerts?: boolean
httpTimeout?: number
}
export interface LndNode {
url: string
macaroon: string
config: LndConfig
}
export const enum InvoiceType {
Bolt11 = 'Bolt11',
Expand Down
20 changes: 14 additions & 6 deletions bindings/lni_nodejs/main.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,19 +132,27 @@ async function lnd() {
}

async function test() {
// const config = {
// url: process.env.PHOENIXD_URL,
// password: process.env.PHOENIXD_PASSWORD,
// test_hash: process.env.PHOENIXD_TEST_PAYMENT_HASH,
// };
// const node = new PhoenixdNode(config);
const config = {
url: process.env.PHOENIXD_URL,
password: process.env.PHOENIXD_PASSWORD,
test_hash: process.env.PHOENIXD_TEST_PAYMENT_HASH,
url: process.env.LND_URL,
macaroon: process.env.LND_MACAROON,
socks5Proxy: "socks5h://127.0.0.1:9150",
acceptInvalidCerts: true,
};
const node = new PhoenixdNode(config);
const node = new LndNode(config);
console.log("Node info:", await node.getInfo());
}

async function main() {
// phoenixd();
cln();
// cln();
// lnd();
// test();
test();
}

main();
62 changes: 21 additions & 41 deletions bindings/lni_nodejs/src/cln.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,13 @@ impl ClnNode {

#[napi]
pub fn get_config(&self) -> ClnConfig {
ClnConfig {
url: self.inner.url.clone(),
rune: self.inner.rune.clone(),
}
self.inner.clone()
}

#[napi]
pub async fn get_info(&self) -> napi::Result<lni::NodeInfo> {
let info = lni::cln::api::get_info(self.inner.url.clone(), self.inner.rune.clone())
let info = lni::cln::api::get_info(&self.inner)
.await
.map_err(|e| napi::Error::from_reason(e.to_string()))?;
Ok(info)
}
Expand All @@ -44,8 +42,7 @@ impl ClnNode {
params: CreateInvoiceParams,
) -> napi::Result<lni::Transaction> {
let txn = lni::cln::api::create_invoice(
self.inner.url.clone(),
self.inner.rune.clone(),
&self.inner,
params.invoice_type,
params.amount_msats,
params.offer,
Expand All @@ -63,27 +60,25 @@ impl ClnNode {
&self,
params: PayInvoiceParams,
) -> Result<lni::types::PayInvoiceResponse> {
let invoice =
lni::cln::api::pay_invoice(self.inner.url.clone(), self.inner.rune.clone(), params)
.await
.map_err(|e| napi::Error::from_reason(e.to_string()))?;
let invoice = lni::cln::api::pay_invoice(&self.inner, params)
.await
.map_err(|e| napi::Error::from_reason(e.to_string()))?;
Ok(invoice)
}

#[napi]
pub async fn get_offer(&self, search: Option<String>) -> Result<lni::types::PayCode> {
let offer = lni::cln::api::get_offer(self.inner.url.clone(), self.inner.rune.clone(), search)
let offer = lni::cln::api::get_offer(&self.inner, search)
.await
.map_err(|e| napi::Error::from_reason(e.to_string()))?;
Ok(offer)
}

#[napi]
pub async fn list_offers(&self, search: Option<String>) -> Result<Vec<lni::types::PayCode>> {
let offers =
lni::cln::api::list_offers(self.inner.url.clone(), self.inner.rune.clone(), search)
.await
.map_err(|e| napi::Error::from_reason(e.to_string()))?;
let offers = lni::cln::api::list_offers(&self.inner, search)
.await
.map_err(|e| napi::Error::from_reason(e.to_string()))?;
Ok(offers)
}

Expand All @@ -94,28 +89,17 @@ impl ClnNode {
amount_msats: i64,
payer_note: Option<String>,
) -> napi::Result<lni::PayInvoiceResponse> {
let offer = lni::cln::api::pay_offer(
self.inner.url.clone(),
self.inner.rune.clone(),
offer,
amount_msats,
payer_note,
)
.await
.map_err(|e| napi::Error::from_reason(e.to_string()))?;
let offer = lni::cln::api::pay_offer(&self.inner, offer, amount_msats, payer_note)
.await
.map_err(|e| napi::Error::from_reason(e.to_string()))?;
Ok(offer)
}

#[napi]
pub async fn lookup_invoice(&self, payment_hash: String) -> napi::Result<lni::Transaction> {
let txn = lni::cln::api::lookup_invoice(
self.inner.url.clone(),
self.inner.rune.clone(),
Some(payment_hash),
None,
None,
)
.map_err(|e| napi::Error::from_reason(e.to_string()))?;
let txn = lni::cln::api::lookup_invoice(&self.inner, Some(payment_hash), None, None)
.await
.map_err(|e| napi::Error::from_reason(e.to_string()))?;
Ok(txn)
}

Expand All @@ -124,19 +108,15 @@ impl ClnNode {
&self,
params: lni::types::ListTransactionsParams,
) -> napi::Result<Vec<lni::Transaction>> {
let txns = lni::cln::api::list_transactions(
self.inner.url.clone(),
self.inner.rune.clone(),
params.from,
params.limit,
)
.map_err(|e| napi::Error::from_reason(e.to_string()))?;
let txns = lni::cln::api::list_transactions(&self.inner, params.from, params.limit)
.await
.map_err(|e| napi::Error::from_reason(e.to_string()))?;
Ok(txns)
}

#[napi]
pub async fn decode(&self, str: String) -> Result<String> {
let decoded = lni::cln::api::decode(self.inner.url.clone(), self.inner.rune.clone(), str)
let decoded = lni::cln::api::decode(&self.inner, str)
.await
.map_err(|e| napi::Error::from_reason(e.to_string()))?;
Ok(decoded)
Expand Down
67 changes: 27 additions & 40 deletions bindings/lni_nodejs/src/lnd.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,16 @@ impl LndNode {
LndConfig {
url: self.inner.url.clone(),
macaroon: self.inner.macaroon.clone(),
socks5_proxy: self.inner.socks5_proxy.clone(),
accept_invalid_certs: self.inner.accept_invalid_certs,
http_timeout: self.inner.http_timeout,
}
}

#[napi]
pub async fn get_info(&self) -> napi::Result<lni::NodeInfo> {
let info = lni::lnd::api::get_info(self.inner.url.clone(), self.inner.macaroon.clone())
let info = lni::lnd::api::get_info(&self.inner)
.await
.map_err(|e| napi::Error::from_reason(e.to_string()))?;
Ok(info)
}
Expand All @@ -43,10 +47,9 @@ impl LndNode {
&self,
params: CreateInvoiceParams,
) -> napi::Result<lni::Transaction> {
let txn =
lni::lnd::api::create_invoice(self.inner.url.clone(), self.inner.macaroon.clone(), params)
.await
.map_err(|e| napi::Error::from_reason(e.to_string()))?;
let txn = lni::lnd::api::create_invoice(&self.inner, params)
.await
.map_err(|e| napi::Error::from_reason(e.to_string()))?;
Ok(txn)
}

Expand All @@ -55,28 +58,25 @@ impl LndNode {
&self,
params: PayInvoiceParams,
) -> Result<lni::types::PayInvoiceResponse> {
let invoice =
lni::lnd::api::pay_invoice(self.inner.url.clone(), self.inner.macaroon.clone(), params)
.await
.map_err(|e| napi::Error::from_reason(e.to_string()))?;
let invoice = lni::lnd::api::pay_invoice(&self.inner, params)
.await
.map_err(|e| napi::Error::from_reason(e.to_string()))?;
Ok(invoice)
}

#[napi]
pub async fn get_offer(&self, search: Option<String>) -> Result<lni::types::PayCode> {
let offer =
lni::lnd::api::get_offer(self.inner.url.clone(), self.inner.macaroon.clone(), search)
.await
.map_err(|e| napi::Error::from_reason(e.to_string()))?;
let offer = lni::lnd::api::get_offer(&self.inner, search)
.await
.map_err(|e| napi::Error::from_reason(e.to_string()))?;
Ok(offer)
}

#[napi]
pub async fn list_offers(&self, search: Option<String>) -> Result<Vec<lni::types::PayCode>> {
let offers =
lni::lnd::api::list_offers(self.inner.url.clone(), self.inner.macaroon.clone(), search)
.await
.map_err(|e| napi::Error::from_reason(e.to_string()))?;
let offers = lni::lnd::api::list_offers(&self.inner, search)
.await
.map_err(|e| napi::Error::from_reason(e.to_string()))?;
Ok(offers)
}

Expand All @@ -87,26 +87,17 @@ impl LndNode {
amount_msats: i64,
payer_note: Option<String>,
) -> napi::Result<lni::PayInvoiceResponse> {
let offer = lni::lnd::api::pay_offer(
self.inner.url.clone(),
self.inner.macaroon.clone(),
offer,
amount_msats,
payer_note,
)
.await
.map_err(|e| napi::Error::from_reason(e.to_string()))?;
let offer = lni::lnd::api::pay_offer(&self.inner, offer, amount_msats, payer_note)
.await
.map_err(|e| napi::Error::from_reason(e.to_string()))?;
Ok(offer)
}

#[napi]
pub async fn lookup_invoice(&self, payment_hash: String) -> napi::Result<lni::Transaction> {
let txn = lni::lnd::api::lookup_invoice(
self.inner.url.clone(),
self.inner.macaroon.clone(),
Some(payment_hash),
)
.map_err(|e| napi::Error::from_reason(e.to_string()))?;
let txn = lni::lnd::api::lookup_invoice(&self.inner, Some(payment_hash))
.await
.map_err(|e| napi::Error::from_reason(e.to_string()))?;
Ok(txn)
}

Expand All @@ -115,19 +106,15 @@ impl LndNode {
&self,
params: lni::types::ListTransactionsParams,
) -> napi::Result<Vec<lni::Transaction>> {
let txns = lni::lnd::api::list_transactions(
self.inner.url.clone(),
self.inner.macaroon.clone(),
params.from,
params.limit,
)
.map_err(|e| napi::Error::from_reason(e.to_string()))?;
let txns = lni::lnd::api::list_transactions(&self.inner, params.from, params.limit)
.await
.map_err(|e| napi::Error::from_reason(e.to_string()))?;
Ok(txns)
}

#[napi]
pub async fn decode(&self, str: String) -> Result<String> {
let decoded = lni::lnd::api::decode(self.inner.url.clone(), self.inner.macaroon.clone(), str)
let decoded = lni::lnd::api::decode(&self.inner, str)
.await
.map_err(|e| napi::Error::from_reason(e.to_string()))?;
Ok(decoded)
Expand Down
Loading