Initial ESP32 compatibility

Author: me-no-dev

component.mk

@@ -0,0 +1,3 @@
+COMPONENT_ADD_INCLUDEDIRS := src
+COMPONENT_SRCDIRS := src
+CXXFLAGS += -fno-rtti

src/AsyncEventSource.h

@@ -21,7 +21,11 @@
 #define ASYNCEVENTSOURCE_H_
 
 #include <Arduino.h>
+#ifdef ESP32
+#include <AsyncTCP.h>
+#else
 #include <ESPAsyncTCP.h>
+#endif
 #include <ESPAsyncWebServer.h>
 
 class AsyncEventSource;

src/AsyncWebSocket.cpp

@@ -672,6 +672,7 @@ size_t AsyncWebSocketClient::printf(const char *format, ...) {
   return len;
 }
 
+#ifndef ESP32
 size_t AsyncWebSocketClient::printf_P(PGM_P formatP, ...) {
   va_list arg;
   va_start(arg, formatP);
@@ -700,6 +701,7 @@ size_t AsyncWebSocketClient::printf_P(PGM_P formatP, ...) {
   delete[] temp;
   return len;
 }
+#endif
 
 void AsyncWebSocketClient::text(const char * message, size_t len){
   _queueMessage(new AsyncWebSocketBasicMessage(message, len));
@@ -955,6 +957,7 @@ size_t AsyncWebSocket::printfAll(const char *format, ...) {
   return len;
 }
 
+#ifndef ESP32
 size_t AsyncWebSocket::printf_P(uint32_t id, PGM_P formatP, ...){
   AsyncWebSocketClient * c = client(id);
   if(c != NULL){
@@ -966,6 +969,7 @@ size_t AsyncWebSocket::printf_P(uint32_t id, PGM_P formatP, ...){
   }
   return 0;
 }
+#endif
 
 size_t AsyncWebSocket::printfAll_P(PGM_P formatP, ...) {
   va_list arg;
@@ -1160,7 +1164,7 @@ AsyncWebSocketResponse::AsyncWebSocketResponse(const String& key, AsyncWebSocket
 #ifdef ESP8266
   sha1(key + WS_STR_UUID, hash);
 #else
-  key += WS_STR_UUID;
+  (String&)key += WS_STR_UUID;
   SHA1_CTX ctx;
   SHA1Init(&ctx);
   SHA1Update(&ctx, (const unsigned char*)key.c_str(), key.length());

src/AsyncWebSocket.h

@@ -22,7 +22,11 @@
 #define ASYNCWEBSOCKET_H_
 
 #include <Arduino.h>
+#ifdef ESP32
+#include <AsyncTCP.h>
+#else
 #include <ESPAsyncTCP.h>
+#endif
 #include <ESPAsyncWebServer.h>
 
 class AsyncWebSocket;
@@ -168,8 +172,9 @@ class AsyncWebSocketClient {
     void message(AsyncWebSocketMessage *message){ _queueMessage(message); }
 
     size_t printf(const char *format, ...)  __attribute__ ((format (printf, 2, 3)));
+#ifndef ESP32
     size_t printf_P(PGM_P formatP, ...)  __attribute__ ((format (printf, 2, 3)));
-
+#endif
     void text(const char * message, size_t len);
     void text(const char * message);
     void text(uint8_t * message, size_t len);
@@ -257,7 +262,9 @@ class AsyncWebSocket: public AsyncWebHandler {
 
     size_t printf(uint32_t id, const char *format, ...)  __attribute__ ((format (printf, 3, 4)));
     size_t printfAll(const char *format, ...)  __attribute__ ((format (printf, 2, 3)));
+#ifndef ESP32
     size_t printf_P(uint32_t id, PGM_P formatP, ...)  __attribute__ ((format (printf, 3, 4)));
+#endif
     size_t printfAll_P(PGM_P formatP, ...)  __attribute__ ((format (printf, 2, 3)));
 
     //event listener

src/ESPAsyncWebServer.h

@@ -24,22 +24,23 @@
 #include "Arduino.h"
 
 #include <functional>
-#include <ESPAsyncTCP.h>
 #include "FS.h"
 
 #include "StringArray.h"
 
-#if defined(ESP31B)
-#include <ESP31BWiFi.h>
+#ifdef ESP32
+#include <WiFi.h>
+#include <AsyncTCP.h>
+#include "SPIFFS.h"
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
+#include <ESPAsyncTCP.h>
 #else
 #error Platform not supported
 #endif
 
 #define DEBUGF(...) //Serial.printf(__VA_ARGS__)
 
-
 class AsyncWebServer;
 class AsyncWebServerRequest;
 class AsyncWebServerResponse;

src/SPIFFSEditor.cpp

@@ -20,7 +20,12 @@
 */
 #include "WebAuthentication.h"
 #include <libb64/cencode.h>
+#ifdef ESP32
+#include "mbedtls/md5.h"
+#else
 #include "md5.h"
+#endif
+
 
 // Basic Auth hash = base64("username:password")
 
@@ -54,15 +59,26 @@ bool checkBasicAuthentication(const char * hash, const char * username, const ch
 }
 
 static bool getMD5(uint8_t * data, uint16_t len, char * output){//33 bytes or more
-  md5_context_t _ctx;
+#ifdef ESP32
+    mbedtls_md5_context _ctx;
+#else
+    md5_context_t _ctx;
+#endif
   uint8_t i;
   uint8_t * _buf = (uint8_t*)malloc(16);
   if(_buf == NULL)
     return false;
   memset(_buf, 0x00, 16);
+#ifdef ESP32
+  mbedtls_md5_init(&_ctx);
+  mbedtls_md5_starts(&_ctx);
+  mbedtls_md5_update(&_ctx, data, len);
+  mbedtls_md5_finish(&_ctx, _buf);
+#else
   MD5Init(&_ctx);
   MD5Update(&_ctx, data, len);
   MD5Final(_buf, &_ctx);
+#endif
   for(i = 0; i < 16; i++) {
     sprintf(output + (i * 2), "%02x", _buf[i]);
   }

src/WebAuthentication.cpp

@@ -128,6 +128,12 @@ bool AsyncStaticWebHandler::_getFile(AsyncWebServerRequest *request)
   return _fileExists(request, path);
 }
 
+#ifdef ESP32
+#define FILE_IS_REAL(f) (f == true && !f.isDirectory())
+#else
+#define FILE_IS_REAL(f) (f == true)
+#endif
+
 bool AsyncStaticWebHandler::_fileExists(AsyncWebServerRequest *request, const String& path)
 {
   bool fileFound = false;
@@ -137,17 +143,17 @@ bool AsyncStaticWebHandler::_fileExists(AsyncWebServerRequest *request, const St
 
   if (_gzipFirst) {
     request->_tempFile = _fs.open(gzip, "r");
-    gzipFound = request->_tempFile == true;
+    gzipFound = FILE_IS_REAL(request->_tempFile);
     if (!gzipFound){
       request->_tempFile = _fs.open(path, "r");
-      fileFound = request->_tempFile == true;
+      fileFound = FILE_IS_REAL(request->_tempFile);
     }
   } else {
     request->_tempFile = _fs.open(path, "r");
-    fileFound = request->_tempFile == true;
+    fileFound = FILE_IS_REAL(request->_tempFile);
     if (!fileFound){
       request->_tempFile = _fs.open(gzip, "r");
-      gzipFound = request->_tempFile == true;
+      gzipFound = FILE_IS_REAL(request->_tempFile);
     }
   }
 

src/WebHandlers.cpp

@@ -202,7 +202,7 @@ void AsyncWebServerRequest::_onError(int8_t error){
 }
 
 void AsyncWebServerRequest::_onTimeout(uint32_t time){
-  os_printf("TIMEOUT: %u, state: %s\n", time, _client->stateToString());
+  //os_printf("TIMEOUT: %u, state: %s\n", time, _client->stateToString());
   _client->close();
 }
 
@@ -505,7 +505,7 @@ void AsyncWebServerRequest::_parseMultipartPostByte(uint8_t data, bool last){
     }
   } else if(_multiParseState == DASH3_OR_RETURN2){
     if(data == '-' && (_contentLength - _parsedLength - 4) != 0){
-      os_printf("ERROR: The parser got to the end of the POST but is expecting %u bytes more!\nDrop an issue so we can have more info on the matter!\n", _contentLength - _parsedLength - 4);
+      //os_printf("ERROR: The parser got to the end of the POST but is expecting %u bytes more!\nDrop an issue so we can have more info on the matter!\n", _contentLength - _parsedLength - 4);
       _contentLength = _parsedLength + 4;//lets close the request gracefully
     }
     if(data == '\r'){

src/WebRequest.cpp

@@ -222,21 +222,29 @@
 
 function createFileUploader(element, tree, editor){
   var xmlHttp;
+  
+  var refresh = ce("button");
+  refresh.innerHTML = 'Refresh List';
+  ge(element).appendChild(refresh);
+
   var input = ce("input");
   input.type = "file";
   input.multiple = false;
   input.name = "data";
   input.id="upload-select";
   ge(element).appendChild(input);
+  
   var path = ce("input");
   path.id = "upload-path";
   path.type = "text";
   path.name = "path";
   path.defaultValue = "/";
   ge(element).appendChild(path);
+  
   var button = ce("button");
   button.innerHTML = 'Upload';
   ge(element).appendChild(button);
+  
   var mkfile = ce("button");
   mkfile.innerHTML = 'Create';
   ge(element).appendChild(mkfile);
@@ -274,6 +282,10 @@
     editor.execCommand('saveCommand');
   };
 
+  refresh.onclick = function(e){
+    tree.refreshPath(path.value);
+  };
+  
   button.onclick = function(e){
     if(input.files.length === 0){
       return;
@@ -294,7 +306,7 @@
     if(typeof name !== undefined){
       filename = name;
     }
-    path.value = "/"+filename;
+    path.value = "/"+filename+"."+ext;
   };
 }
 
@@ -594,11 +606,11 @@
   editor.loadUrl(vars.file);
 };
 </script>
-<script id='ace' src="/ace.js" type="text/javascript" charset="utf-8"></script>
+<script id='ace' src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.6/ace.js" type="text/javascript" charset="utf-8"></script>
 <script>
   if  (typeof ace.edit == "undefined") {
     var script = document.createElement('script');
-    script.src = "https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.6/ace.js";
+    script.src = "/ace.js";
     script.async = false;
     document.head.appendChild(script);
   }