[OTA] Add UserSelectable timeout for invitation to device + check for OK result in the last few messages (#1445)

tools/espota.py

@@ -106,7 +106,7 @@ def serve(remoteAddr, localAddr, remotePort, localPort, password, filename, comm
       sock2.close()
       logging.error('Host %s Not Found', remoteAddr)
       return 1
-    sock2.settimeout(1)
+    sock2.settimeout(TIMEOUT)
     try:
       data = sock2.recv(37).decode()
       break;
@@ -162,7 +162,6 @@ def serve(remoteAddr, localAddr, remotePort, localPort, password, filename, comm
     logging.error('No response from device')
     sock.close()
     return 1
-
   try:
     f = open(filename, "rb")
     if (PROGRESS):
@@ -191,18 +190,26 @@ def serve(remoteAddr, localAddr, remotePort, localPort, password, filename, comm
     sys.stderr.write('\n')
     logging.info('Waiting for result...')
     try:
-      connection.settimeout(60)
+      count = 0
-      data = connection.recv(32).decode()
+      while True:
-      logging.info('Result: %s' ,data)
+        count=count+1
-      connection.close()
+        connection.settimeout(60)
-      f.close()
+        data = connection.recv(32).decode()
-      sock.close()
+        logging.info('Result: %s' ,data)
-      if (data != "OK"):
+
-        sys.stderr.write('\n')
+        if data == "OK":
-        logging.error('%s', data)
+          logging.info('Success')
-        return 1;
+          connection.close()
-      return 0
+          f.close()
-    except:
+          sock.close()
+          return 0;
+        if count == 5:
+          logging.error('Error response from device')
+          connection.close()
+          f.close()
+          sock.close()
+          return 1
+    except e:
       logging.error('No Result!')
       connection.close()
       f.close()
@@ -292,6 +299,12 @@ def parser(unparsed_args):
     action = "store_true",
     default = False
   )
+  group.add_option("-t", "--timeout",
+    dest = "timeout",
+    type = "int",
+    help = "Timeout to wait for the ESP8266 to accept invitation",
+    default = 10
+  )
   parser.add_option_group(group)
 
   (options, args) = parser.parse_args(unparsed_args)
@@ -312,6 +325,10 @@ def main(args):
   # check options
   global PROGRESS
   PROGRESS = options.progress
+
+  global TIMEOUT
+  TIMEOUT = options.timeout
+  
   if (not options.esp_ip or not options.image):
     logging.critical("Not enough arguments.")
     return 1