From 214891fcc94bf0e06fb006f77c63fed167b71cd1 Mon Sep 17 00:00:00 2001 From: Severiano Jaramillo Date: Wed, 7 Nov 2018 16:22:29 -0600 Subject: [PATCH] Added proper methods to deal with bitshares nodes that send 'trash info', which are nodes that potentially do not have installed the history plugin and thus do not respond properly to history related requests. As this information is needed for PalmPay we cannot rely on such nodes and have to try to connect to a different node. --- .../graphenej/api/android/NetworkService.java | 104 ++++++++++++------ 1 file changed, 70 insertions(+), 34 deletions(-) diff --git a/graphenej/src/main/java/cy/agorise/graphenej/api/android/NetworkService.java b/graphenej/src/main/java/cy/agorise/graphenej/api/android/NetworkService.java index 7a2f2db..2b2f7a2 100644 --- a/graphenej/src/main/java/cy/agorise/graphenej/api/android/NetworkService.java +++ b/graphenej/src/main/java/cy/agorise/graphenej/api/android/NetworkService.java @@ -80,6 +80,7 @@ public class NetworkService extends Service { private final String TAG = this.getClass().getName(); public static final int NORMAL_CLOSURE_STATUS = 1000; + private static final int NO_HISTORY_CLOSURE_STATUS = 1001; // Time to wait before retrying a connection attempt private static final int DEFAULT_RETRY_DELAY = 500; @@ -565,6 +566,9 @@ public class NetworkService extends Service { } else if (requestClass == GetFullAccounts.class) { Type GetFullAccountsResponse = new TypeToken>>(){}.getType(); parsedResponse = gson.fromJson(text, GetFullAccountsResponse); + + if(parsedResponse != null) + verifyNodeHasHistoryApi(parsedResponse); } else if(requestClass == GetKeyReferences.class){ Type GetKeyReferencesResponse = new TypeToken>>>(){}.getType(); parsedResponse = gson.fromJson(text, GetKeyReferencesResponse); @@ -587,6 +591,30 @@ public class NetworkService extends Service { RxBus.getBusInstance().send(parsedResponse); } + /** + * This method inspects the node response to find out if the totalOps is equal to zero, + * in that case the current connected node may not have the history plugin so we would need + * to close the connection and choose a different node. + * + * @param parsedResponse A JSONRpcResponse from a GetFullAccounts API call + */ + private void verifyNodeHasHistoryApi(JsonRpcResponse parsedResponse) { + if(parsedResponse.result instanceof List && + ((List) parsedResponse.result).size() > 0 && + ((List) parsedResponse.result).get(0) instanceof FullAccountDetails) { + + FullAccountDetails fullAccountDetails = (FullAccountDetails) ((List) parsedResponse.result).get(0); + long totalOps = fullAccountDetails.getStatistics().total_ops; + + if (totalOps == 0) { + Log.d(TAG, "The node returned 0 total_ops for current account and may not have installed the history plugin. " + + "Trying to connect to a different node."); + + mWebSocket.close(NO_HISTORY_CLOSURE_STATUS, null); + } + } + } + /** * Private method that will just broadcast a de-serialized notification to all interested parties * @param notification De-serialized notification @@ -645,20 +673,11 @@ public class NetworkService extends Service { public void onClosed(WebSocket webSocket, int code, String reason) { super.onClosed(webSocket, code, reason); Log.d(TAG,"onClosed"); - RxBus.getBusInstance().send(new ConnectionStatusUpdate(ConnectionStatusUpdate.DISCONNECTED, ApiAccess.API_NONE)); - isLoggedIn = false; - - // Marking the selected node as not connected - mSelectedNode.setConnected(false); - - // Updating the selected node's 'connected' status on the NodeLatencyVerifier instance - if(nodeLatencyVerifier != null) - nodeLatencyVerifier.updateActiveNodeInformation(mSelectedNode); - - - // We have currently no selected node - mSelectedNode = null; + if (code == NO_HISTORY_CLOSURE_STATUS) + handleWebSocketDisconnection(true); + else + handleWebSocketDisconnection(false); } @Override @@ -669,36 +688,26 @@ public class NetworkService extends Service { for(StackTraceElement element : t.getStackTrace()){ Log.v(TAG,String.format("%s#%s:%s", element.getClassName(), element.getMethodName(), element.getLineNumber())); } - // Registering current status - isLoggedIn = false; - mCurrentId = 0; - mApiIds.clear(); // If there is a response, we print it if(response != null){ Log.e(TAG,"Response: "+response.message()); } - // Adding a very high latency value to this node in order to prevent - // us from getting it again - mSelectedNode.addLatencyValue(Long.MAX_VALUE); - nodeProvider.updateNode(mSelectedNode); + handleWebSocketDisconnection(true); + } + /** + * Method that encapsulates the behavior of handling a disconnection to the current node, and + * potentially tries to reconnect to another one. + * + * @param tryReconnection Variable that states if a reconnection to other node should be tried. + */ + private void handleWebSocketDisconnection(boolean tryReconnection) { RxBus.getBusInstance().send(new ConnectionStatusUpdate(ConnectionStatusUpdate.DISCONNECTED, ApiAccess.API_NONE)); - if(nodeProvider.getBestNode() == null){ - Log.e(TAG,"Giving up on connections"); - stopSelf(); - }else{ - Handler handler = new Handler(Looper.getMainLooper()); - handler.postDelayed(new Runnable() { - @Override - public void run() { - Log.d(TAG,"Retrying"); - connect(); - } - }, DEFAULT_RETRY_DELAY); - } + isLoggedIn = false; + // Marking the selected node as not connected mSelectedNode.setConnected(false); @@ -706,6 +715,33 @@ public class NetworkService extends Service { if(nodeLatencyVerifier != null) nodeLatencyVerifier.updateActiveNodeInformation(mSelectedNode); + if(tryReconnection) { + // Registering current status + mCurrentId = 0; + mApiIds.clear(); + + // Adding a very high latency value to this node in order to prevent + // us from getting it again + mSelectedNode.addLatencyValue(Long.MAX_VALUE); + nodeProvider.updateNode(mSelectedNode); + + RxBus.getBusInstance().send(new ConnectionStatusUpdate(ConnectionStatusUpdate.DISCONNECTED, ApiAccess.API_NONE)); + + if (nodeProvider.getBestNode() == null) { + Log.e(TAG, "Giving up on connections"); + stopSelf(); + } else { + Handler handler = new Handler(Looper.getMainLooper()); + handler.postDelayed(new Runnable() { + @Override + public void run() { + Log.d(TAG, "Retrying"); + connect(); + } + }, DEFAULT_RETRY_DELAY); + } + } + // We have currently no selected node mSelectedNode = null; }