feat: Added support for RPC PROXY

We also added some TODO comments here to check later...

Author: etherbeing

src/main/java/com/nerox/client/Tfprotocol.java

@@ -138,7 +138,7 @@ public void ndateCommand() {
      * */
     public void echoCommand(String value) {
         this.getProtoHandler().echoCallback(
-                this.easyreum.getBuilder().build("ECHO",value).translate()
+                this.easyreum.getBuilder().build("ECHO", value).translate()
                         .getBuilder().buildStatusInfo().getMessage());
     }
     /**

src/main/java/com/nerox/client/callbacks/IXSRPCProxyCallback.java

@@ -0,0 +1,9 @@
+package com.nerox.client.callbacks;
+
+import com.nerox.client.misc.StatusInfo;
+import com.nerox.client.modules.XSRPCProxy;
+
+public interface IXSRPCProxyCallback extends ISuperCallback<XSRPCProxy>{
+    void startRPCProxyCallback(StatusInfo si);
+    void receivePayload(StatusInfo si);
+}

src/main/java/com/nerox/client/connection/Client.java

@@ -138,7 +138,7 @@ public void setSocket(Socket socket) {
 
     @Override
     protected void finalize() throws Throwable {
-        super.finalize();
+        super.finalize(); // TODO This needs further research
         this.stopConnection();
     }
 }

src/main/java/com/nerox/client/misc/TCPTimeouts.java

@@ -2,7 +2,7 @@
 
 import com.nerox.client.callbacks.ISuperCallback;
 
-public class TCPTimeouts {
+public class TCPTimeouts { // TODO This class needs to be reviewed as seems like is not usefull at all
 
     private int connectTimeout = 120 * 1000; //2 minutos de espera
     private int connectRetry = 3; //Intentos de reconexión

src/main/java/com/nerox/client/modules/XSRPCProxy.java

@@ -1,15 +1,61 @@
 package com.nerox.client.modules;
 
-import com.nerox.client.Tfprotocol;
+import java.io.InputStream;
+import java.lang.reflect.Method;
+
 import com.nerox.client.TfprotocolSuper;
 import com.nerox.client.callbacks.IXSRPCProxyCallback;
+import com.nerox.client.misc.StatusInfo;
+
 
 public class XSRPCProxy extends TfprotocolSuper<IXSRPCProxyCallback>{
-  public boolean startCommand(){
-    super.getProtoHandler().startRPCProxyCallback(
+
+  public XSRPCProxy(String ipServer, int portServer, String publicKey, 
+    String hash, int len, String protocol, IXSRPCProxyCallback protoHandler) {
+    super(ipServer, portServer, publicKey, hash, len, protocol, protoHandler);
+  }
+
+  public XSRPCProxy(String proxy, String ipServer, int portServer, String publicKey,
+    String hash, int len, String protocol, IXSRPCProxyCallback protoHandler) {
+    super(proxy, ipServer, portServer, publicKey, hash, len, protocol, protoHandler);
+  }
+
+  public XSRPCProxy(TfprotocolSuper tfprotocol, IXSRPCProxyCallback protoHandler) {
+    this.setProtoHandler(protoHandler);
+    this.easyreum = tfprotocol.getConHandler();
+  }
+  
+  public XSRPCProxy(String ipServer, int portServer, InputStream publicKey,
+    String hash, int len, String protocol,
+    IXSRPCProxyCallback protoHandler){
+    super(ipServer, portServer, publicKey, hash, len, protocol, protoHandler);
+  }
+
+  public void startCommand(){
+    this.getProtoHandler().startRPCProxyCallback(
       this.easyreum.getBuilder().build("XS_RPCPROXY").translate()
       .getBuilder().buildStatusInfo()
     );
   }
-  
+  public boolean sendHashCommand(String hash){
+    this.easyreum.getBuilder().build(hash).send();
+    this.easyreum.receiveHeader();
+    return this.easyreum.getHeader() == 0;
+  }
+  public int sendPayload(String payload){
+    return this.sendPayload(payload.getBytes());
+  }
+  public int sendPayload(byte[] payload){
+    this.easyreum.getBuilder().build(payload).send();
+    this.easyreum.getBuilder().build(0).sendJust();
+    do{
+      this.getProtoHandler().receivePayload(this.easyreum.receive().getBuilder().buildStatusInfo());
+    }while(this.easyreum.getHeader() > 0);
+    this.easyreum.receiveHeader();
+    return this.easyreum.getHeader();
+  }
+
+  public void exitCommand(){
+    this.easyreum.getBuilder().build(-1).sendJust();
+  }
 } 

src/test/java/com/nerox/client/AppTest.java

@@ -61,7 +61,8 @@ private String joinPaths(String ...paths){
         }
         return sb.toString();
     }
-    @Test
+    
+    //@Test
     public void runAllTests(){
         this.tfprotocolDoesConnect();
         //this.loginCommand();

src/test/java/com/nerox/client/Callback.java

@@ -1,7 +1,9 @@
 package com.nerox.client;
 import com.nerox.client.callbacks.ITfprotocolCallback;
+import com.nerox.client.callbacks.IXSRPCProxyCallback;;
 import com.nerox.client.misc.StatusInfo;
 import com.nerox.client.misc.StatusServer;
+import com.nerox.client.modules.XSRPCProxy;
 import com.nerox.client.misc.FileStat;
 
 public class Callback implements ITfprotocolCallback{
@@ -181,3 +183,36 @@ public void issecfsCallback(StatusInfo statusInfo){
         this.statusServer(statusInfo);
     }
 }
+
+class RPCProxyCallback implements IXSRPCProxyCallback{
+    @Override
+    public void statusServer(StatusInfo status) {
+        System.out.println("------------------------------");
+        System.out.println(status.getStatus());
+        System.out.println(status.getMessage());
+        System.out.println(status.getPayload()!=null ?new String(status.getPayload()):"");
+        System.out.println(status.getCode());
+        System.out.println("------------------------------");
+    }
+    @Override
+    public void responseServerCallback(StatusInfo status) {
+        // TODO Auto-generated method stub   
+        this.statusServer(status);
+    }
+
+    @Override
+    public void instanceTfProtocol(XSRPCProxy instance) {
+        // TODO Auto-generated method stub
+    }
+
+    @Override
+    public void startRPCProxyCallback(StatusInfo si) {
+        // TODO Auto-generated method stub 
+        this.statusServer(si);
+    }
+    @Override
+    public void receivePayload(StatusInfo si) {
+        // TODO Auto-generated method stub
+        this.statusServer(si);
+    }
+}

src/test/java/com/nerox/client/RPCProxyTest.java

@@ -0,0 +1,99 @@
+package com.nerox.client;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+
+import com.nerox.client.keepalives.UDPKeepAlive;
+import com.nerox.client.modules.XSRPCProxy;
+import org.junit.Test;
+
+/**
+ * Unit test for simple App.
+ */
+public class RPCProxyTest {
+    RPCProxyCallback callback;
+    XSRPCProxy proxy;
+    public RPCProxyTest(){
+        this.callback = new RPCProxyCallback();
+            // Get current path
+        String path = System.getProperty("basedir");
+        try{
+            FileInputStream fis = new FileInputStream(this.joinPaths(path, "src/test/files/PublicKey.pem"));
+            this.proxy = new XSRPCProxy(
+                "localhost", 
+                10345,
+                fis,
+                "testhash", 
+                36, 
+                "0.0", 
+                this.callback);
+        }catch(FileNotFoundException ignored){
+            assertTrue("File not found", false);
+        }
+        this.proxy.connect();
+    }
+    /**
+     * Rigorous Test :-)
+     */
+    private String normalizePath(String path){
+        return this.normalizePath(path, "/");
+    }
+
+    private String normalizePath(String path, String usingSeparator){
+        String sep = System.getProperty("file.separator");
+        return path.replace(usingSeparator, sep);
+    }
+    /**  
+     * Join N paths togethers normalizing them with the system separators 
+    **/
+    private String joinPaths(String ...paths){
+        StringBuilder sb = new StringBuilder();
+        String sep = System.getProperty("file.separator");
+        for(String path : paths){
+            String rpath = normalizePath(path);
+            if (!rpath.endsWith(sep))
+                sb.append(sep);
+            sb.append(rpath);
+        }
+        return sb.toString();
+    }
+    
+    @Test
+    public void runAllTests(){
+        this.proxyDoesConnect();
+        this.testMainProtocol();
+        this.startRPCProxy();
+        this.testSendHash();
+        this.testSendData();
+        this.testExitCommand();
+        this.testMainProtocol();
+    }
+    
+    public void proxyDoesConnect()
+    {
+        assertTrue(this.proxy.isConnect());
+        assertTrue("Status Info is not OK", this.proxy.easyreum.getBuilder().isStatusInfoOk());
+    }
+    public void startRPCProxy(){
+        this.proxy.startCommand();
+        assertTrue("Status Info is not OK", this.proxy.easyreum.getBuilder().isStatusInfoOk());
+    }
+    public void testSendHash(){
+        assertTrue("Status Info is not OK", this.proxy.sendHashCommand("test"));
+    }
+    public void testSendData(){
+        assertTrue("Status Info is not OK", this.proxy.sendPayload("Hola mundo") == 0);
+    }
+    public void testExitCommand(){
+        this.proxy.exitCommand();
+        // No unit test for this as not confirmation is given
+    }
+    public void testMainProtocol(){
+        new Tfprotocol(this.proxy, new Callback()).echoCommand("hola mundo");
+        assertTrue("Status Info is not OK", this.proxy.easyreum.getHeader() >= 0);
+    }
+}