proxy management

Author: bitrequest

assets_js_bitrequest_fetchblocks.js

@@ -1695,14 +1695,15 @@ function mempoolspace_rpc_blockheight(rd, api_data, rdo, rpc) {
         "params": {
             "method": "GET"
         }
-    }).done(function(lb) {
-        const lbdat = br_result(lb);
-        if (lbdat) {
-            const latestblock = lbdat.result;
-            if (latestblock) {
-                mempoolspace_rpc(rd, api_data, rdo, rpc, latestblock);
+    }).done(function(e) {
+        const data = br_result(e).result;
+        if (data) {
+            if (data.error) {
+                tx_api_scan_fail(rd, api_data, rdo, data.error);
                 return
             }
+            mempoolspace_rpc(rd, api_data, rdo, rpc, data);
+            return
         }
         tx_api_scan_fail(rd, api_data, rdo, default_error);
     }).fail(function(xhr, stat, err) {

assets_js_bitrequest_monitors.js

@@ -22,6 +22,7 @@ $(document).ready(function() {
     //tx_api_scan_fail
     //tx_api_fail
     //handle_api_fails
+    //no_results
     //get_next_api
     //api_eror_msg
     //get_api_error_data
@@ -461,7 +462,11 @@ function handle_api_fails(rd, rdo, error, api_data, is_proxy, l2) {
         }
         return false
     }
-    if (is_proxy && next_proxy()) { // Try next proxy if proxy fails
+    if (is_proxy) { // Try next proxy if proxy fails
+        if (next_proxy()) {
+            return
+        }
+        no_results(rdo, src, api_data, error_data);
         return
     }
     if (!api_data) {
@@ -525,6 +530,11 @@ function handle_api_fails(rd, rdo, error, api_data, is_proxy, l2) {
     if (next_proxy()) { // Try next proxy after trying all api's
         return
     }
+    no_results(rdo, src, api_data, error_data);
+}
+
+// Show error message if all proxies / apis fail. 
+function no_results(rdo, src, api_data, error_data) {
     const rpc_id = api_data.name || api_data.url || "unknown";
     api_eror_msg(rpc_id, error_data);
     if (src === "addr_polling" || src === "tx_polling") {
@@ -756,7 +766,11 @@ function handle_rpc_fails(rd, rdo, error, api_data, is_proxy, l2) {
         }
         return false
     }
-    if (is_proxy && next_proxy()) { // Try next proxy if proxy fails
+    if (is_proxy) { // Try next proxy if proxy fails
+        if (next_proxy()) {
+            return
+        }
+        no_results(rdo, src, api_data, error_data);
         return
     }
     if (!api_data) {
@@ -820,14 +834,7 @@ function handle_rpc_fails(rd, rdo, error, api_data, is_proxy, l2) {
     if (next_proxy()) { // Try next proxy after trying all rpc's
         return
     }
-    const rpc_id = api_data.name || api_data.url || "unknown";
-    api_eror_msg(rpc_id, error_data);
-    if (src === "addr_polling") {
-        clearpinging();
-        socket_info(api_data, false);
-        notify(translate("websocketoffline"), 500000, "yes");
-    }
-    api_callback(rdo);
+    no_results(rdo, src, api_data, error_data);
 }
 
 // Retrieves the next available RPC for a given payment method

assets_js_bitrequest_payments.js

@@ -53,6 +53,8 @@ $(document).ready(function() {
     //cc_fail
     //initexchangerate
     //get_fiat_exchangerate
+    //next_fiat_api
+    //no_xrate_result
     //rendercurrencypool
     //getpayment
     //show_paymentdialog
@@ -1117,10 +1119,7 @@ function cc_fail(apilist, api, error_val, is_proxy) {
     if (next_proxy()) { // Try next proxy after trying all api's
         return
     }
-    loadertext(translate("apierror"));
-    closeloader();
-    cancelpaymentdialog();
-    fail_dialogs(api, error_val);
+    no_xrate_result(api, error_val);
 }
 
 // Initializes the exchange rate process
@@ -1289,10 +1288,15 @@ function next_fiat_api(apilist, fiatapi, error_object, ccrate, currencystring, c
     if (next_proxy()) { // Try next proxy after trying all api's
         return
     }
-    loadertext(translate("error"));
+    no_xrate_result(fiatapi, error_object);
+}
+
+// Show error message if all proxies / apis fail.
+function no_xrate_result(api, error_val) {
+    loadertext(translate("apierror"));
     closeloader();
     cancelpaymentdialog();
-    fail_dialogs(fiatapi, error_object);
+    fail_dialogs(api, error_val);
 }
 
 // Renders the currency pool with exchange rates and payment details

assets_js_bitrequest_polling.js

@@ -236,6 +236,10 @@ function ping_xmr_node(cachetime, address, vk, request_ts, txhash) {
             }
         });
     }).fail(function() {
+        if (get_next_proxy()) {
+            ping_xmr_node(cachetime, address, vk, request_ts, txhash);
+            return
+        }
         clearpinging(address);
         notify(translate("websocketoffline"), 500000, "yes");
     });