revert: rem client/server Stream based constructors. examples: refactoring alignment

Author: eigen-value

examples/decoder_tests/decoder_tests.ino

@@ -29,12 +29,9 @@ void runDecoderTest(const char* label) {
     delay(50);
   }
 
-  while (decoder.packet_incoming()) {
-    size_t removed = decoder.discard_packet();
-    Serial.print("Removed bytes: ");
-    Serial.println(removed);
-    decoder.decode();
-  }
+  size_t pack_size = decoder.get_packet_size();
+  Serial.print("1st Packet size: ");
+  Serial.println(pack_size);
 
   Serial.println("-- Done --\n");
 }

examples/rpc_lite_client/rpc_lite_client.ino

@@ -1,14 +1,16 @@
 #include <Arduino_RPClite.h>
 
-RPCClient client(Serial1);
+SerialTransport transport(Serial1);
+RPCClient client(transport);
 
 void setup() {
     Serial1.begin(115200);
     while(!Serial1);
 
     pinMode(LED_BUILTIN, OUTPUT);
-    
-    Serial.begin(9600);
+    delay(10);
+
+    Serial.begin(115200);
     while(!Serial);
 }
 
@@ -30,7 +32,7 @@ void blink_before(){
 void loop() {
     float result;
     blink_before();
-    
+
     String str_res;
     bool ok = client.call("loopback", str_res, "Sending a greeting");
     Serial.println(str_res);
@@ -75,5 +77,4 @@ void loop() {
         Serial.println("Server could not handle a notification as a call");
     }
 
-    delay(2000);
 }

examples/rpc_lite_server/rpc_lite_server.ino

@@ -1,11 +1,16 @@
 #include <Arduino_RPClite.h>
 
-RPCServer server(Serial1);
+SerialTransport transport(Serial1);
+RPCServer server(transport);
 
 int add(int a, int b){
     return a+b;
 }
 
+int add2(int a, int b){
+    return a+b;
+}
+
 String greet(){
     return String("Hello Friend");
 }
@@ -24,6 +29,10 @@ public:
 };
 
 
+float multip(float a, float b) {
+    return a*b;
+}
+
 void setup() {
     Serial1.begin(115200);
     while(!Serial1);
@@ -34,10 +43,16 @@ void setup() {
     while(!Serial);
 
     server.bind("add", add);
+
+    if (!server.bind("add", add2)){
+        Serial.println("server refused to bind same name twice");
+    }
+
     server.bind("greet", greet);
     server.bind("loopback", loopback);
     server.bind("another_greeting", [] {return MsgPack::str_t ("This is a lambda greeting");});
     server.bind("object_multi", &multiplier::mult);
+    server.bind("multip", multip);
 
 }
 

src/client.h

@@ -14,11 +14,11 @@ class RPCClient {
 
     RPCClient(ITransport& t) : decoder(&RpcDecoderManager<>::getDecoder(t)) {}
 
-    // TODO This is problematic becasue 'new' makes different Transport objs and different transports make different decoders
-    RPCClient(Stream& stream) {
-        ITransport* transport = (ITransport*) new SerialTransport(stream);
-        decoder = &RpcDecoderManager<>::getDecoder(*transport);
-    }
+    // This constructor was removed because it leads to decoder duplication
+    // RPCClient(Stream& stream) {
+    //     ITransport* transport = (ITransport*) new SerialTransport(stream);
+    //     decoder = &RpcDecoderManager<>::getDecoder(*transport);
+    // }
 
     template<typename... Args>
     void notify(const MsgPack::str_t method, Args&&... args)  {

src/server.h

@@ -16,11 +16,11 @@ class RPCServer {
 public:
     RPCServer(ITransport& t) : decoder(&RpcDecoderManager<>::getDecoder(t)) {}
 
-    // TODO This is problematic becasue 'new' makes different Transport objs and different transports make different decoders
-    RPCServer(Stream& stream) {
-        ITransport* transport = (ITransport*) new SerialTransport(stream);
-        decoder = &RpcDecoderManager<>::getDecoder(*transport);
-    }
+    // This constructor was removed because it leads to decoder duplication
+    // RPCServer(Stream& stream) {
+    //     ITransport* transport = (ITransport*) new SerialTransport(stream);
+    //     decoder = &RpcDecoderManager<>::getDecoder(*transport);
+    // }
 
     template<typename F>
     bool bind(const MsgPack::str_t& name, F&& func){

src/transport.h

@@ -1,8 +1,6 @@
 #ifndef RPCLITE_TRANSPORT_H
 #define RPCLITE_TRANSPORT_H
 
-#include <Arduino.h>
-
 class ITransport {
 // Transport abstraction interface