Mirror/AI-on-the-edge-device
1
0
Fork 0
mirror of https://github.com/jomjol/AI-on-the-edge-device.git synced 2025-12-16 08:26:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rest handler: Use none chunked transfer (#1797)

Browse Source 
* Resthandler info,sysinfo,starttime: no chunk trans

* flowstart,statusflow,cputemp,rssi,uptime,prevalue

* Renamed error messages
This commit is contained in:
Slider0007
2023-01-10 19:37:30 +01:00
committed by GitHub
parent 4b38c1ef00
commit eefdc74e9a
3 changed files with 64 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
code/main/server_main.cpp
View File

@@ -46,155 +46,139 @@ esp_err_t info_get_handler(httpd_req_t *req)
ESP_LOGD(TAG, "type is found: %s", _valuechar);
_task = std::string(_valuechar);
}
};
}
httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*");
if (_task.compare("GitBranch") == 0)
{
httpd_resp_sendstr_chunk(req, libfive_git_branch());
httpd_resp_sendstr_chunk(req, NULL);
httpd_resp_sendstr(req, libfive_git_branch());
return ESP_OK;
}
else if (_task.compare("GitTag") == 0)
{
httpd_resp_sendstr_chunk(req, libfive_git_version());
httpd_resp_sendstr_chunk(req, NULL);
httpd_resp_sendstr(req, libfive_git_version());
return ESP_OK;
}
else if (_task.compare("GitRevision") == 0)
{
httpd_resp_sendstr_chunk(req, libfive_git_revision());
httpd_resp_sendstr_chunk(req, NULL);
httpd_resp_sendstr(req, libfive_git_revision());
return ESP_OK;
}
else if (_task.compare("BuildTime") == 0)
{
httpd_resp_sendstr_chunk(req, build_time());
httpd_resp_sendstr_chunk(req, NULL);
httpd_resp_sendstr(req, build_time());
return ESP_OK;
}
else if (_task.compare("FirmwareVersion") == 0)
{
httpd_resp_sendstr_chunk(req, getFwVersion().c_str());
httpd_resp_sendstr_chunk(req, NULL);
httpd_resp_sendstr(req, getFwVersion().c_str());
return ESP_OK;
}
else if (_task.compare("HTMLVersion") == 0)
{
httpd_resp_sendstr_chunk(req, getHTMLversion().c_str());
httpd_resp_sendstr_chunk(req, NULL);
httpd_resp_sendstr(req, getHTMLversion().c_str());
return ESP_OK;
}
else if (_task.compare("Hostname") == 0)
{
std::string zw;
zw = std::string(hostname);
httpd_resp_sendstr_chunk(req, zw.c_str());
httpd_resp_sendstr_chunk(req, NULL);
httpd_resp_sendstr(req, zw.c_str());
return ESP_OK;
}
else if (_task.compare("IP") == 0)
{
std::string *zw;
zw = getIPAddress();
httpd_resp_sendstr_chunk(req, zw->c_str());
httpd_resp_sendstr_chunk(req, NULL);
httpd_resp_sendstr(req, zw->c_str());
return ESP_OK;
}
else if (_task.compare("SSID") == 0)
{
std::string *zw;
zw = getSSID();
httpd_resp_sendstr_chunk(req, zw->c_str());
httpd_resp_sendstr_chunk(req, NULL);
httpd_resp_sendstr(req, zw->c_str());
return ESP_OK;
}
else if (_task.compare("FlowStatus") == 0)
{
std::string zw;
zw = std::string("FlowStatus");
httpd_resp_sendstr_chunk(req, zw.c_str());
httpd_resp_sendstr_chunk(req, NULL);
httpd_resp_sendstr(req, zw.c_str());
return ESP_OK;
}
else if (_task.compare("Round") == 0)
{
char formated[10] = "";
snprintf(formated, sizeof(formated), "%d", getCountFlowRounds());
httpd_resp_sendstr_chunk(req, formated);
httpd_resp_sendstr_chunk(req, NULL);
httpd_resp_sendstr(req, formated);
return ESP_OK;
}
else if (_task.compare("SDCardPartitionSize") == 0)
{
std::string zw;
zw = getSDCardPartitionSize();
httpd_resp_sendstr_chunk(req, zw.c_str());
httpd_resp_sendstr_chunk(req, NULL);
httpd_resp_sendstr(req, zw.c_str());
return ESP_OK;
}
else if (_task.compare("SDCardFreePartitionSpace") == 0)
{
std::string zw;
zw = getSDCardFreePartitionSpace();
httpd_resp_sendstr_chunk(req, zw.c_str());
httpd_resp_sendstr_chunk(req, NULL);
httpd_resp_sendstr(req, zw.c_str());
return ESP_OK;
}
else if (_task.compare("SDCardPartitionAllocationSize") == 0)
{
std::string zw;
zw = getSDCardPartitionAllocationSize();
httpd_resp_sendstr_chunk(req, zw.c_str());
httpd_resp_sendstr_chunk(req, NULL);
httpd_resp_sendstr(req, zw.c_str());
return ESP_OK;
}
else if (_task.compare("SDCardManufacturer") == 0)
{
std::string zw;
zw = getSDCardManufacturer();
httpd_resp_sendstr_chunk(req, zw.c_str());
httpd_resp_sendstr_chunk(req, NULL);
httpd_resp_sendstr(req, zw.c_str());
return ESP_OK;
}
else if (_task.compare("SDCardName") == 0)
{
std::string zw;
zw = getSDCardName();
httpd_resp_sendstr_chunk(req, zw.c_str());
httpd_resp_sendstr_chunk(req, NULL);
httpd_resp_sendstr(req, zw.c_str());
return ESP_OK;
}
else if (_task.compare("SDCardCapacity") == 0)
{
std::string zw;
zw = getSDCardCapacity();
httpd_resp_sendstr_chunk(req, zw.c_str());
httpd_resp_sendstr_chunk(req, NULL);
httpd_resp_sendstr(req, zw.c_str());
return ESP_OK;
}
else if (_task.compare("SDCardSectorSize") == 0)
{
std::string zw;
zw = getSDCardSectorSize();
httpd_resp_sendstr_chunk(req, zw.c_str());
httpd_resp_sendstr_chunk(req, NULL);
httpd_resp_sendstr(req, zw.c_str());
return ESP_OK;
}
return ESP_OK;
}
esp_err_t starttime_get_handler(httpd_req_t *req)
{
httpd_resp_send(req, starttime.c_str(), strlen(starttime.c_str()));
/* Respond with an empty chunk to signal HTTP response completion */
httpd_resp_send_chunk(req, NULL, 0);
httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*");
httpd_resp_send(req, starttime.c_str(), starttime.length());
return ESP_OK;
}
esp_err_t hello_main_handler(httpd_req_t *req)
{
#ifdef DEBUG_DETAIL_ON
@@ -286,6 +270,7 @@ esp_err_t hello_main_handler(httpd_req_t *req)
return ESP_OK;
}
esp_err_t img_tmp_handler(httpd_req_t *req)
{
char filepath[50];
@@ -310,6 +295,7 @@ esp_err_t img_tmp_handler(httpd_req_t *req)
return ESP_OK;
}
esp_err_t img_tmp_virtual_handler(httpd_req_t *req)
{
#ifdef DEBUG_DETAIL_ON
@@ -390,13 +376,12 @@ esp_err_t sysinfo_handler(httpd_req_t *req)
resp_str = zw.c_str();
httpd_resp_set_type(req, "application/json");
httpd_resp_send(req, resp_str, strlen(resp_str));
/* Respond with an empty chunk to signal HTTP response completion */
httpd_resp_send_chunk(req, NULL, 0);
httpd_resp_sendstr(req, resp_str);
return ESP_OK;
}
void register_server_main_uri(httpd_handle_t server, const char *base_path)
{
httpd_uri_t info_get_handle = {
@@ -423,8 +408,6 @@ void register_server_main_uri(httpd_handle_t server, const char *base_path)
};
httpd_register_uri_handler(server, &starttime_tmp_handle);
httpd_uri_t img_tmp_handle = {
.uri = "/img_tmp/*", // Match all URIs of type /path/to/file
.method = HTTP_GET,
@@ -433,7 +416,6 @@ void register_server_main_uri(httpd_handle_t server, const char *base_path)
};
httpd_register_uri_handler(server, &img_tmp_handle);
httpd_uri_t main_rest_handle = {
.uri = "/*", // Match all URIs of type /path/to/file
.method = HTTP_GET,
@@ -445,7 +427,6 @@ void register_server_main_uri(httpd_handle_t server, const char *base_path)
}
httpd_handle_t start_webserver(void)
{
httpd_handle_t server = NULL;
@@ -486,6 +467,7 @@ httpd_handle_t start_webserver(void)
return NULL;
}
void stop_webserver(httpd_handle_t server)
{
httpd_stop(server);
@@ -503,6 +485,7 @@ void disconnect_handler(void* arg, esp_event_base_t event_base,
}
}
void connect_handler(void* arg, esp_event_base_t event_base,
int32_t event_id, void* event_data)
{