From 32ba7dc0d7abb4cbeceea37bb111ec95b30db3d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= <ondra@ondrovo.com>
Date: Sun, 6 Aug 2017 19:07:43 +0200
Subject: [PATCH] fixed a lot of bugs with wifi connecting

---
 Makefile                          |  2 +-
 html_orig/lang/en.php             | 14 ++++++-
 html_orig/pages/cfg_wifi_conn.php | 70 +++++++++++++++++++++++--------
 user/cgi_wifi.c                   | 46 +++++++++++++++++---
 4 files changed, 106 insertions(+), 26 deletions(-)

diff --git a/Makefile b/Makefile
index 71f6ada..0b351b6 100644
--- a/Makefile
+++ b/Makefile
@@ -65,7 +65,7 @@ LIBS += esphttpd
 # compiler flags using during compilation of source files
 CFLAGS		= -Os -ggdb -std=gnu99 -Werror -Wpointer-arith -Wundef -Wall -Wl,-EL -fno-inline-functions \
 		-nostdlib -mlongcalls -mtext-section-literals  -D__ets__ -DICACHE_FLASH \
-		-Wno-address -Wno-unused -DHTTPD_MAX_BACKLOG_SIZE=4096 -DADMIN_PASSWORD=$(ADMIN_PASSWORD) \
+		-Wno-address -Wno-unused -DHTTPD_MAX_BACKLOG_SIZE=8192 -DADMIN_PASSWORD=$(ADMIN_PASSWORD) \
 		-DGIT_HASH='"$(shell git rev-parse --short HEAD)"'
 
 # linker flags used to generate the main object file
diff --git a/html_orig/lang/en.php b/html_orig/lang/en.php
index 0368606..9049101 100644
--- a/html_orig/lang/en.php
+++ b/html_orig/lang/en.php
@@ -105,10 +105,20 @@ return [
 
 	'wifi.conn.status' => 'Status:',
 	'wifi.conn.back_to_config' => 'Back to WiFi config',
-	'wifi.conn.telemetry_lost' => 'Telemetry lost, something went wrong. Try again...',
+	'wifi.conn.telemetry_lost' => 'Telemetry lost; something went wrong, or your device disconnected.',
+	'wifi.conn.explain_android_sucks' => '
+		If you\'re configuring ESPTerm via a smartphone, or were connected
+		from another external network, your device may lose connection and this 
+		progress indicator won\'t work. Please wait a while (~ 15 seconds), 
+		then check if the connection succeeded.',
+
+	'wifi.conn.explain_reset' => '
+		To force enable the built-in AP, hold the BOOT 
+		button until the blue LED starts flashing. Hold the button longer (until the LED 
+		flashes rapidly) for a "factory reset".',
 
 	'wifi.conn.disabled' =>"Station mode is disabled.",
-	'wifi.conn.idle' =>"Idle, not connected and with no IP.",
+	'wifi.conn.idle' =>"Idle, not connected and has no IP.",
 	'wifi.conn.success' => "Connected! Received IP ",
 	'wifi.conn.working' => "Connecting to selected AP",
 	'wifi.conn.fail' => "Connection failed, check settings & try again. Cause: ",
diff --git a/html_orig/pages/cfg_wifi_conn.php b/html_orig/pages/cfg_wifi_conn.php
index 33c8b64..6474b4a 100755
--- a/html_orig/pages/cfg_wifi_conn.php
+++ b/html_orig/pages/cfg_wifi_conn.php
@@ -5,9 +5,15 @@
 	<a href="<?= e(url('cfg_wifi')) ?>" id="backbtn" class="button"><?= tr('wifi.conn.back_to_config') ?></a>
 </div>
 
+<div class="Box">
+	<p><?= tr('wifi.conn.explain_android_sucks') ?></p>
+	<p><?= tr('wifi.conn.explain_reset') ?></p>
+</div>
+
 <script>
 	var xhr = new XMLHttpRequest();
 	var abortTmeo;
+	var failCounter = 0;
 
 	var messages = <?= json_encode([
 		'disabled' => tr('wifi.conn.disabled'),
@@ -17,33 +23,63 @@
 		'fail' => tr('wifi.conn.fail'),
 	]) ?>;
 
+	function onFail() {
+		$("#status").html(<?= json_encode(tr('wifi.conn.telemetry_lost')) ?>);
+		$('.anim-dots').addClass('hidden');
+	}
+
 	function getStatus() {
 		xhr.open("GET", 'http://'+_root+'<?= url('wifi_connstatus', true) ?>');
 		xhr.onreadystatechange = function () {
-			if (xhr.readyState == 4 && xhr.status >= 200 && xhr.status < 300) {
-				clearTimeout(abortTmeo);
-				var data = JSON.parse(xhr.responseText);
-				var done = false;
-				var msg = messages[data.status] || '...';
-				if (data.status == 'success') msg += data.ip;
-				if (data.status == 'fail') msg += data.cause;
-
-				$("#status").html(msg);
-
-				if (done) {
-//					$('#backbtn').removeClass('hidden');
-					$('.anim-dots').addClass('hidden');
+			if (xhr.readyState == 4) {
+				if (xhr.status == 200) {
+					clearTimeout(abortTmeo);
+
+					try {
+						var data = JSON.parse(xhr.responseText);
+						var done = false;
+						var msg = messages[data.status] || '...';
+
+						if (data.status == 'success') {
+							msg += data.ip;
+							done = true;
+						}
+
+						if (data.status == 'fail') {
+							msg += data.cause;
+							done = true;
+						}
+
+						$("#status").html(msg);
+
+						if (done) {
+//					        $('#backbtn').removeClass('hidden');
+							$('.anim-dots').addClass('hidden');
+						} else {
+							// ask again after a short delay
+							window.setTimeout(getStatus, 1000);
+						}
+					} catch(e) {
+						failCounter++;
+						console.log(e);
+						// repeat
+						if (failCounter > 5) {
+							onFail();
+						}
+						else {
+							window.setTimeout(getStatus, 1000);
+						}
+					}
 				} else {
-					window.setTimeout(getStatus, 1000);
+					onFail();
 				}
 			}
 		};
 
+		// XHR timeout
 		abortTmeo = setTimeout(function () {
 			xhr.abort();
-			$("#status").html(<?= json_encode(tr('wifi.conn.telemetry_lost')) ?>);
-//			$('#backbtn').removeClass('hidden');
-			$('.anim-dots').addClass('hidden');
+			onFail();
 		}, 4000);
 
 		xhr.send();
diff --git a/user/cgi_wifi.c b/user/cgi_wifi.c
index 67fb0c6..82f9971 100644
--- a/user/cgi_wifi.c
+++ b/user/cgi_wifi.c
@@ -193,6 +193,11 @@ httpd_cgi_state ICACHE_FLASH_ATTR cgiWiFiScan(HttpdConnData *connData)
 	int len;
 	char buff[256];
 
+	if (connData->conn == NULL) {
+		//Connection aborted. Clean up.
+		return HTTPD_CGI_DONE;
+	}
+
 	// auto-turn on STA
 	if ((wificonf->opmode & STATION_MODE) == 0) {
 		wificonf->opmode |= STATION_MODE;
@@ -265,6 +270,13 @@ httpd_cgi_state ICACHE_FLASH_ATTR cgiWiFiConnStatus(HttpdConnData *connData)
 	char buff[100];
 	struct ip_info info;
 
+	buff[0] = 0; // avoid unitialized read
+
+	if (connData->conn == NULL) {
+		//Connection aborted. Clean up.
+		return HTTPD_CGI_DONE;
+	}
+
 	httpdStartResponse(connData, 200);
 	httpdHeader(connData, "Content-Type", "application/json");
 	httpdEndHeaders(connData);
@@ -276,6 +288,7 @@ httpd_cgi_state ICACHE_FLASH_ATTR cgiWiFiConnStatus(HttpdConnData *connData)
 	}
 
 	STATION_STATUS st = wifi_station_get_connect_status();
+	dbg("CONN STATE = %d", st);
 	switch(st) {
 		case STATION_IDLE:
 			sprintf(buff, "{\"status\": \"idle\"}"); // unclear when this is used
@@ -301,9 +314,14 @@ httpd_cgi_state ICACHE_FLASH_ATTR cgiWiFiConnStatus(HttpdConnData *connData)
 			wifi_get_ip_info(STATION_IF, &info);
 			sprintf(buff, "{\"status\": \"success\", \"ip\": \""IPSTR"\"}", GOOD_IP2STR(info.ip.addr));
 			break;
+
+		default:
+			sprintf(buff, "{\"status\": \"working\", \"wtf\": \"state = %d\"}", st);
+			break;
+
 	}
 
-	tplSend(connData, buff, -1);
+	httpdSend(connData, buff, -1);
 	return HTTPD_CGI_DONE;
 }
 
@@ -336,6 +354,9 @@ httpd_cgi_state ICACHE_FLASH_ATTR cgiWiFiSetParams(HttpdConnData *connData)
 		return HTTPD_CGI_DONE;
 	}
 
+	bool sta_turned_on = false;
+	bool sta_ssid_pw_changed = false;
+
 	// ---- WiFi opmode ----
 
 	if (GET_ARG("opmode")) {
@@ -366,6 +387,7 @@ httpd_cgi_state ICACHE_FLASH_ATTR cgiWiFiSetParams(HttpdConnData *connData)
 
 		if (enable) {
 			wificonf->opmode |= STATION_MODE;
+			sta_turned_on = true;
 		} else {
 			wificonf->opmode &= ~STATION_MODE;
 		}
@@ -463,6 +485,7 @@ httpd_cgi_state ICACHE_FLASH_ATTR cgiWiFiSetParams(HttpdConnData *connData)
 			info("Setting station SSID to: \"%s\"", buff);
 			strncpy_safe(wificonf->sta_ssid, buff, SSID_LEN);
 			wifi_change_flags.sta = true;
+			sta_ssid_pw_changed = true;
 		}
 	}
 
@@ -474,12 +497,13 @@ httpd_cgi_state ICACHE_FLASH_ATTR cgiWiFiSetParams(HttpdConnData *connData)
 			info("Setting station password to: \"%s\"", buff);
 			strncpy_safe(wificonf->sta_password, buff, PASSWORD_LEN);
 			wifi_change_flags.sta = true;
+			sta_ssid_pw_changed = true;
 		}
 	}
 
 	if (redir_url_buf[strlen(SET_REDIR_ERR)] == 0) {
 		// All was OK
-		info("Set WiFi params - success, applying in 1000 ms");
+		info("Set WiFi params - success, applying in 2000 ms");
 
 		// Settings are applied only if all was OK
 		//
@@ -492,9 +516,19 @@ httpd_cgi_state ICACHE_FLASH_ATTR cgiWiFiSetParams(HttpdConnData *connData)
 		// If user connects via the Station IF, they may not even notice the connection reset.
 		os_timer_disarm(&timer);
 		os_timer_setfn(&timer, applyWifiSettingsLaterCb, NULL);
-		os_timer_arm(&timer, 1000, false);
+		os_timer_arm(&timer, 2000, false);
+
+		if ((sta_ssid_pw_changed || sta_turned_on)
+			&& wificonf->opmode != SOFTAP_MODE
+			&& wificonf->sta_ssid[0] != 0) {
+			// User wants to connect
 
-		httpdRedirect(connData, SET_REDIR_SUC);
+			info("User wants to connect to SSID, redirecting to ConnStatus page.");
+			httpdRedirect(connData, "/cfg/wifi/connecting");
+		}
+		else {
+			httpdRedirect(connData, SET_REDIR_SUC);
+		}
 	} else {
 		warn("Some WiFi settings did not validate, asking for correction");
 		// Some errors, appended to the URL as ?err=
@@ -558,7 +592,7 @@ httpd_cgi_state ICACHE_FLASH_ATTR tplWlan(HttpdConnData *connData, char *token,
 		// For display of our current SSID
 		connectStatus = wifi_station_get_connect_status();
 		x = wifi_get_opmode();
-		if (x == SOFTAP_MODE || connectStatus != STATION_GOT_IP) {
+		if (x == SOFTAP_MODE || connectStatus != STATION_GOT_IP || wificonf->opmode == SOFTAP_MODE) {
 			strcpy(buff, "");
 		}
 		else {
@@ -571,7 +605,7 @@ httpd_cgi_state ICACHE_FLASH_ATTR tplWlan(HttpdConnData *connData, char *token,
 		x = wifi_get_opmode();
 		connectStatus = wifi_station_get_connect_status();
 
-		if (x == SOFTAP_MODE || connectStatus != STATION_GOT_IP) {
+		if (x == SOFTAP_MODE || connectStatus != STATION_GOT_IP || wificonf->opmode == SOFTAP_MODE) {
 			strcpy(buff, "");
 		}
 		else {