diff --git a/code/components/jomjol_fileserver_ota/server_file.cpp b/code/components/jomjol_fileserver_ota/server_file.cpp index 974df682..b4916fde 100644 --- a/code/components/jomjol_fileserver_ota/server_file.cpp +++ b/code/components/jomjol_fileserver_ota/server_file.cpp @@ -84,6 +84,7 @@ string SUFFIX_ZW = "_0xge"; static esp_err_t send_logfile(httpd_req_t *req, bool send_full_file); +static esp_err_t send_datafile(httpd_req_t *req, bool send_full_file); esp_err_t get_numbers_file_handler(httpd_req_t *req) @@ -110,7 +111,7 @@ esp_err_t get_data_file_handler(httpd_req_t *req) size_t pos = 0; const char verz_name[] = "/sdcard/log/data"; - ESP_LOGD(TAG, "Suche TFLITE in /sdcard/log/data"); + ESP_LOGD(TAG, "Suche data files in /sdcard/log/data"); httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*"); httpd_resp_set_type(req, "text/plain"); @@ -133,7 +134,7 @@ esp_err_t get_data_file_handler(httpd_req_t *req) ESP_LOGD(TAG, " Extension: %s", _fileext.c_str()); - if (_fileext == "txt") + if (_fileext == "csv") { _filename = _filename + "\t"; httpd_resp_sendstr_chunk(req, _filename.c_str()); @@ -335,10 +336,18 @@ static esp_err_t logfileact_get_last_part_handler(httpd_req_t *req) { return send_logfile(req, false); } +static esp_err_t datafileact_get_full_handler(httpd_req_t *req) { + return send_datafile(req, true); +} -static esp_err_t send_logfile(httpd_req_t *req, bool send_full_file) + +static esp_err_t datafileact_get_last_part_handler(httpd_req_t *req) { + return send_datafile(req, false); +} + +static esp_err_t send_datafile(httpd_req_t *req, bool send_full_file) { - LogFile.WriteToFile(ESP_LOG_DEBUG, "log_get_last_part_handler"); + LogFile.WriteToFile(ESP_LOG_DEBUG, "data_get_last_part_handler"); char filepath[FILE_PATH_MAX]; FILE *fd = NULL; //struct stat file_stat; @@ -346,10 +355,97 @@ static esp_err_t send_logfile(httpd_req_t *req, bool send_full_file) const char* filename = ""; + std::string currentfilename = LogFile.GetCurrentFileNameData(); + + ESP_LOGD(TAG, "uri: %s, filename: %s, filepath: %s", req->uri, filename, filepath); + + httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*"); + + fd = OpenFileAndWait(currentfilename.c_str(), "r"); + if (!fd) { + ESP_LOGE(TAG_FILESERVER, "Failed to read existing file : %s", filepath); + /* Respond with 500 Internal Server Error */ + httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, "Failed to read existing file"); + return ESP_FAIL; + } + + httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*"); + +// ESP_LOGI(TAG_FILESERVER, "Sending file : %s (%ld bytes)...", &filename, file_stat.st_size); + set_content_type_from_file(req, filename); + + if (!send_full_file) { // Send only last part of file + ESP_LOGD(TAG_FILESERVER, "Sending last %d bytes of the actual datafile!", LOGFILE_LAST_PART_BYTES); + + /* Adapted from https://www.geeksforgeeks.org/implement-your-own-tail-read-last-n-lines-of-a-huge-file/ */ + if (fseek(fd, 0, SEEK_END)) { + ESP_LOGE(TAG_FILESERVER, "Failed to get to end of file!"); + return ESP_FAIL; + } + else { + long pos = ftell(fd); // Number of bytes in the file + ESP_LOGI(TAG_FILESERVER, "File contains %ld bytes", pos); + + if (fseek(fd, pos - std::min((long)LOGFILE_LAST_PART_BYTES, pos), SEEK_SET)) { // Go LOGFILE_LAST_PART_BYTES bytes back from EOF + ESP_LOGE(TAG_FILESERVER, "Failed to go back %ld bytes within the file!", std::min((long)LOGFILE_LAST_PART_BYTES, pos)); + return ESP_FAIL; + } + } + + /* Find end of line */ + while (1) { + if (fgetc(fd) == '\n') { + break; + } + } + } + + /* Retrieve the pointer to scratch buffer for temporary storage */ + char *chunk = ((struct file_server_data *)req->user_ctx)->scratch; + size_t chunksize; + do { + /* Read file in chunks into the scratch buffer */ + chunksize = fread(chunk, 1, SCRATCH_BUFSIZE, fd); + + /* Send the buffer contents as HTTP response chunk */ + if (httpd_resp_send_chunk(req, chunk, chunksize) != ESP_OK) { + fclose(fd); + ESP_LOGE(TAG_FILESERVER, "File sending failed!"); + /* Abort sending file */ + httpd_resp_sendstr_chunk(req, NULL); + /* Respond with 500 Internal Server Error */ + httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, "Failed to send file"); + return ESP_FAIL; + } + + /* Keep looping till the whole file is sent */ + } while (chunksize != 0); + + /* Close file after sending complete */ + fclose(fd); + ESP_LOGI(TAG_FILESERVER, "File sending complete"); + + /* Respond with an empty chunk to signal HTTP response completion */ + httpd_resp_send_chunk(req, NULL, 0); + return ESP_OK; +} + + +static esp_err_t send_logfile(httpd_req_t *req, bool send_full_file) +{ + LogFile.WriteToFile(ESP_LOG_DEBUG, "log_get_last_part_handler"); + char filepath[FILE_PATH_MAX]; + FILE *fd = NULL; + //struct stat file_stat; + ESP_LOGI(TAG, "uri: %s", req->uri); + + const char* filename = ""; + std::string currentfilename = LogFile.GetCurrentFileName(); ESP_LOGD(TAG, "uri: %s, filename: %s, filepath: %s", req->uri, filename, filepath); + fd = OpenFileAndWait(currentfilename.c_str(), "r"); if (!fd) { ESP_LOGE(TAG_FILESERVER, "Failed to read existing file : %s", filepath); @@ -852,7 +948,7 @@ std::string unzip_new(std::string _in_zip_file, std::string _target_zip, std::st p = mz_zip_reader_extract_file_to_heap(&zip_archive, archive_filename, &uncomp_size, 0); if (!p) { - ESP_LOGD(TAG, "mz_zip_reader_extract_file_to_heap() failed on file %s", archive_filename); + ESP_LOGE(TAG, "mz_zip_reader_extract_file_to_heap() failed on file %s", archive_filename); mz_zip_reader_end(&zip_archive); return ret; } @@ -883,7 +979,7 @@ std::string unzip_new(std::string _in_zip_file, std::string _target_zip, std::st string filename_zw = zw + SUFFIX_ZW; - ESP_LOGD(TAG, "Filename to extract: %s, Zwischenfilename: %s", zw.c_str(), filename_zw.c_str()); + ESP_LOGI(TAG, "Filename to extract: %s, Zwischenfilename: %s", zw.c_str(), filename_zw.c_str()); // extrahieren in zwischendatei DeleteFile(filename_zw); @@ -900,15 +996,21 @@ std::string unzip_new(std::string _in_zip_file, std::string _target_zip, std::st else { isokay = false; - ESP_LOGE(TAG, "ERROR in writting extracted file (function fwrite) extracted file \"%s\", size %u", archive_filename, (uint)uncomp_size); + ESP_LOGD(TAG, "ERROR in writting extracted file (function fwrite) extracted file \"%s\", size %u", archive_filename, (uint)uncomp_size); } - + DeleteFile(zw); + if (!isokay) + ESP_LOGE(TAG, "ERROR in fwrite \"%s\", size %u", archive_filename, (uint)uncomp_size); isokay = isokay && RenameFile(filename_zw, zw); - isokay = isokay && DeleteFile(filename_zw); + if (!isokay) + ESP_LOGE(TAG, "ERROR in Rename \"%s\" to \"%s\"", filename_zw.c_str(), zw.c_str()); +// isokay = isokay && DeleteFile(filename_zw); +// if (!isokay) +// ESP_LOGE(TAG, "ERROR in Delete \"%s\"", filename_zw.c_str()); if (isokay) - ESP_LOGD(TAG, "Successfully extracted file \"%s\", size %u", archive_filename, (uint)uncomp_size); + ESP_LOGI(TAG, "Successfully extracted file \"%s\", size %u", archive_filename, (uint)uncomp_size); else { ESP_LOGE(TAG, "ERROR in extracting file \"%s\", size %u", archive_filename, (uint)uncomp_size); @@ -1042,6 +1144,22 @@ void register_server_file_uri(httpd_handle_t server, const char *base_path) httpd_register_uri_handler(server, &file_download); + httpd_uri_t file_datafileact = { + .uri = "/datafileact", // Match all URIs of type /path/to/file + .method = HTTP_GET, + .handler = datafileact_get_full_handler, + .user_ctx = server_data // Pass server data as context + }; + httpd_register_uri_handler(server, &file_datafileact); + + + httpd_uri_t file_datafile_last_part_handle = { + .uri = "/data", // Match all URIs of type /path/to/file + .method = HTTP_GET, + .handler = datafileact_get_last_part_handler, + .user_ctx = server_data // Pass server data as context + }; + httpd_register_uri_handler(server, &file_datafile_last_part_handle); httpd_uri_t file_logfileact = { .uri = "/logfileact", // Match all URIs of type /path/to/file diff --git a/code/components/jomjol_helper/Helper.cpp b/code/components/jomjol_helper/Helper.cpp index 03a14757..ad196f36 100644 --- a/code/components/jomjol_helper/Helper.cpp +++ b/code/components/jomjol_helper/Helper.cpp @@ -172,10 +172,10 @@ FILE* OpenFileAndWait(const char* nm, const char* _mode, int _waitsec, bool sile ESP_LOGD(TAG, "open file %s in mode %s", nm, _mode); if ((pfile = fopen(nm, _mode)) != NULL) { - if (!silent) ESP_LOGD(TAG, "File %s successfully opened", nm); + if (!silent) ESP_LOGE(TAG, "File %s successfully opened", nm); } else { - if (!silent) ESP_LOGD(TAG, "Error: file %s does not exist!", nm); + if (!silent) ESP_LOGE(TAG, "Error: file %s does not exist!", nm); return NULL; } @@ -301,7 +301,7 @@ bool RenameFile(string from, string to) FILE* fpSourceFile = OpenFileAndWait(from.c_str(), "rb"); if (!fpSourceFile) // Sourcefile existiert nicht sonst gibt es einen Fehler beim Kopierversuch! { - ESP_LOGD(TAG, "DeleteFile: File %s existiert nicht!", from.c_str()); + ESP_LOGE(TAG, "DeleteFile: File %s existiert nicht!", from.c_str()); return false; } fclose(fpSourceFile); diff --git a/code/components/jomjol_logfile/ClassLogFile.cpp b/code/components/jomjol_logfile/ClassLogFile.cpp index ee3d5623..8b6a5930 100644 --- a/code/components/jomjol_logfile/ClassLogFile.cpp +++ b/code/components/jomjol_logfile/ClassLogFile.cpp @@ -241,6 +241,22 @@ void ClassLogFile::WriteToFile(esp_log_level_t level, std::string info, bool _ti ESP_LOG_LEVEL(level, TAG, "%s", info.c_str()); } +std::string ClassLogFile::GetCurrentFileNameData() +{ + time_t rawtime; + struct tm* timeinfo; + char buffer[60]; + + time(&rawtime); + timeinfo = localtime(&rawtime); + + strftime(buffer, 60, datafile.c_str(), timeinfo); + std::string logpath = dataroot + "/" + buffer; + + return logpath; +} + + std::string ClassLogFile::GetCurrentFileName() { time_t rawtime; diff --git a/code/components/jomjol_logfile/ClassLogFile.h b/code/components/jomjol_logfile/ClassLogFile.h index d434258d..d023450b 100644 --- a/code/components/jomjol_logfile/ClassLogFile.h +++ b/code/components/jomjol_logfile/ClassLogFile.h @@ -32,6 +32,7 @@ public: std::string GetCurrentFileName(); + std::string GetCurrentFileNameData(); }; extern ClassLogFile LogFile; \ No newline at end of file diff --git a/code/main/server_main.cpp b/code/main/server_main.cpp index 8f1672d2..034b10fc 100644 --- a/code/main/server_main.cpp +++ b/code/main/server_main.cpp @@ -450,7 +450,7 @@ httpd_handle_t start_webserver(void) config.server_port = 80; config.ctrl_port = 32768; config.max_open_sockets = 5; //20210921 --> vorher 7 - config.max_uri_handlers = 35; // vorher 24, 20220511: 35 + config.max_uri_handlers = 37; // vorher 24, 20220511: 35 config.max_resp_headers = 8; config.backlog_conn = 5; config.lru_purge_enable = true; // dadurch werden alte Verbindungen gekappt, falls neue benögt werden. diff --git a/sd-card/html/data.html b/sd-card/html/data.html new file mode 100644 index 00000000..c220ebda --- /dev/null +++ b/sd-card/html/data.html @@ -0,0 +1,100 @@ + + + + + +
+
+ + + +
+



Loading Logfile, please wait...
+
+ + + +
+
+ + + + diff --git a/sd-card/html/index.html b/sd-card/html/index.html index 6dc2df39..b8d2a7c5 100644 --- a/sd-card/html/index.html +++ b/sd-card/html/index.html @@ -69,6 +69,7 @@
  • Backup/Restore
  • OTA Update
  • Log Viewer
    • +
  • Data Viewer
  • Reboot
  • Info