proxy version 0.025

Author: bitrequest

assets_js_bitrequest_core.js

@@ -488,7 +488,7 @@ function finish_functions() {
     // ** URL & Link Handling: **
     //set_xmr_node_access
     //check_intents
-    //expand_shoturl
+    //expand_shorturl
     //expand_bitly_url
     //open_blockexplorer_url
     //blockexplorer_url
@@ -533,7 +533,6 @@ function finish_functions() {
     //buildpage
     //append_coinsetting
     //setting_sub_address
-    //truncate
     //append_address
     //append_request
 
@@ -3930,7 +3929,7 @@ function get_pdf_url(request_data) {
         invoice_data[transclear("network")] = network;
     }
     const proxy_url = d_proxy();
-    return proxy_url + "proxy/v1/receipt/?data=" + btoa(JSON.stringify(invoice_data));
+    return proxy_url + "/proxy/v1/receipt/?data=" + btoa(JSON.stringify(invoice_data));
 }
 
 // ** Archive Management: **
@@ -4075,7 +4074,7 @@ function lnd_lookup_invoice(proxy, impl, hash, node_id, peer_id, password) {
     const proxy_data = lnurl_deform(proxy),
         proxy_host = proxy_data.url,
         proxy_key = password || proxy_data.k,
-        api_url = proxy_host + "proxy/v1/ln/api/",
+        api_url = proxy_host + "/proxy/v1/ln/api/",
         request_data = {
             "method": "POST",
             "cache": false,
@@ -4408,7 +4407,7 @@ function check_intents(encoded_scheme) {
 }
 
 // Expands shortened URLs with caching and platform handling
-function expand_shoturl(input_param) {
+function expand_shorturl(input_param) {
     if (input_param.startsWith("4bR")) { // handle bitly shortlink
         expand_bitly_url(input_param);
         return
@@ -4432,7 +4431,7 @@ function expand_shoturl(input_param) {
                 "method": "POST",
                 "cache": false,
                 "timeout": 5000,
-                "url": proxy_url + "proxy/v1/inv/api/",
+                "url": proxy_url + "/proxy/v1/inv/api/",
                 "data": request_payload
             }).done(function(response) {
                 const parsed_data = br_result(response).result;
@@ -4794,7 +4793,7 @@ function build_settings() {
                  <span class='" + setting.icon + "'></span>\
                  <div class='atext'>\
                     <h2>" + tl(setting_id) + "</h2>\
-                    <p>" + truncate(display_val) + "</p>\
+                    <p>" + truncate_middle(display_val) + "</p>\
                  </div>\
                  <div class='iconbox'>\
                      <span class='icon-pencil'></span>\
@@ -4815,7 +4814,7 @@ function render_settings(excludes) {
                 const selected_val = setting.selected,
                     trans_val = tl(selected_val),
                     display_val = setting_id === "accountsettings" ? selected_val : (trans_val || selected_val); // Exclude translations
-                $("#" + setting.id).data(setting).find("p").text(truncate(display_val));
+                $("#" + setting.id).data(setting).find("p").text(truncate_middle(display_val));
             }
         });
     }
@@ -5000,22 +4999,7 @@ function append_coinsetting(currency, settings) {
 // Subtitle for settings
 function setting_sub_address(name, url, custom) {
     const sub_title = (custom === true || name === "electrum") ? url || name : name || url;
-    return exists(sub_title) ? truncate(sub_title) : "";
-}
-
-// Shorten long titles
-function truncate(str) {
-    // Check if value is a string
-    if (typeof str === "string") {
-        // If the string is too short to truncate, return it as is
-        if (str.length <= 35) {
-            return str;
-        }
-        const first_part = str.substring(0, 9),
-            last_part = str.substring(str.length - 18);
-        return first_part + "...." + last_part;
-    }
-    return str;
+    return exists(sub_title) ? truncate_middle(sub_title) : "";
 }
 
 // Creates address list item with source icons, monitoring status, and action buttons
@@ -5283,7 +5267,7 @@ function append_request(rd) {
                 <ul class='transactionlist'>\
                     <h2>" + history_text + "</h2>\
                 </ul>\
-                <div class='api_source'>" + source_html + "</div>\
+                <div class='api_source'>" + truncate_middle(source_html, 15, 18, 41) + "</div>\
             </div>\
             <div class='brstatuspanel flex'>\
                 <img src='" + c_icons("confirmed") + "'>\

assets_js_bitrequest_fetchblocks.js

@@ -95,7 +95,7 @@ function process_lightning_payment(rd, api_data, rdo) {
             "method": "POST",
             "cache": false,
             "timeout": 5000,
-            "url": proxy_url + "proxy/v1/ln/api/",
+            "url": proxy_url + "/proxy/v1/ln/api/",
             "data": {
                 "fn": "ln-request-status",
                 "id": payment_id,
@@ -128,7 +128,7 @@ function process_lightning_payment(rd, api_data, rdo) {
                         "method": "POST",
                         "cache": false,
                         "timeout": 5000,
-                        "url": proxy_url + "proxy/v1/ln/api/",
+                        "url": proxy_url + "/proxy/v1/ln/api/",
                         "data": {
                             "fn": "ln-invoice-status",
                             "imp": implementation,
@@ -252,7 +252,7 @@ function process_lightning_payment(rd, api_data, rdo) {
                     "method": "POST",
                     "cache": false,
                     "timeout": 5000,
-                    "url": proxy_url + "proxy/v1/ln/api/",
+                    "url": proxy_url + "/proxy/v1/ln/api/",
                     "data": {
                         "fn": "ln-invoice-status",
                         "imp": implementation,
@@ -2887,7 +2887,7 @@ function nimiq_scan_data(data, setconfirmations, latest_block, txhash) {
     const raw_confs = data.confirmations || get_block_confirmations(data.height, latest_block),
         block_confs = (raw_confs < 0) ? 0 : raw_confs,
         tx_hash = txhash || data.hash || null,
-        final_confs = (confirmed) ? null : setconfirmations;
+        final_confs = (data.confirmed) ? null : setconfirmations;
     return {
         "ccval": data.value / 1e5,
         "transactiontime": tx_timestamp,

assets_js_bitrequest_lightning.js

@@ -272,7 +272,7 @@ function node_option_li(node_info, selected, action, proxy_url, proxy_key) {
             "method": "POST",
             "cache": false,
             "timeout": 5000,
-            "url": proxy_url + "proxy/v1/ln/api/",
+            "url": proxy_url + "/proxy/v1/ln/api/",
             "data": {
                 "imp": implementation,
                 "fn": "ln-list-invoices",
@@ -452,18 +452,24 @@ function lightning_option_li(is_live, node_info, selected, invoices, proxy_url)
     option.slideDown(500);
     if (has_invoices) {
         invoices.reverse().forEach(function(invoice) {
-            const invoice_id = invoice.payment_request ? " " + invoice.payment_request.slice(0, 16) :
-                (invoice.serialized ? " " + invoice.serialized.slice(0, 16) : ""),
-                invoice_title = invoice.memo || invoice.description || "invoice" + invoice_id,
-                timestamp = invoice.creation_date || invoice.timestamp || false,
-                invoice_date = timestamp ? short_date(parseInt(timestamp * 1000) + glob_const.timezone) : "",
-                settlement_icon = invoice.settled === true || invoice.status === "paid" ? "icon-checkmark" :
-                (invoice.settled === false || invoice.status === "expired" ? "icon-clock" : false),
-                icon_span = settlement_icon ? "<span class='" + settlement_icon + "'></span>" : "<img src='" + implementation_icon + "' class='lnd_icon'>";
-            invoices_list += "<div class='ivli'><div class='invoice_memo clearfix'>" +
-                "<div class='iv_title'>" + icon_span + " " + invoice_title + "</div>" +
-                "<div class='iv_date'>" + invoice_date + "</div></div>" +
-                "<div class='invoice_body'><pre>" + highlight_json_syntax(invoice) + "</pre></div></div>";
+            const invoice_description = invoice.memo || invoice.description;
+            if (invoice_description && invoice_description.indexOf("test invoice ") === 0) {
+                // filter out test invoices
+            } else {
+                const invoice_id = invoice.payment_request ? " " + invoice.payment_request.slice(0, 16) :
+                    (invoice.serialized ? " " + invoice.serialized.slice(0, 16) : ""),
+                    invoice_title = invoice_description || "invoice" + invoice_id,
+                    bolt_card = invoice_title.indexOf("Boltcard") === 0 ? " <img src='boltcard.png' class='boltcard' title='paid with the boltcard'>" : "",
+                    timestamp = invoice.creation_date || invoice.timestamp || false,
+                    invoice_date = timestamp ? short_date(parseInt(timestamp * 1000) + glob_const.timezone) : "",
+                    settlement_icon = invoice.settled === true || invoice.status === "paid" ? "icon-checkmark" :
+                    (invoice.settled === false || invoice.status === "expired" ? "icon-clock" : false),
+                    icon_span = settlement_icon ? "<span class='" + settlement_icon + "'></span>" : "<img src='" + implementation_icon + "' class='lnd_icon'>";
+                invoices_list += "<div class='ivli'><div class='invoice_memo clearfix'>" +
+                    "<div class='iv_title' title='" + invoice_title + "'>" + icon_span + " " + truncate_middle(invoice_title) + bolt_card + "</div>" +
+                    "<div class='iv_date'>" + invoice_date + "</div></div>" +
+                    "<div class='invoice_body'><pre>" + highlight_json_syntax(invoice) + "</pre></div></div>";
+            }
         });
     } else {
         const invoice_msg = is_locked ? tl("invoiceslocked", {
@@ -590,7 +596,7 @@ function add_proxy_option(option_list, key, proxy_info, selected) {
         "method": "POST",
         "cache": false,
         "timeout": 5000,
-        "url": proxy_url + "proxy/v1/ln/api/",
+        "url": proxy_url + "/proxy/v1/ln/api/",
         "data": {
             "pingpw": true,
             "x-api": proxy_data.k
@@ -833,7 +839,7 @@ function test_lnd_proxy(proxy_url, proxy_id, proxy_key) {
         "method": "POST",
         "cache": false,
         "timeout": 5000,
-        "url": proxy_url + "proxy/v1/ln/api/",
+        "url": proxy_url + "/proxy/v1/ln/api/",
         "data": {
             "add": true,
             "x-api": proxy_key
@@ -1122,7 +1128,7 @@ function test_create_invoice(implementation, proxy_data, node_host, node_key) {
             "method": "POST",
             "cache": false,
             "timeout": 20000,
-            "url": proxy_url + "proxy/v1/ln/api/",
+            "url": proxy_url + "/proxy/v1/ln/api/",
             "data": {
                 "imp": implementation,
                 "host": node_host,
@@ -1173,7 +1179,7 @@ function test_create_invoice(implementation, proxy_data, node_host, node_key) {
             "api_url": node_host + "/v1/invoices",
             "data": {
                 "value": 10000,
-                "memo": "test invoice LND direct",
+                "memo": "test invoice lnd direct",
                 "expiry": 180
             },
             "headers": {
@@ -1186,7 +1192,7 @@ function test_create_invoice(implementation, proxy_data, node_host, node_key) {
             "data": {
                 "out": false,
                 "amount": 10000,
-                "memo": "test invoice LNbits direct",
+                "memo": "test invoice lnbits direct",
                 "expiry": 180
             },
             "headers": {
@@ -1343,7 +1349,7 @@ function prompt_proxy_unlock(proxy_id) {
         "method": "POST",
         "cache": false,
         "timeout": 5000,
-        "url": proxy_url + "proxy/v1/ln/api/",
+        "url": proxy_url + "/proxy/v1/ln/api/",
         "data": {
             "pingpw": true,
             "x-api": proxy_key_hash
@@ -1494,7 +1500,7 @@ function validate_lnurl_connection(lightning_node) {
         proxy_details = lnurl_deform(lightning_node.proxy_host),
         proxy_host = proxy_details.url,
         proxy_key = proxy_details.k,
-        proxy_url = proxy_host + "proxy/v1/ln/api/";
+        proxy_url = proxy_host + "/proxy/v1/ln/api/";
 
     if (!proxy_host) {
         notify(tl("proxydatamissing"));

assets_js_bitrequest_monitors.js

@@ -690,11 +690,11 @@ function update_api_source(rdo, api_data) {
 // Updates UI with API source details and connection status indicators
 function display_api_source(current_list, api_data) {
     const api_url = api_data.url,
-        api_url_short = truncate(api_url),
+        api_url_short = truncate_middle(api_url),
         provider_name = api_data.name,
         api_title = provider_name === "mempool.space" ? api_url : provider_name === "electrum" ? get_string_before_last_colon(api_url_short) : provider_name,
         api_source = api_title || api_url_short;
-    current_list.data("source", api_source).find(".api_source").html("<span class='src_txt' title='" + api_url + "'>" + tl("source") + ": " + api_source + "</span><span class='icon-wifi-off'></span><span class='icon-connection'></span>");
+    current_list.data("source", api_source).find(".api_source").html("<span class='src_txt' title='" + api_url + "'>" + tl("source") + ": " + truncate_middle(api_source, 15, 18, 41) + "</span><span class='icon-wifi-off'></span><span class='icon-connection'></span>");
 }
 
 // ** Transaction Processing: **

assets_js_bitrequest_payments.js

@@ -918,7 +918,7 @@ function lnd_put(proxy_url, proxy_key, payload, is_lnurl) {
         "method": "POST",
         "cache": false,
         "timeout": 5000,
-        "url": proxy_url + "proxy/v1/ln/api/",
+        "url": proxy_url + "/proxy/v1/ln/api/",
         "data": {
             "fn": "put",
             "pl": payload,
@@ -1696,7 +1696,7 @@ function set_lightning_qr(a, title) {
         rt = srt || request.requesttitle,
         m = rt && rt.length > 1 ? "&m=" + encodeURIComponent(rt) : "",
         nid = ln.lnurl === false ? ln.nid : "",
-        url = glob_let.lnd_ph + "proxy/v1/ln/?i=" + ln.imp + "&id=" + request.typecode + ln.pid + nid + "&a=" + (a * 100000000000).toFixed(0) + m,
+        url = glob_let.lnd_ph + "/proxy/v1/ln/?i=" + ln.imp + "&id=" + request.typecode + ln.pid + nid + "&a=" + (a * 100000000000).toFixed(0) + m,
         lnurl = lnurl_encode("lnurl", url).toUpperCase();
     $("#qrcode_lnd").html("").qrcode(lnurl);
     set_lightning_uris(lnurl, a);
@@ -2725,7 +2725,7 @@ function custom_shorten(service, shared_url, shared_title, site_thumb, url_hash)
         "method": "POST",
         "cache": false,
         "timeout": 5000,
-        "url": server + "proxy/v1/inv/api/",
+        "url": server + "/proxy/v1/inv/api/",
         "data": payload
     }).done(function(response) {
         const data = br_result(response).result;
@@ -2741,7 +2741,7 @@ function custom_shorten(service, shared_url, shared_title, site_thumb, url_hash)
                     is_default_server = objectkey_in_array(glob_const.proxy_list, "proxy", server),
                     short_url = is_default_server ?
                     glob_const.approot + "?i=" + server_index.toString() + request_id :
-                    server + "proxy/v1/inv/4bR" + request_id;
+                    server + "/proxy/v1/inv/4bR" + request_id;
                 share_request(short_url, shared_title);
                 if (url_hash) {
                     br_set_session("custom_shorturl_" + url_hash, short_url);

assets_js_bitrequest_polling.js

@@ -374,9 +374,9 @@ function validate_confirmations(tx_data, direct, ln) {
                 status_panel.find("span.receivedfiat").text(" (" + received_amount + " " + current_currency + ")");
 
                 const exact_match = helper.exact,
-                    monero_valid = crypto_symbol === "xmr" ? (received_formatted > (crypto_amount * 0.97) && received_formatted < (crypto_amount * 1.03)) : true; // error margin for xmr integrated addresses
+                    is_valid = crypto_symbol === "xmr" ? (received_formatted > (crypto_amount * 0.97) && received_formatted < (crypto_amount * 1.03)) : true; // error margin for xmr integrated addresses
 
-                if (monero_valid) {
+                if (is_valid) {
                     const amount_valid = exact_match ? received_formatted === crypto_amount : received_formatted >= (crypto_amount * 0.97);
                     if (amount_valid) {
                         if (tx_confirms >= required_confirms || is_instant === true) {
@@ -395,15 +395,15 @@ function validate_confirmations(tx_data, direct, ln) {
                             closenotify();
                             new_status = insufficient_status;
                         } else {
-                            if (!ln) {
-                                play_audio(glob_const.blip);
+                            if (ln && request.status === "pending") {} else {
+                                //play_audio(glob_const.blip);
+                                payment_dialog.addClass("transacting").attr("data-status", "pending");
+                                const broadcast_msg = ln ? tl("waitingforpayment") : tl("txbroadcasted");
+                                status_header.text(broadcast_msg);
+                                request.status = "pending",
+                                    request.pending = "polling";
+                                save_payment_request(direct, ln);
                             }
-                            payment_dialog.addClass("transacting").attr("data-status", "pending");
-                            const broadcast_msg = ln ? tl("waitingforpayment") : tl("txbroadcasted");
-                            status_header.text(broadcast_msg);
-                            request.status = "pending",
-                                request.pending = "polling";
-                            save_payment_request(direct, ln);
                         }
                         status_panel.find("#view_tx").attr("data-txhash", tx_hash);
                         return new_status;

assets_js_bitrequest_rpcs.js

@@ -65,7 +65,7 @@ function edit_rpcnode() {
             current_node = item_data.selected,
             node_name = current_node.name,
             node_url = current_node.url,
-            url_trunc = truncate(node_url),
+            url_trunc = truncate_middle(node_url),
             node_title = (node_name === "electrum" || node_name === "mempool.space") ? url_trunc : node_name || url_trunc,
             dialog_html = "\
             <div class='formbox' id='settingsbox' data-id='" + glob_let.ap_id + "'>\
@@ -559,7 +559,7 @@ function submit_rpcnode() {
                 }
                 loader(true);
                 set_loader_text(tl("connecttolnur", {
-                    "url": truncate(node_url)
+                    "url": truncate_middle(node_url)
                 }));
                 const node_config = {
                     "url": node_url,

assets_js_bitrequest_settings.js

@@ -2685,7 +2685,7 @@ function test_append_proxy(options, key, value, selected, dfault) {
         "method": "POST",
         "cache": false,
         "timeout": 5000,
-        "url": value + "proxy/v1/ln/api/",
+        "url": value + "/proxy/v1/ln/api/",
         "data": {
             "ping": true
         }
@@ -2771,7 +2771,7 @@ function test_custom_proxy(value) {
             "method": "POST",
             "cache": false,
             "timeout": 5000,
-            "url": url + "proxy/v1/",
+            "url": url + "/proxy/v1/",
             "data": {
                 "custom": "add",
                 "api_url": "x" // dummy value, don't remove