proxy version 0.021

Author: bitrequest

assets_js_bitrequest_core.js

@@ -4436,7 +4436,7 @@ function expand_shoturl(input_param) {
     if (input_param) {
         const proxy_index = input_param.slice(0, 1),
             short_id = input_param.slice(1),
-            proxy_url = glob_const.proxy_list[proxy_index],
+            proxy_url = glob_const.proxy_list[proxy_index].proxy,
             is_secure_url = (proxy_url.indexOf("https://") >= 0);
         if (is_secure_url) {
             const request_payload = {

assets_js_bitrequest_fetchblocks.js

@@ -1849,7 +1849,7 @@ function mempoolspace_blockheight_fails(rd, api_data, rdo, rpc) {
     mempoolspace_rpc(rd, api_data, rdo, rpc);
 }
 
-// Processes Nano transactions via RPC with support for account scanning and block verification
+// Processes Electrum transactions via RPC with support for account scanning and block verification
 function electrum_rpc(rd, api_data, rdo, latest_block) {
     const currency = rd.payment,
         tx_list = rdo.transactionlist,

assets_js_bitrequest_lightning.js

@@ -49,7 +49,6 @@ $(document).ready(function() {
     //s_lnd_proxy
     //is_local_node
     //cancelpd
-    //node_exists
     //fetch_node
     //fetch_other_nodes
     //fetch_proxy
@@ -1025,7 +1024,7 @@ function add_custom_proxy(proxy_url) {
     const proxy_node = $("#api_proxy"),
         proxy_node_data = proxy_node.data(),
         custom_proxies = proxy_node_data.custom_proxies;
-    if (custom_proxies.includes(proxy_url) || glob_const.proxy_list.includes(proxy_url)) {
+    if (custom_proxies.includes(proxy_url) || value_in_array(glob_const.proxy_list, proxy_url)) {
         return false;
     }
     custom_proxies.push(proxy_url);
@@ -1100,7 +1099,7 @@ function trigger_ln() {
             return
         }
         const normalized_url = complete_url(input_proxy_url),
-            is_default_proxy = $.inArray(normalized_url, glob_const.proxy_list) !== -1;
+            is_default_proxy = value_in_array(glob_const.proxy_list, normalized_url);
         if (is_default_proxy) {
             popnotify("error", tl("defaultproxy", {
                 "fixed_url": normalized_url
@@ -1243,7 +1242,7 @@ function test_create_invoice(implementation, proxy_data, node_host, node_key) {
         node_services = lightning_data.services,
         node_id_source = node_host ? (implementation == "lnbits" ? node_key : node_host) : proxy_url + implementation,
         node_id = sha_sub(node_id_source, 10),
-        is_node_existing = node_exists(node_services, node_id),
+        is_node_existing = value_in_array(node_services, node_id),
         default_error = tl("unabletoconnect"),
         unique_id = sha_sub(now(), 10);
 
@@ -1586,14 +1585,6 @@ function cancelpd() {
     }
 }
 
-// Verifies if node ID exists in provided node list
-function node_exists(node_services, node_id) {
-    if (empty_obj(node_services)) {
-        return false;
-    }
-    return node_services.some(node => node.node_id === node_id);
-}
-
 // Retrieves node by ID from node list
 function fetch_node(node_services, node_id) {
     return node_services.find(node => node.node_id === node_id);

assets_js_bitrequest_payments.js

@@ -2745,9 +2745,9 @@ function custom_shorten(service, shared_url, shared_title, site_thumb, url_hash)
             }
             const request_id = data.shorturl;
             if (request_id) {
-                const server_index = glob_const.proxy_list.indexOf(server),
-                    is_default_server = server_index > -1;
-                const short_url = is_default_server ?
+                const server_index = find_object_index(server, glob_const.proxy_list, "proxy"),
+                    is_default_server = value_in_array(glob_const.proxy_list, server);
+                short_url = is_default_server ?
                     glob_const.approot + "?i=" + server_index.toString() + request_id :
                     server + "proxy/v1/inv/4bR" + request_id;
                 share_request(short_url, shared_title);

assets_js_bitrequest_rpcs.js

@@ -3,7 +3,6 @@ $(document).ready(function() {
     edit_rpcnode();
     //fetch_electrum_nodes
     //get_random_electrum_node
-    //check_node_exists
     //get_rpc_placeholder
     //validate_and_add_rpc_node
     //create_rpc_node_element
@@ -114,7 +113,7 @@ function fetch_electrum_nodes(currency, node_url, predefined_nodes, custom_nodes
             let has_nodes = false;
             $.each(get_session_nodes, function(index, val) {
                 const rpc_url = val.rpc_url2,
-                    node_exists = check_node_exists(rpc_url, existing_nodes);
+                    node_exists = value_in_array(rpc_url, existing_nodes);
                 if (!node_exists) {
                     node_data = {
                             "name": "electrum",
@@ -163,8 +162,7 @@ function fetch_electrum_nodes(currency, node_url, predefined_nodes, custom_nodes
                         filter_ips = is_valid_ipv4(url);
                     if (filter_ips) {
                         // filter out electrum ip's and only add regular urls
-                    }
-                    else {
+                    } else {
                         let tport = null;
                         if (url) {
                             const port_arr = nd[2];
@@ -174,7 +172,7 @@ function fetch_electrum_nodes(currency, node_url, predefined_nodes, custom_nodes
                         }
                         const port = tport ? ((/^\d/.test(tport)) ? ":" + port : ":" + tport.slice(1)) : "",
                             rpc_url2 = url + port,
-                            node_exists = check_node_exists(rpc_url2, existing_nodes);
+                            node_exists = value_in_array(existing_nodes, rpc_url2);
                         if (!node_exists) {
                             const node_data = {
                                     "name": "electrum",
@@ -243,11 +241,6 @@ function get_random_electrum_node(predefined_nodes) {
     return null;
 }
 
-// Search for any object in the array that has the matching URL
-function check_node_exists(url_to_find, node_array) {
-    return node_array.some(node => node.url === url_to_find);
-}
-
 // Provides template URL examples for different cryptocurrency node configurations and API types
 function get_rpc_placeholder(currency) {
     return {

assets_js_bitrequest_settings.js

@@ -2637,9 +2637,9 @@ function trigger_proxy_dialog() {
 // Displays proxy configuration dialog with available servers and custom proxy input
 function pick_api_proxy() {
     $(document).on("click", "#api_proxy", function() {
-        const proxies = all_proxies(),
-            proxy = d_proxy(),
-            content = "\
+        const proxies = all_proxies("display"),
+            proxy = d_proxy();
+        const content = "\
            <div class='formbox' id='proxyformbox'>\
                <h2 class='icon-sphere'>API Proxy</h2>\
                <div class='popnotify'></div>\
@@ -2681,7 +2681,7 @@ function pick_api_proxy() {
         const options = $("#proxyformbox").find(".options");
         $.each(proxies, function(key, value) {
             const selected = (value === proxy),
-                dfault = $.inArray(value, glob_const.proxy_list) !== -1;
+                dfault = value_in_array(glob_const.proxy_list, value);
             test_append_proxy(options, key, value, selected, dfault);
         });
     })
@@ -2770,7 +2770,7 @@ function test_custom_proxy(value) {
         data = node.data(),
         proxies = data.custom_proxies,
         url = complete_url(value);
-    if ($.inArray(url, proxies) !== -1 || $.inArray(url, glob_const.proxy_list) !== -1) {
+    if ($.inArray(url, proxies) !== -1 || value_in_array(glob_const.proxy_list, url)) {
         popnotify("error", tl("proxyexists"));
         return false;
     }
@@ -3043,7 +3043,7 @@ function json_check_apikey(keylength, ref, payload, keyval, lastInput) {
     if (keyval.length > keylength) {
         if (ref === "infura" || ref === "alchemy") {
             const txhash = "0x919408272d05b3fd7ccfa1f47c10bea425891c8aa47ba7309dc3beb0b89197f1",
-                baseUrl = ref === "infura" ? glob_const.main_eth_node : glob_const.main_alchemy_node,
+                base_url = ref === "infura" ? glob_const.main_eth_node : glob_const.main_alchemy_node,
                 json = {
                     "jsonrpc": "2.0",
                     "id": 3,
@@ -3052,7 +3052,7 @@ function json_check_apikey(keylength, ref, payload, keyval, lastInput) {
                 };
             api_proxy({
                 "api": ref,
-                "api_url": baseUrl + keyval,
+                "api_url": base_url + keyval,
                 "proxy": false,
                 "params": {
                     "method": "POST",
@@ -3073,8 +3073,8 @@ function json_check_apikey(keylength, ref, payload, keyval, lastInput) {
             });
             return
         }
-        const apiData = get_api_data(ref),
-            baseUrl = apiData.base_url,
+        const api_data = get_api_data(ref),
+            base_url = api_data.base_url,
             method = (ref === "firebase" || ref === "bitly") ? "POST" : "GET",
             params = {
                 "method": method,
@@ -3096,27 +3096,27 @@ function json_check_apikey(keylength, ref, payload, keyval, lastInput) {
                 "bitlink_id": "bit.ly/12a4b6c"
             });
         }
-        const apiUrl = baseUrl + search,
+        const api_url = base_url + search,
             proxy = (ref === "coinmarketcap"),
-            reqData = {
+            req_data = {
                 "api": ref,
                 "search": search,
                 "cachetime": 0,
                 "cachefolder": "1h",
-                "api_url": apiUrl,
+                "api_url": api_url,
                 "proxy": proxy,
                 "params": params
             };
-        api_proxy(reqData).done(function(e) {
+        api_proxy(req_data).done(function(e) {
             const data = br_result(e).result;
             if (data) {
-                const failMsg = tl("apicallfailed");
+                const fail_msg = tl("apicallfailed");
                 if ((ref === "etherscan" || ref === "arbiscan" || ref === "polygonscan" || ref === "bscscan") && data.status != 1) {
                     if (str_match(data.result, "Invalid API Key")) {
                         api_fail(ref, keyval);
                     } else {
                         notify(tl("apicallerror"));
-                        const content = "<h2 class='icon-blocked'>" + failMsg + "</h2><p class='doselect'>" + data.message + "</p>";
+                        const content = "<h2 class='icon-blocked'>" + fail_msg + "</h2><p class='doselect'>" + data.message + "</p>";
                         popdialog(content, "canceldialog");
                     }
                     return
@@ -3133,7 +3133,7 @@ function json_check_apikey(keylength, ref, payload, keyval, lastInput) {
                         api_fail(ref, keyval);
                     } else {
                         notify(tl("apicallerror"));
-                        const content = "<h2 class='icon-blocked'>" + failMsg + "</h2><p class='doselect'>" + data.error + "</p>";
+                        const content = "<h2 class='icon-blocked'>" + fail_msg + "</h2><p class='doselect'>" + data.error + "</p>";
                         popdialog(content, "canceldialog");
                     }
                     return
@@ -3157,7 +3157,7 @@ function json_check_apikey(keylength, ref, payload, keyval, lastInput) {
                         api_fail(ref, keyval);
                     } else {
                         notify(tl("apicallerror"));
-                        const content = "<h2 class='icon-blocked'>" + failMsg + "</h2><p class='doselect'>" + data.error + "</p>";
+                        const content = "<h2 class='icon-blocked'>" + fail_msg + "</h2><p class='doselect'>" + data.error + "</p>";
                         popdialog(content, "canceldialog");
                     }
                     return
@@ -3170,7 +3170,7 @@ function json_check_apikey(keylength, ref, payload, keyval, lastInput) {
                             api_fail(ref, keyval);
                         } else {
                             notify(tl("apicallerror"));
-                            const content = "<h2 class='icon-blocked'>" + failMsg + "</h2><p class='doselect'>" + data.error + "</p>";
+                            const content = "<h2 class='icon-blocked'>" + fail_msg + "</h2><p class='doselect'>" + data.error + "</p>";
                             popdialog(content, "canceldialog");
                         }
                     }
@@ -3183,7 +3183,7 @@ function json_check_apikey(keylength, ref, payload, keyval, lastInput) {
                             api_fail(ref, keyval);
                         } else {
                             notify(tl("apicallerror"));
-                            const content = "<h2 class='icon-blocked'>" + failMsg + "</h2><p class='doselect'>" + ec + "</p>";
+                            const content = "<h2 class='icon-blocked'>" + fail_msg + "</h2><p class='doselect'>" + ec + "</p>";
                             popdialog(content, "canceldialog");
                         }
                         return
@@ -3194,7 +3194,7 @@ function json_check_apikey(keylength, ref, payload, keyval, lastInput) {
                         api_fail(ref, keyval);
                     } else {
                         notify(tl("apicallerror"));
-                        const content = "<h2 class='icon-blocked'>" + failMsg + "</h2><p class='doselect'>" + data.error + "</p>";
+                        const content = "<h2 class='icon-blocked'>" + fail_msg + "</h2><p class='doselect'>" + data.error + "</p>";
                         popdialog(content, "canceldialog");
                     }
                     return