fix: decoder stuck on process_requests. mod: rem wrapper result prints, decoder send_call debug prints. python: serial_client can send notifications

Author: eigen-value

extras/examples/serial_client_example.py

@@ -11,4 +11,8 @@
 
 client.call("add", 1, 2, 3) # too many args
 
-client.call("greet")
+client.call("greet")
+
+client.notify("add", 5, 9)
+
+client.notify("greet")

extras/serial_client.py

@@ -23,3 +23,7 @@ def call(self, method, *args):
         unpacker = msgpack.Unpacker(BytesIO(data))
         for message in unpacker:
             print(message)
+
+    def notify(self, method, *args):
+        request = [NOTIFY, method, [*args]]
+        self.ser.write(msgpack.packb(request))

src/decoder.h

@@ -44,15 +44,6 @@ class RpcDecoder {
         MsgPack::arr_size_t arg_size(sizeof...(args));
         packer.serialize(arg_size, std::forward<Args>(args)...);
 
-#ifdef DEBUG
-        Serial.print("Sending: ");
-        for (size_t i=0; i<packer.size(); i++){
-            Serial.print(packer.data()[i], HEX);
-            Serial.print(" ");
-        }
-        Serial.println(" ");
-#endif
-
         if (send(reinterpret_cast<const uint8_t*>(packer.data()), packer.size()) == packer.size()){
             _msg_id++;
             return true;
@@ -134,28 +125,25 @@ class RpcDecoder {
             MsgPack::str_t method;
             MsgPack::arr_size_t req_size;
 
-            if (!unpacker.deserialize(req_size, msg_type)) break;
+            if (!unpacker.deserialize(req_size, msg_type)) continue;
             // todo HANDLE MALFORMED CLIENT REQ ERRORS
             if ((req_size.size() == REQUEST_SIZE) && (msg_type == CALL_MSG)){
-                if (!unpacker.deserialize(msg_id, method)) {
-                    discard_packet();
-                    break;
-                }
+                if (!unpacker.deserialize(msg_id, method)) continue;
+                if (unpacker.size() < REQUEST_SIZE + 1) continue;                       // there must be at least 5 indices
             } else if ((req_size.size() == NOTIFY_SIZE) && (msg_type == NOTIFY_MSG)) {
-                if (!unpacker.deserialize(method)) {
-                    discard_packet();
-                    break;
-                }
-            } else if ((req_size.size() == RESPONSE_SIZE) && (msg_type == RESP_MSG)) {   // this should never happen
+                if (!unpacker.deserialize(method)) continue;
+                if (unpacker.size() < NOTIFY_SIZE + 1) continue;                        // there must be at least 4 indices
+            } else if ((req_size.size() == RESPONSE_SIZE) && (msg_type == RESP_MSG)) {  // this should never happen but it's addressed to a client
                 break;
             } else {
                 discard_packet();
                 break;
             }
+            // Headers unpacked
 
             MsgPack::arr_size_t resp_size(RESPONSE_SIZE);
             packer.clear();
-            packer.serialize(resp_size, RESP_MSG, msg_id);
+            if (msg_type == CALL_MSG) packer.serialize(resp_size, RESP_MSG, msg_id);
             size_t headers_size = packer.size();
 
             if (!dispatcher.call(method, unpacker, packer)) {

src/wrapper.h

@@ -104,7 +104,6 @@ class RpcFunctionWrapper<R(Args...)>: public IFunctionWrapper {
             return true;
         } else {
             R out = invoke_with_tuple(_func, args, arx::stdx::make_index_sequence<sizeof...(Args)>{});
-            Serial.println(out);
             packer.serialize(nil, out);
             return true;
         }