mod: rem RpcResult.result timeout param. Setting timeout is only allowed at Bridge level

feat: Bridge notifies Router with a timeout event
feat: RpcResult.error field

Author: eigen-value

src/bridge.h

@@ -16,6 +16,7 @@
 
 #define RESET_METHOD "$/reset"
 #define BIND_METHOD "$/register"
+#define BRIDGE_TIMEOUT "$/bridgeTimeout"
 
 #define UPDATE_THREAD_STACK_SIZE    500
 #define UPDATE_THREAD_PRIORITY      5
@@ -30,25 +31,28 @@ void updateEntryPoint(void *, void *, void *);
 
 class RpcResult {
 
-    const int FALLBACK_TIMEOUT = 10;
-
 public:
-    RpcResult(uint32_t id, RPCClient* c, struct k_mutex* m, int timeout) : msg_id_wait(id), client(c), read_mutex(m), _timeout(timeout) {}
+    RpcError error;
 
-    template<typename RType> bool result(RType& result, int timeout = -1) {
-        if (_executed) return client->lastError.code == NO_ERR;
+    RpcResult(uint32_t id, RPCClient* c, struct k_mutex* rm, struct k_mutex* wm, unsigned long timeout) : msg_id_wait(id), client(c), read_mutex(rm), write_mutex(wm), _timeout(timeout) {}
 
-        if (timeout > 0) _timeout = timeout;
+    template<typename RType> bool result(RType& result) {
+        if (_executed) return error.code == NO_ERR;
 
-        int start = millis();
+        unsigned long start = millis();
         while(true) {
             if (_timeout > 0 && (millis() - start) > _timeout){
-                client->lastError.code = GENERIC_ERR;
-                client->lastError.traceback = "Timed out";
+                error.code = GENERIC_ERR;
+                error.traceback = "Timed out";
+                k_mutex_lock(write_mutex, K_FOREVER);
+                client->notify(BRIDGE_TIMEOUT);
+                k_mutex_unlock(write_mutex);
                 break;
             }
             if (k_mutex_lock(read_mutex, K_MSEC(10)) == 0 ) {
                 if (client->get_response(msg_id_wait, result)) {
+                    error.code = client->lastError.code;
+                    error.traceback = client->lastError.traceback;
                     k_mutex_unlock(read_mutex);
                     break;
                 }
@@ -59,20 +63,21 @@ class RpcResult {
             }
         }
         _executed = true;
-        return client->lastError.code == NO_ERR;
+        return error.code == NO_ERR;
     }
 
     operator bool() {
         MsgPack::object::nil_t nil;
-        return result(nil, FALLBACK_TIMEOUT);
+        return result(nil);
     }
 
 private:
     uint32_t msg_id_wait;
     RPCClient* client;
     bool _executed = false;
     struct k_mutex* read_mutex;
-    int _timeout = -1;
+    struct k_mutex* write_mutex;
+    unsigned long _timeout = -1;
 };
 
 class BridgeClass {
@@ -91,7 +96,7 @@ class BridgeClass {
 
     bool started = false;
 
-    int _timeout = -1;
+    unsigned long _timeout = -1;
 
 public:
 
@@ -199,7 +204,7 @@ class BridgeClass {
                 k_yield();
             }
        }
-       return RpcResult{msg_id_wait, client, &read_mutex, _timeout};
+       return RpcResult{msg_id_wait, client, &read_mutex, &write_mutex, _timeout};
     }