Th3maz1ng/ESP8266_swiss_army_board
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improved WEBServerManager Speed

Browse Source
This commit is contained in:
Anatole SCHRAMM 2019-04-17 14:55:42 +02:00
parent 7e20eb48bb
commit 73441f6b18
1 changed files with 42 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/app/WEBServerManager.cpp
View File

@ -1,6 +1,8 @@
#include "WEBServerManager.h" #include "WEBServerManager.h"
#define DEBUG #define DEBUG
#define DEBUG_BODY
#define DEBUG_PARAMETER
//#define DEBUG_RAW //#define DEBUG_RAW
WEBServerManager::WEBServerManager(unsigned int port, SDCardManager *sdCardManager) : _wifiServer(port), _sdCardManager(sdCardManager), _httpRequestData({UNDEFINED, UNKNOWN, UNKNOWN_MIME, Dictionary<DictionaryHelper::StringEntity>(), Dictionary<DictionaryHelper::StringEntity>(), NULL,NULL}), _httpParserState(INIT), _clientState(WAITING_FOR_CLIENT), _port(port), _clientTimeout(0) WEBServerManager::WEBServerManager(unsigned int port, SDCardManager *sdCardManager) : _wifiServer(port), _sdCardManager(sdCardManager), _httpRequestData({UNDEFINED, UNKNOWN, UNKNOWN_MIME, Dictionary<DictionaryHelper::StringEntity>(), Dictionary<DictionaryHelper::StringEntity>(), NULL,NULL}), _httpParserState(INIT), _clientState(WAITING_FOR_CLIENT), _port(port), _clientTimeout(0)
@ -83,7 +85,7 @@ boolean WEBServerManager::runServer()
boolean WEBServerManager::parseQuery(WiFiClient *wifiClient) boolean WEBServerManager::parseQuery(WiFiClient *wifiClient)
{ {
char readChar(0), *parseBuffer(NULL), *parseKey(NULL), *parseValue(NULL); char readChar(0), *parseBuffer(NULL), *parseKey(NULL), *parseValue(NULL);
boolean smallTimeout(false), isKey(true); boolean smallTimeout(false), isKey(true), receivingDone(false);
unsigned int shortTimeout = 100, longTimeout = 5000, activeTimeout = shortTimeout; unsigned int shortTimeout = 100, longTimeout = 5000, activeTimeout = shortTimeout;
/* Better way to read data /* Better way to read data
@ -94,7 +96,7 @@ boolean WEBServerManager::parseQuery(WiFiClient *wifiClient)
_httpParserState = INIT; _httpParserState = INIT;
_clientTimeout = millis(); _clientTimeout = millis();
boolean slashesOrAntiSlashesOnly(true); boolean slashesOrAntiSlashesOnly(true);
while(wifiClient->available() || millis() - _clientTimeout < (smallTimeout ? activeTimeout : 10000)) while(wifiClient->available() || ( millis() - _clientTimeout < (smallTimeout ? activeTimeout : 10000)))
{ {
if(wifiClient->available()) if(wifiClient->available())
{ {
@ -116,16 +118,25 @@ boolean WEBServerManager::parseQuery(WiFiClient *wifiClient)
_httpParserState = ERROR; _httpParserState = ERROR;
break; break;
case LINE_BREAK: case LINE_BREAK:
if(readChar == '\n') if(readChar == '\n')
_httpParserState = BODY_SECTION; {
else if(readChar != '\r') if(_httpRequestData.HRM == GET)
{ {
#ifdef DEBUG #ifdef DEBUG
Serial.print(readChar); Serial.println("GET DONE");
#endif #endif
_httpParserState = PARAMETER_SECTION; receivingDone = true;
} }
break; _httpParserState = BODY_SECTION;
}
else if(readChar != '\r')
{
#ifdef DEBUG_BODY
Serial.print(readChar);
#endif
_httpParserState = PARAMETER_SECTION;
}
break;
case HTTP_VERB_SECTION: case HTTP_VERB_SECTION:
if(readChar >= 65 && readChar <= 90) if(readChar >= 65 && readChar <= 90)
{ {
@ -143,16 +154,15 @@ boolean WEBServerManager::parseQuery(WiFiClient *wifiClient)
_httpParserState = ERROR; _httpParserState = ERROR;
break; break;
case HTTP_RESOURCE_SECTION: case HTTP_RESOURCE_SECTION:
if(_httpRequestData.HRM == POST)// Need to be changed, using Content-Length is more appropriate if(_httpRequestData.HRM == POST)// Need to be changed, using Content-Length is more appropriate
activeTimeout = longTimeout; activeTimeout = longTimeout;
if(readChar == '?' )
if(readChar == '?' ) {
{ free(_httpRequestData.httpResource);_httpRequestData.httpResource = NULL;
free(_httpRequestData.httpResource);_httpRequestData.httpResource = NULL; _httpRequestData.httpResource = parseBuffer;parseBuffer = NULL;
_httpRequestData.httpResource = parseBuffer;parseBuffer = NULL;
_httpParserState = HTTP_RESOURCE_PARAM_SECTION; _httpParserState = HTTP_RESOURCE_PARAM_SECTION;
} }
else if(readChar == ' ') else if(readChar == ' ')
{ {
free(_httpRequestData.httpResource);_httpRequestData.httpResource = NULL; free(_httpRequestData.httpResource);_httpRequestData.httpResource = NULL;
@ -193,12 +203,12 @@ boolean WEBServerManager::parseQuery(WiFiClient *wifiClient)
parseKey = NULL;parseValue = NULL; parseKey = NULL;parseValue = NULL;
} }
else else
{ {
if(isKey) if(isKey)
parseKey = addChar(parseKey, readChar); parseKey = addChar(parseKey, readChar);
else else
parseValue = addChar(parseValue, readChar); parseValue = addChar(parseValue, readChar);
} }
break; break;
case HTTP_VER_SECTION: case HTTP_VER_SECTION:
if((readChar >= 48 && readChar <= 57) || readChar == '.') if((readChar >= 48 && readChar <= 57) || readChar == '.')
@ -219,8 +229,8 @@ boolean WEBServerManager::parseQuery(WiFiClient *wifiClient)
Serial.print(readChar); Serial.print(readChar);
#endif #endif
break; break;
case PARAMETER_SECTION: //Here are all the http header params case PARAMETER_SECTION: //Here are all the http header params
#ifdef DEBUG #ifdef DEBUG_PARAMETER
Serial.print(readChar); Serial.print(readChar);
#endif #endif
if(readChar == '\n') if(readChar == '\n')
@ -236,6 +246,9 @@ boolean WEBServerManager::parseQuery(WiFiClient *wifiClient)
default : default :
break; break;
} }
if(receivingDone) break;
_clientTimeout = millis(); _clientTimeout = millis();
smallTimeout = true; smallTimeout = true;
} }