From e3566feefb36db362c910555ae453c8955f2acd5 Mon Sep 17 00:00:00 2001
From: MichaelDvP <github@mdvp.de>
Date: Fri, 25 Apr 2025 08:05:15 +0200
Subject: [PATCH] show console log with ISO date/time, #2533

---
 CHANGELOG_LATEST.md                |  2 +-
 interface/package.json             |  4 ++--
 interface/yarn.lock                | 23 ++++++++++++++++-------
 lib/uuid-console/src/shell_log.cpp | 10 +++++++++-
 src/emsesp_version.h               |  2 +-
 5 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG_LATEST.md b/CHANGELOG_LATEST.md
index 8706eebe1..1f2ee87d0 100644
--- a/CHANGELOG_LATEST.md
+++ b/CHANGELOG_LATEST.md
@@ -24,4 +24,4 @@ For more details go to [docs.emsesp.org](https://docs.emsesp.org/).
 
 ## Changed
 
--
+- show console log with ISO date/time [#2533](https://github.com/emsesp/EMS-ESP32/discussions/2533)
diff --git a/interface/package.json b/interface/package.json
index 69dff88a9..9093c257a 100644
--- a/interface/package.json
+++ b/interface/package.json
@@ -36,7 +36,7 @@
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
     "react-icons": "^5.5.0",
-    "react-router": "^7.5.1",
+    "react-router": "^7.5.2",
     "react-toastify": "^11.0.5",
     "typesafe-i18n": "^5.26.2",
     "typescript": "^5.8.3"
@@ -47,7 +47,7 @@
     "@preact/compat": "^18.3.1",
     "@preact/preset-vite": "^2.10.1",
     "@trivago/prettier-plugin-sort-imports": "^5.2.2",
-    "@types/node": "^22.14.1",
+    "@types/node": "^22.15.1",
     "@types/react": "^19.1.2",
     "@types/react-dom": "^19.1.2",
     "concurrently": "^9.1.2",
diff --git a/interface/yarn.lock b/interface/yarn.lock
index dc78c96e9..76f062897 100644
--- a/interface/yarn.lock
+++ b/interface/yarn.lock
@@ -1399,7 +1399,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:*, @types/node@npm:^22.14.1":
+"@types/node@npm:*":
   version: 22.14.1
   resolution: "@types/node@npm:22.14.1"
   dependencies:
@@ -1408,6 +1408,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/node@npm:^22.15.1":
+  version: 22.15.1
+  resolution: "@types/node@npm:22.15.1"
+  dependencies:
+    undici-types: "npm:~6.21.0"
+  checksum: 10c0/80bd7fff7d6f4058875feb2c980fa066266b02ffde51e794cf4b7bea5f1316c08baa135fa7cbffa677efb999b0945b2697b318e84af4563c1ab8d3392a17bf9a
+  languageName: node
+  linkType: hard
+
 "@types/parse-json@npm:^4.0.0":
   version: 4.0.2
   resolution: "@types/parse-json@npm:4.0.2"
@@ -1594,7 +1603,7 @@ __metadata:
     "@preact/preset-vite": "npm:^2.10.1"
     "@table-library/react-table-library": "npm:4.1.15"
     "@trivago/prettier-plugin-sort-imports": "npm:^5.2.2"
-    "@types/node": "npm:^22.14.1"
+    "@types/node": "npm:^22.15.1"
     "@types/react": "npm:^19.1.2"
     "@types/react-dom": "npm:^19.1.2"
     alova: "npm:3.2.10"
@@ -1610,7 +1619,7 @@ __metadata:
     react: "npm:^19.1.0"
     react-dom: "npm:^19.1.0"
     react-icons: "npm:^5.5.0"
-    react-router: "npm:^7.5.1"
+    react-router: "npm:^7.5.2"
     react-toastify: "npm:^11.0.5"
     rollup-plugin-visualizer: "npm:^5.14.0"
     terser: "npm:^5.39.0"
@@ -5572,9 +5581,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-router@npm:^7.5.1":
-  version: 7.5.1
-  resolution: "react-router@npm:7.5.1"
+"react-router@npm:^7.5.2":
+  version: 7.5.2
+  resolution: "react-router@npm:7.5.2"
   dependencies:
     cookie: "npm:^1.0.1"
     set-cookie-parser: "npm:^2.6.0"
@@ -5585,7 +5594,7 @@ __metadata:
   peerDependenciesMeta:
     react-dom:
       optional: true
-  checksum: 10c0/54e9f77ede0bf36c12685a59c5d965f77f2223d01cd922ce7b6ef4f8fa5435e66c796f9f5da3487bde0cb98dadd64f5a406696d4f52e031af812857aaab0f76b
+  checksum: 10c0/5972ecb783e0ac0512c500b84bd4ff475665ba49c67b69e13b79dc24c7ee0496d523858058bb43c70147367688e0cc0d6d6d0f51cabfdebfbc5556d559bff457
   languageName: node
   linkType: hard
 
diff --git a/lib/uuid-console/src/shell_log.cpp b/lib/uuid-console/src/shell_log.cpp
index decf47e67..0ae54eab7 100644
--- a/lib/uuid-console/src/shell_log.cpp
+++ b/lib/uuid-console/src/shell_log.cpp
@@ -106,7 +106,15 @@ void Shell::output_logs() {
     }
 
     while (1) {
-        print(uuid::log::format_timestamp_ms(message.content_->uptime_ms, 3));
+        time_t offset = time(nullptr) - uuid::get_uptime_sec();
+        if (offset < 1500000000L) {
+            print(uuid::log::format_timestamp_ms(message.content_->uptime_ms, 3));
+        } else {
+            time_t t1 = offset + (time_t)(message.content_->uptime_ms / 1000);
+            char   timestr[25];
+            strftime(timestr, 25, "%FT%T", localtime(&t1));
+            printf("%s.%03d", timestr, (uint16_t)(message.content_->uptime_ms % 1000));
+        }
         printf(" %c %lu: [%s] ", uuid::log::format_level_char(message.content_->level), message.id_, message.content_->name);
 
         if ((message.content_->level == uuid::log::Level::ERR) || (message.content_->level == uuid::log::Level::WARNING)) {
diff --git a/src/emsesp_version.h b/src/emsesp_version.h
index 82060ecd8..ca6316e7b 100644
--- a/src/emsesp_version.h
+++ b/src/emsesp_version.h
@@ -1 +1 @@
-#define EMSESP_APP_VERSION "3.7.3-dev.9"
+#define EMSESP_APP_VERSION "3.7.3-dev.10"