Skip to content

Commit 9e2eb80

Browse files
committed
WIP: add web console logging
1 parent 5d6d2d1 commit 9e2eb80

3 files changed

Lines changed: 22 additions & 9 deletions

File tree

Cargo.lock

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ wasm = [
1414
"getrandom",
1515
"ring",
1616
"gloo-timers",
17+
"web-sys",
1718
]
1819
default = ["io"]
1920
io = ["payjoin/io"]
@@ -45,6 +46,7 @@ console_error_panic_hook = { version = "0.1.7", optional = true }
4546
getrandom = { version = "0.2.15", optional = true, features = ["js"] }
4647
ring = { version = "0.17.8", optional = true, features = ["wasm32_unknown_unknown_js"] }
4748
gloo-timers = { version = "0.3.0", optional = true, features = ["futures"] }
49+
web-sys = { version = "0.3", optional = true, features = ["console"] }
4850

4951
[dev-dependencies]
5052
bdk = { version = "0.29.0", features = ["all-keys", "use-esplora-ureq", "keys-bip39", "rpc"] }

src/receive/wasm.rs

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ use crate::Url;
1414
use {
1515
crate::utils::result::JsResult,
1616
wasm_bindgen::prelude::*,
17+
wasm_bindgen::JsValue,
18+
web_sys::console,
19+
// web_sys::js_sys::Date,
1720
};
1821

1922

@@ -36,33 +39,40 @@ impl Receiver {
3639
ohttp_keys: String,
3740
ohttp_relay: String,
3841
expire_after: Option<u64>,
39-
) -> JsResult<Self> {
42+
) -> JsResult<Receiver> {
43+
// Log inputs to console
44+
console::log_1(&JsValue::from_str(&format!(
45+
"Receiver::new inputs: address={}, network={}, directory={}, ohttp_keys={}, ohttp_relay={}, expire_after={:?}",
46+
address, network, directory, ohttp_keys, ohttp_relay, expire_after
47+
)));
48+
4049
// Parse network string
4150
let network = Network::from_str(&network)
42-
.map_err(|_| wasm_bindgen::JsError::new(&format!("Invalid network: {}", network)))?;
51+
.map_err(|_| wasm_bindgen::JsError::new("Invalid network"))?;
4352

4453
// Parse URLs
4554
let directory = Url::parse(directory)
46-
.map_err(|e| wasm_bindgen::JsError::new(&e.to_string()))?;
55+
.map_err(|_| wasm_bindgen::JsError::new("Invalid directory URL"))?;
4756
let ohttp_relay = Url::parse(ohttp_relay)
48-
.map_err(|e| wasm_bindgen::JsError::new(&e.to_string()))?;
57+
.map_err(|_| wasm_bindgen::JsError::new("Invalid relay URL"))?;
4958

5059
// Parse OHTTP keys from JSON string
5160
let ohttp_keys: OhttpKeys = OhttpKeys::parse(&ohttp_keys)
52-
.map_err(|e| wasm_bindgen::JsError::new(&format!("{:?}", e)))?;
61+
.map_err(|_| wasm_bindgen::JsError::new("Invalid OHTTP keys"))?;
5362

5463
// Parse Bitcoin address and verify network
5564
let address = payjoin::bitcoin::Address::from_str(&address)
56-
.map_err(|e| wasm_bindgen::JsError::new(&e.to_string()))?
65+
.map_err(|_| wasm_bindgen::JsError::new("Invalid Bitcoin address"))?
5766
.require_network(network)
58-
.map_err(|e| wasm_bindgen::JsError::new(&e.to_string()))?;
67+
.map_err(|_| wasm_bindgen::JsError::new("Address network mismatch"))?;
5968

60-
Ok(payjoin::receive::v2::Receiver::new(
69+
Ok(payjoin::receive::v2::Receiver::new(//new_with_time(
6170
address,
6271
directory.into(),
6372
ohttp_keys.into(),
6473
ohttp_relay.into(),
65-
expire_after.map(Duration::from_secs),
74+
// js_sys::Date::now(),
75+
expire_after.map(Duration::from_secs)
6676
)
6777
.into())
6878
}

0 commit comments

Comments
 (0)