@@ -14,6 +14,9 @@ use crate::Url;
1414use {
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