ota updater

opencv-motion-detect/updater.py

@@ -117,22 +117,23 @@ class OTAClient:
         if not sn:
             logger.error("exiting since no sn config could be retrived")
             exit(1)
-        self.client = mqtt.Client(sn, userdata=self)  # , protocol=mqtt.MQTTv5)
+        
+        self.client = mqtt.Client('EVB-'+sn, userdata=self)  # , protocol=mqtt.MQTTv5)
         if self.username and self.password:
             self.client.username_pw_set(username=self.username, password=self.password)
         self.client.on_connect = self.on_connect
         self.client.on_message = self.on_message
-        th = threading.Thread()
         self.client.connect_async(self.host, self.port, 30)
         #self.client.loop_start()
         self.client.loop_forever()
 
     def download(self, url):
+        logger.info("downloading package {}".format(url))
         os.system('mkdir -p ' + DOWNLOAD_PATH)
         os.system('mkdir -p '+ EXTRACT_PATH)
         msg = ''
         try:
-            with requests.get(url, stream=True) as r:
+            with requests.get(url, stream=True, timeout=5) as r:
                 r.raise_for_status()
                 logger.info("download {} -> {}".format(url, DOWNLOAD_PATH))
                 with open(DOWNLOAD_PATH, 'wb') as f:
@@ -166,9 +167,13 @@ class OTAClient:
         rep['message'] = message
         rep['firmware'] = version
         rep['status'] = status
-
         try:
-            self.client.publish(REPLY_TOPIC, json.dumps(rep), 1)    
+            logger.info("reply with status {}".format(status))
+            mc = mqtt.Client('EVBRep-'+self.sn, userdata=self)  # , protocol=mqtt.MQTTv5)
+            if self.username and self.password:
+                mc.username_pw_set(username=self.username, password=self.password)
+            mc.connect_async(self.host, self.port, 10)
+            mc.publish(REPLY_TOPIC, json.dumps(rep), 1)
         except Exception as e:
             logger.info('exception in publish reply message: %s', e)
             extype, value, tb = sys.exc_info()
@@ -182,28 +187,25 @@ class OTAClient:
         url = req.get('url')
         batchId = req.get('batchId')
 
-        valid = True
         msg = 'OK'
         if not sku or sku != SKU:
             msg = "invalid sku {} in update request, expected {}. ignored".format(sku, SKU)
             logger.warn(msg);
-            valid = False
-        if not sn or sn != self.sn:
+        elif not sn or sn != self.sn:
             msg = "invalid sn {} in update request, expected {} ignored".format(sn, self.sn)
             logger.warn(msg);
-            valid = False
-        if not url or url[:7] != 'http://':
+        elif not url or url[:7] != 'http://':
             msg = "invalid url {} in update request, ignored".format(url)
             logger.warn(msg);
-            valid = False
-        if not batchId or not str(batchId).isnumeric:
+        elif not batchId or not str(batchId).isdigit():
             msg = "invalid batchId {} in update request, ignored".format(batchId)
             logger.warn(msg);
-            valid = False
-        if not self.version:
+        elif not self.version:
             logger.warn("no local version file, update initialized")
+        else:
+            pass
 
-        if not valid:
+        if msg != 'OK':
             self.reply(batchId, ver, 'refuse', msg)
             return
         # process on