ucloud: Poll records while connecting in sync mode.

Signed-off-by: iabdalkader <[email protected]>

Author: iabdalkader

src/arduino_iot_cloud/ucloud.py

@@ -325,14 +325,26 @@ def mqtt_callback(self, topic, message):
     def ts_expired(self, record, ts):
         return (ts - record.last_run) > int(record.interval * 1000)
 
+    def poll_records(self):
+        ts = timestamp_ms()
+        try:
+            for record in self.records.values():
+                if record.runnable and self.ts_expired(record, ts):
+                    record.run_sync(self)
+                    record.last_run = ts
+        except Exception as e:
+            self.records.pop(record.name)
+            if log_level_enabled(logging.ERROR):
+                logging.error(f"task: {record.name} raised exception: {str(e)}.")
+
     def poll_connect(self, aiot=None):
         logging.info("Connecting to Arduino IoT cloud...")
         try:
             self.mqtt.connect()
         except Exception as e:
             if log_level_enabled(logging.WARNING):
                 logging.warning(f"Connection failed {e}, retrying...")
-            return False
+            return
 
         if self.thing_id is None:
             self.mqtt.subscribe(self.device_topic, qos=1)
@@ -341,10 +353,10 @@ def poll_connect(self, aiot=None):
 
         if self.async_mode:
             if self.thing_id is None:
-                self.register("discovery", on_run=self.poll_discovery, interval=0.100)
+                self.register("discovery", on_run=self.poll_discovery, interval=0.200)
             self.register("mqtt_task", on_run=self.poll_mqtt, interval=0.100)
             raise DoneException()
-        return True
+        self.connected = True
 
     def poll_discovery(self, aiot=None):
         self.mqtt.check_msg()
@@ -429,17 +441,29 @@ async def run(self, interval, backoff):
     def start(self, interval=1.0, backoff=1.2):
         if self.async_mode:
             asyncio.run(self.run(interval, backoff))
-        else:
-            # Synchronous mode.
-            while not self.poll_connect():
-                time.sleep(interval)
-                interval = min(interval * backoff, 5.0)
+            return
+
+        def poll_needed(ts, last_poll, interval):
+            return last_poll == 0 or (ts - last_poll) > interval
 
-            while self.thing_id is None:
+        last_conn_poll = 0
+        last_disc_poll = 0
+
+        while True:
+            ts = time.time()
+            if not self.connected and poll_needed(ts, last_conn_poll, interval):
+                self.poll_connect()
+                if last_conn_poll != 0:
+                    interval = min(interval * backoff, 5.0)
+                last_conn_poll = ts
+
+            if self.connected and self.thing_id is None and poll_needed(ts, last_disc_poll, 0.200):
                 self.poll_discovery()
-                time.sleep(0.100)
+                last_disc_poll = ts
 
-            self.connected = True
+            if self.connected and self.thing_id is not None:
+                break
+            self.poll_records()
 
     def update(self):
         if self.async_mode:
@@ -448,25 +472,14 @@ def update(self):
         if not self.connected:
             try:
                 self.start()
-                self.connected = True
             except Exception as e:
                 raise e
 
-        try:
-            ts = timestamp_ms()
-            for record in self.records.values():
-                if record.runnable and self.ts_expired(record, ts):
-                    record.run_sync(self)
-                    record.last_run = ts
-        except Exception as e:
-            self.records.pop(record.name)
-            if log_level_enabled(logging.ERROR):
-                logging.error(f"task: {record.name} raised exception: {str(e)}.")
+        self.poll_records()
 
         try:
             self.poll_mqtt()
         except Exception as e:
             self.connected = False
             if log_level_enabled(logging.WARNING):
                 logging.warning(f"Connection lost {e}")
-            raise e