Merge branch 'header-fetch-fix-2' into 'master'

Fix slow API calls and failing to connect to API

See merge request !10

.gitlab-ci.yml

@@ -21,7 +21,7 @@ build_tests:
 build_esp32_application:
   stage: build
   script:
-    - echo $WEBSERVER_ROOT_CERT | base64 -d -w 0 > main/doorcode_root_cert.cert
+    - mv main/doorcode_root_cert.cert.prod main/doorcode_root_cert.cert
     - cp main/include/config.h.example main/include/config.h
     - /opt/esp/entrypoint.sh bash
     - idf.py build

main/doorcode_root_cert.cert.local

------BEGIN CERTIFICATE-----
-MIIB6jCCAZECFDb5sh03iLzvv3lh9hGvPShVD+XxMAoGCCqGSM49BAMCMHcxCzAJ
-BgNVBAYTAlVTMRMwEQYDVQQIDApXYXNoaW5ndG9uMRYwFAYDVQQHDA1Db2xsZWdl
-IFBsYWNlMQwwCgYDVQQKDANXV1UxHTAbBgNVBAsMFGVsb2NrIFJPT1QgQ0EgSVNT
-VUVSMQ4wDAYDVQQDDAVlbG9jazAgFw0yMDA2MjcyMzIyNTFaGA8yMDcwMDYxNTIz
-MjI1MVowdzELMAkGA1UEBhMCVVMxEzARBgNVBAgMCldhc2hpbmd0b24xFjAUBgNV
-BAcMDUNvbGxlZ2UgUGxhY2UxDDAKBgNVBAoMA1dXVTEdMBsGA1UECwwUZWxvY2sg
-Uk9PVCBDQSBJU1NVRVIxDjAMBgNVBAMMBWVsb2NrMFkwEwYHKoZIzj0CAQYIKoZI
-zj0DAQcDQgAEAhPkFYRa4nWox26JCB8ClUg/PORZvkkzGMV4/yKZNWPSRtqS8QKD
-09dRt55MVj5W4AmRkRHwqbXTAvujt7eovzAKBggqhkjOPQQDAgNHADBEAiBjDRHN
-wmkwISOF2AE3cAgyMiUlXPA+WAZKHgbxKX1MUwIgdW47WeuGJ53939yX1vOiYDky
-GLh8/I3sv/uEnA0TIFI=
------END CERTIFICATE-----

main/doorcode_root_cert.cert.prod

+-----BEGIN CERTIFICATE-----
+MIIDlTCCAn0CFFXlCyRWA31vhnSPHOUNTDz3auCAMA0GCSqGSIb3DQEBCwUAMIGF
+MQswCQYDVQQGEwJVUzETMBEGA1UECAwKV2FzaGluZ3RvbjEWMBQGA1UEBwwNQ29s
+bGVnZSBQbGFjZTEMMAoGA1UECgwDV1dVMSQwIgYDVQQLDBsxOTIuMTY4LjAuMTMg
+Uk9PVCBDQSBJU1NVRVIxFTATBgNVBAMMDDE5Mi4xNjguMC4xMzAgFw0yMDEwMDgw
+NjU4MjNaGA8yMDcwMDkyNjA2NTgyM1owgYUxCzAJBgNVBAYTAlVTMRMwEQYDVQQI
+DApXYXNoaW5ndG9uMRYwFAYDVQQHDA1Db2xsZWdlIFBsYWNlMQwwCgYDVQQKDANX
+V1UxJDAiBgNVBAsMGzE5Mi4xNjguMC4xMyBST09UIENBIElTU1VFUjEVMBMGA1UE
+AwwMMTkyLjE2OC4wLjEzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+t55SyIy/1C+rwolf2mqaJzBaVTaLMWk0NjVImfsJOdKIHYE1hpJUe1UNNbQYeRPr
+QElf3BletQl1B3PEaJwBbg6AzPWwVD+DDS0CqmD6URmq20M1bWYEYgJMrwpqpY33
+wm0BJsTd62+emhIhGoym5DZJ59g7+jnoHsxchXNsGOi6qddxtnm5sr4ezZvFOoc+
+ALsElo6YE8OuumQ3jSsWTESFJxRsWvZ2ppcIJRHdAAwdhyUCokyVJdzyk3L/Dk9l
+LZye64OhV1BYB0I2rVp2iBPZ/gxSliL0Tiut8XkIsMNN7JJNA4AFL8nwo52v9eli
+usV2Ma3x6xLj+KiNh7KZ7wIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBeJv5EWaVL
+4ZEVDx+yNAZ/PqWzpi6B8XRoGBpAsk83mJ429NmfAD5G74rmDwPZ9FHWCWHK6Cpy
+3MO75nepmk6qVYccuEW1bs/itO8NbADeJRIqzpVDP8F0dWefmUGo5bV2oAVhLdLI
+QfPXMNyHyaQUp8gFh1xzCXyPU5jrmcFLw8L29aRlOfGYdmKq/tYbULjdYtysrigl
+IZFQrM+oXpKEDKq+Fqax27O9RrgmIIrxpAU0/KxASbKgpCkW+T2UZTjOjms8NpdO
+EH7zjGq59lewpAyG5trG/OAVzmi4sIKiRwXQwdHjcGXwjio+isDbu0s2HI5nCZSh
+MlKGC4g2E4bP
+-----END CERTIFICATE-----

main/include/config.h.example

@@ -48,8 +48,10 @@
 
 #define MIN_CODE_LENGTH 4
 
-// 15 minutes
-#define STATUS_MAX_NO_CONTACT_TIME_MS (1000 * 60 * 15)
+// Set to 1 minute instead of something like 15 minutes to keep the SSL connection alive
+// so it can be reused as much as possible, as it takes around 2 seconds with RSA 2048 keys
+// and a whopping 5 seconds with ECDSA keys :(
+#define STATUS_MAX_NO_CONTACT_TIME_MS (1000 * 60)
 
 // How often to update the keypad state
 #define KEYPAD_SCAN_PERIOD_MS 50

main/src/connectors/esp32/esp_http.c

@@ -166,16 +166,22 @@ int door_http_get(door_http_client_handle_t client, const char* path, door_http_
 	esp_http_client_set_url(handle, path);
 	esp_http_client_set_method(handle, HTTP_METHOD_GET);
 
+	// Bug in the framework, have to retry until it works
+	// https://github.com/espressif/esp-idf/issues/2684
+	for (int tries = 0; tries < 3; ++tries) {
 		esp_err_t err = esp_http_client_perform(handle);
-	if (err != ESP_OK)
-	{
-		ESP_LOGE(TAG, "Error perform http request %s", esp_err_to_name(err));
-		return DOOR_HTTP_ERR_FAIL;
-	}
 
+		if (err == ESP_OK)
+		{
 			int status_code = esp_http_client_get_status_code(handle);
 			ESP_LOGI(TAG, "Status code from GET call: %d", status_code);
 			return status_code;
+		}
+
+		ESP_LOGE(TAG, "Error perform http request %s. Retrying...", esp_err_to_name(err));
+		esp_http_client_close(handle);
+	}
+	return DOOR_HTTP_ERR_FAIL;
 }
 
 int door_http_post(
@@ -197,15 +203,23 @@ int door_http_post(
 	esp_http_client_set_url(handle, path);
 	esp_http_client_set_method(handle, HTTP_METHOD_POST);
 	esp_http_client_set_post_field(client, data, strlen(data));
+
+	// Bug in the framework, have to retry until it works
+	// https://github.com/espressif/esp-idf/issues/2684
+	for (int tries = 0; tries < 3; ++tries) {
 		esp_err_t err = esp_http_client_perform(handle);
-	if (err != ESP_OK)
+
+		if (err == ESP_OK)
 		{
-		ESP_LOGE(TAG, "Error perform http request %s", esp_err_to_name(err));
-		return DOOR_HTTP_ERR_FAIL;
-	}
 			int status_code = esp_http_client_get_status_code(handle);
 			ESP_LOGI(TAG, "Status code from POST call: %d", status_code);
 			return status_code;
+		}
+
+		ESP_LOGE(TAG, "Error perform http request %s. Retrying...", esp_err_to_name(err));
+		esp_http_client_close(handle);
+	}
+	return DOOR_HTTP_ERR_FAIL;
 }
 
 static esp_err_t door_http_ota_update_validate_image_header(esp_app_desc_t* new_app_info)

version.txt

-1.0.2.1
\ No newline at end of file
+1.0.3.0
\ No newline at end of file