}
+ */
+function configObjectToMap(configObj) {
+ const map = new Map();
+ Object.keys(configObj).forEach(k => {
+ if (IGNORE_KEY.includes(k)) {
+ return;
+ }
+ map.set(k, configObj[k]);
+ });
+ return map;
+}
+
+async function loadConfig() {
+ try {
+ const res = await httpGet("/api/v1/config", CONTENT_JSON);
+ const json = await res.json();
+ console.log(json);
+
+ if (!json["success"]) {
+ alert("エラーが発生しました。");
+ return;
+ }
+
+ const configObj = json["config"];
+ const confMap = configObjectToMap(configObj);
+
+ confMap.set("password", ""); // Add password as empty for later use
+ LAST_CONFIG = confMap;
+
+ setConfigValuesToPage(confMap);
+
+ } catch (err) {
+ alert(err);
+ return;
+ }
+
+}
+
+document.addEventListener("DOMContentLoaded", async (event) => {
+ const waitDialog = document.getElementById("waitDialog");
+ waitDialog.showModal();
+
+ console.log("DOM fully loaded and parsed");
+ document.getElementById("submit").addEventListener("click", async (event) => {
+ console.log("Submit Clicked");
+ await saveConfigButton();
+ });
+
+ await setPageValues();
+ await showSetupModeOnly();
+ await loadConfig();
+
+ waitDialog.close();
+});
+
diff --git a/embed/static/style.css b/embed/static/style.css
new file mode 100644
index 0000000..3867c6a
--- /dev/null
+++ b/embed/static/style.css
@@ -0,0 +1,45 @@
+@charset "utf-8";
+body {
+ background-color: aliceblue;
+ line-height: 110%;
+}
+
+body.setup_done {
+ background-color: paleturquoise;
+}
+
+body.setup_err {
+ background-color: lightsalmon;
+}
+
+span.header {
+ display: inline-block;
+ width: 6em;
+}
+
+input[type='text'],input[type='password'] {
+ width: 15em;
+}
+
+input.num {
+ width: 6em;
+}
+
+input#submit {
+ width: 200px;
+ height: 48px;
+}
+
+a.setup_again {
+ font-size: 150%;
+}
+
+dialog::backdrop {
+ background: rgba(0, 0, 0, 0.6);
+}
+
+.notice {
+ background-color: blanchedalmond;
+ border: 2px solid black;
+ padding: 0.5em 1.5em 0.5em 1.5em;
+}
\ No newline at end of file
diff --git a/embed/style.css b/embed/style.css
deleted file mode 100644
index d80f0e2..0000000
--- a/embed/style.css
+++ /dev/null
@@ -1,29 +0,0 @@
-@charset "utf-8";
-body {
- background-color: aliceblue;
-}
-
-body.setup_done {
- background-color: paleturquoise;
-}
-
-body.setup_err {
- background-color: lightsalmon;
-}
-
-input[type='text'] {
- width: 200px;
-}
-
-input.num {
- width: 50px;
-}
-
-input[type='submit'] {
- width: 200px;
- height: 48px;
-}
-
-a.setup_again {
- font-size: 150%;
-}
\ No newline at end of file
diff --git a/embed/update.html b/embed/update.html
new file mode 100644
index 0000000..f3977d2
--- /dev/null
+++ b/embed/update.html
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+ EnvBoyX updater
+
+
+
+
+
+ Firmware Update
+ This is beta feature. proceed with care !
+
+
+
\ No newline at end of file
diff --git a/embed/update_done.html b/embed/update_done.html
new file mode 100644
index 0000000..f81cc85
--- /dev/null
+++ b/embed/update_done.html
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+ EnvBoyX update completed
+
+
+
+
+
+ Firmware Update completed.
+ EnvBoy is rebooting... please wait
+ NOTE: If not rebooting, reboot manually.
+
+
\ No newline at end of file
diff --git a/embed/update_fail.html b/embed/update_fail.html
new file mode 100644
index 0000000..ed9b8df
--- /dev/null
+++ b/embed/update_fail.html
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+ EnvBoyX update completed
+
+
+
+
+
+ Firmware Update failed.
+ Please reboot now.
+ But EnvBoy might be damaged.
+
+
\ No newline at end of file
diff --git a/embed/update_unsupport.html b/embed/update_unsupport.html
new file mode 100644
index 0000000..651d098
--- /dev/null
+++ b/embed/update_unsupport.html
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+ EnvBoyX update
+
+
+
+
+
+ Firmware Update is not available
+ Your board is not support web updater
+
+
\ No newline at end of file
diff --git a/include/global.h b/include/global.h
index 5c0ab8e..e85c377 100644
--- a/include/global.h
+++ b/include/global.h
@@ -22,6 +22,11 @@ extern const String SETTING_ID;
extern const bool DEBUG_BUILD;
+// SETUPモード OR NORMALモード
+extern const int OPERATING_MODE_NORMAL;
+extern const int OPERATING_MODE_SETUP;
+extern int OPERATING_MODE;
+
// --------------------------------------------------------------------
// デバイス周りの定数
// --------------------------------------------------------------------
diff --git a/include/http_setup.h b/include/http_setup.h
index 9f94b2f..75b0751 100644
--- a/include/http_setup.h
+++ b/include/http_setup.h
@@ -1,19 +1,5 @@
#include
-/* 機種依存部分 */
-
-/**
- * SETUP GET /
- */
-void http_send_setup_post_root_html();
-
-/**
- * SETUP POST /
- */
-void http_send_setup_get_root_html();
-
-/* 以下は共通 */
-
/**
* 初期化
*/
diff --git a/include/network/api/api_util.h b/include/network/api/api_util.h
new file mode 100644
index 0000000..9fa75ce
--- /dev/null
+++ b/include/network/api/api_util.h
@@ -0,0 +1,11 @@
+#include
+#include
+#include
+
+bool parseBooleanString(const String value);
+std::vector stringSplit(String value, String delimiter);
+String jsonToString(DynamicJsonDocument& json);
+String http_normal_ping_json();
+
+// millisecond -> 00:00:00 形式の日付文字列を返す
+String getTimeString(unsigned long ms);
diff --git a/include/network/api/basic_api.h b/include/network/api/basic_api.h
new file mode 100644
index 0000000..0fb7eac
--- /dev/null
+++ b/include/network/api/basic_api.h
@@ -0,0 +1,2 @@
+
+void http_api_basic_setup();
\ No newline at end of file
diff --git a/include/network/http_api_config.h b/include/network/api/v1/config.h
similarity index 50%
rename from include/network/http_api_config.h
rename to include/network/api/v1/config.h
index 6047ba5..3786b90 100644
--- a/include/network/http_api_config.h
+++ b/include/network/api/v1/config.h
@@ -1,3 +1,2 @@
-#include "network/http_api.h"
void http_api_config_setup();
\ No newline at end of file
diff --git a/include/network/http_api_config_backup.h b/include/network/api/v1/config_backup.h
similarity index 100%
rename from include/network/http_api_config_backup.h
rename to include/network/api/v1/config_backup.h
diff --git a/include/network/http_api_config_getset.h b/include/network/api/v1/config_getset.h
similarity index 99%
rename from include/network/http_api_config_getset.h
rename to include/network/api/v1/config_getset.h
index 4eb1bfe..ef3272e 100644
--- a/include/network/http_api_config_getset.h
+++ b/include/network/api/v1/config_getset.h
@@ -1,5 +1,4 @@
#include
-
#include
// Config SET API のエントリポイント
diff --git a/include/network/http_api_display.h b/include/network/api/v1/display.h
similarity index 50%
rename from include/network/http_api_display.h
rename to include/network/api/v1/display.h
index f102c7a..6a84803 100644
--- a/include/network/http_api_display.h
+++ b/include/network/api/v1/display.h
@@ -1,3 +1,2 @@
-#include "network/http_api.h"
void http_api_display_setup();
\ No newline at end of file
diff --git a/include/network/api/v1/getdata.h b/include/network/api/v1/getdata.h
new file mode 100644
index 0000000..5481058
--- /dev/null
+++ b/include/network/api/v1/getdata.h
@@ -0,0 +1 @@
+void http_api_getdata_setup();
\ No newline at end of file
diff --git a/include/network/api/v1/mhz19b.h b/include/network/api/v1/mhz19b.h
new file mode 100644
index 0000000..7ec1681
--- /dev/null
+++ b/include/network/api/v1/mhz19b.h
@@ -0,0 +1,2 @@
+
+void http_api_mhz_setup();
\ No newline at end of file
diff --git a/include/network/goto_setup_api.h b/include/network/goto_setup_api.h
new file mode 100644
index 0000000..e556f7f
--- /dev/null
+++ b/include/network/goto_setup_api.h
@@ -0,0 +1 @@
+void http_api_gotosetup_setup();
\ No newline at end of file
diff --git a/include/network/http_api.h b/include/network/http_api.h
deleted file mode 100644
index 954fb91..0000000
--- a/include/network/http_api.h
+++ /dev/null
@@ -1,10 +0,0 @@
-
-#ifdef ESP32
-#include
-typedef WebServer HTTPWEBSERVER;
-#endif
-
-#ifdef ESP8266
-#include
-typedef ESP8266WebServer HTTPWEBSERVER;
-#endif
diff --git a/include/network/http_api_base.h b/include/network/http_api_base.h
deleted file mode 100644
index 11d17bc..0000000
--- a/include/network/http_api_base.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "network/http_api.h"
-
-void http_api_base_setup();
\ No newline at end of file
diff --git a/include/network/http_api_base_json.h b/include/network/http_api_base_json.h
deleted file mode 100644
index ae38513..0000000
--- a/include/network/http_api_base_json.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#include
-
-String http_normal_not_found_html();
-
-String http_normal_data_json();
-
-String http_normal_ping_json();
diff --git a/include/network/http_api_mhz.h b/include/network/http_api_mhz.h
deleted file mode 100644
index 2e7ed7c..0000000
--- a/include/network/http_api_mhz.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "network/http_api.h"
-
-void http_api_mhz_setup();
\ No newline at end of file
diff --git a/include/network/http_api_util.h b/include/network/http_api_util.h
deleted file mode 100644
index f4c1ae3..0000000
--- a/include/network/http_api_util.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#include
-
-bool parseBooleanString(const String value);
-std::vector stringSplit(String value, String delimiter);
-String jsonToString(DynamicJsonDocument& json);
\ No newline at end of file
diff --git a/include/network/http_not_found.h b/include/network/http_not_found.h
new file mode 100644
index 0000000..ae89666
--- /dev/null
+++ b/include/network/http_not_found.h
@@ -0,0 +1,3 @@
+#include
+
+void http_not_found_setup();
\ No newline at end of file
diff --git a/include/network/http_utils.h b/include/network/http_utils.h
index 872c605..98328b0 100644
--- a/include/network/http_utils.h
+++ b/include/network/http_utils.h
@@ -1,3 +1,5 @@
+#include
+
// HTTP ヘッダ (HTTP 1.1 〜) text/htmlで送信する
void sendHttpHeader();
@@ -10,3 +12,6 @@ void sendHtmlHeader();
// HTTP REDIRECTヘッダを送信する。これを実行したあとは何も送れない
void sendHttpRedirectHeader(String url);
+
+// CORS リクエストに応答する（http OPTIONS リクエスト)
+void http_handle_cors();
\ No newline at end of file
diff --git a/include/network/stastics_api.h b/include/network/stastics_api.h
new file mode 100644
index 0000000..f3c5916
--- /dev/null
+++ b/include/network/stastics_api.h
@@ -0,0 +1 @@
+void http_api_stastics_setup();
\ No newline at end of file
diff --git a/include/network/http_web_config.h b/include/network/web/http_web_config.h
similarity index 100%
rename from include/network/http_web_config.h
rename to include/network/web/http_web_config.h
diff --git a/include/network/web/http_web_updater.h b/include/network/web/http_web_updater.h
new file mode 100644
index 0000000..13f2fe1
--- /dev/null
+++ b/include/network/web/http_web_updater.h
@@ -0,0 +1,3 @@
+#include
+
+void http_web_updater_setup();
\ No newline at end of file
diff --git a/include/network/webserver.h b/include/network/webserver.h
index 4f30a57..cc5f16a 100644
--- a/include/network/webserver.h
+++ b/include/network/webserver.h
@@ -1,9 +1,11 @@
#ifdef ESP32
#include
extern WebServer server;
+typedef WebServer HTTPWEBSERVER;
#endif
#ifdef ESP8266
#include
extern ESP8266WebServer server;
+typedef ESP8266WebServer HTTPWEBSERVER;
#endif
diff --git a/platformio.ini b/platformio.ini
index ec29a89..08eef68 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -10,6 +10,7 @@
[platformio]
description = "EnvBoyX"
+default_envs = esp32dev
[env]
extra_scripts =
diff --git a/src/ConfigClass.h b/src/ConfigClass.h
index 1f5f9ec..b828ddb 100644
--- a/src/ConfigClass.h
+++ b/src/ConfigClass.h
@@ -30,10 +30,10 @@ enum class ConfigValueType {
// APIにより起動中に設定を変更する際の後処理を表す
enum class RunningConfigChangeFlags {
- OK = 0, // 反映された。
- REBOOT_REQ = 1, // 反映されたが、再起動するまで反映されない
- DISPLAY_REDRAW_REQ = 2, // 反映されたが、液晶を再描画する必要がある
- MDNS_RESTART_REQ = 3, // 反映されたが、mDNSを再起動する必要がある
+ OK = 0, // 後処理は不要
+ REBOOT_REQ = 1, // 再起動するまで反映されない
+ DISPLAY_REDRAW_REQ = 2, // 液晶を再描画する必要がある
+ MDNS_RESTART_REQ = 3, // mDNSを再起動する必要がある
BLOCKED = 4, // その設定は変更できない
};
diff --git a/src/ConfigClass_metadata.cpp b/src/ConfigClass_metadata.cpp
index 4e273d4..2a1cbd4 100644
--- a/src/ConfigClass_metadata.cpp
+++ b/src/ConfigClass_metadata.cpp
@@ -27,14 +27,14 @@ void Config::loadMetadata() {
ConfigMeta meta;
meta.key = ConfigNames::SSID;
meta.type = ConfigValueType::String;
- meta.flags = RunningConfigChangeFlags::BLOCKED;
+ meta.flags = RunningConfigChangeFlags::REBOOT_REQ; // v46 BLOCKED to REBOOT_REQ
this->addMeta(meta);
}
{
ConfigMeta meta;
meta.key = ConfigNames::PASSWORD;
meta.type = ConfigValueType::String;
- meta.flags = RunningConfigChangeFlags::BLOCKED;
+ meta.flags = RunningConfigChangeFlags::REBOOT_REQ; // v46 BLOCKED to REBOOT_REQ
this->addMeta(meta);
}
{
diff --git a/src/global.cpp b/src/global.cpp
index 8a26d27..7ae69c4 100644
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -16,12 +16,13 @@ extern const String product_short = "EBX";
extern const bool DEBUG_BUILD = false;
// EnvBoyX
+// note: Also referenced by create_release.sh
extern const String product = "EnvBoyX";
-extern const String ver = "45"; // Major
+extern const String ver = "46"; // Major
extern const String minorVer = "0"; // Bugfix
extern const String ver_long = " Ver." + ver + "." + minorVer;
-// Setting version
+// Setting version (version number when settings changed)
extern const String SETTING_ID = "EBXCFG.v45";
// EnvBoyX Ver.53.0
@@ -63,3 +64,10 @@ Config *config;
// タイマー
// --------------------------------------------------------------------
TimerCall timer = TimerCall();
+
+// --------------------------------------------------------------------
+// 動作モード
+// --------------------------------------------------------------------
+extern const int OPERATING_MODE_NORMAL = 2;
+extern const int OPERATING_MODE_SETUP = 1;
+int OPERATING_MODE = 0;
diff --git a/src/main.cpp b/src/main.cpp
index 7e67f7f..7a25618 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -38,9 +38,12 @@ void setup()
isNormal = has_valid_config();
if (!isNormal) {
+ OPERATING_MODE = OPERATING_MODE_SETUP;
sectionlog(F("Entering setup mode."));
+
setup_setupmode();
} else {
+ OPERATING_MODE = OPERATING_MODE_NORMAL;
sectionlog(F("Entering normal mode."));
setup_normal();
diff --git a/src/network/api/http_api_util.cpp b/src/network/api/api_util.cpp
similarity index 68%
rename from src/network/api/http_api_util.cpp
rename to src/network/api/api_util.cpp
index bcf2440..053b283 100644
--- a/src/network/api/http_api_util.cpp
+++ b/src/network/api/api_util.cpp
@@ -4,6 +4,20 @@
#include "log.h"
+// millisecond -> 00:00:00 形式の日付文字列を返す
+String getTimeString(unsigned long ms) {
+ unsigned long second = ms / 1000;
+ unsigned long minute = second / 60;
+
+ int sec = second % 60;
+ int min = (second / 60) % 60;
+ int hr = minute / 60;
+
+ char buf[15];
+ snprintf (buf, sizeof buf,"%02d:%02d:%02d", hr, min, sec);
+ return String(buf);
+}
+
String jsonToString(DynamicJsonDocument& json) {
String jsonStr;
serializeJson(json, jsonStr);
diff --git a/src/network/api/basic_api.cpp b/src/network/api/basic_api.cpp
new file mode 100644
index 0000000..fb4e1d3
--- /dev/null
+++ b/src/network/api/basic_api.cpp
@@ -0,0 +1,60 @@
+#include
+#include
+
+#include "config.h"
+
+#include "log.h"
+#include "global.h"
+#include "display/display.h"
+
+#include "network/webserver.h"
+#include "network/api/basic_api.h"
+#include "network/api/api_util.h"
+#include "network/http_utils.h"
+
+extern HTTPWEBSERVER server;
+
+
+String http_normal_ping_json() {
+
+ unsigned long ms = millis();
+ String timeString = getTimeString(ms);
+
+ DynamicJsonDocument doc(2000);
+ doc["product"] = product;
+ doc["uptime"] = timeString;
+ doc["uptimeMills"] = ms;
+ doc["majorVer"] = ver;
+ doc["minorVer"] = minorVer;
+ doc["settingId"] = SETTING_ID;
+
+ if (OPERATING_MODE == OPERATING_MODE_NORMAL) {
+ doc["mode"] = "NORMAL";
+ } else if (OPERATING_MODE == OPERATING_MODE_SETUP) {
+ doc["mode"] = "SETUP";
+ } else {
+ doc["mode"] = "INVALID";
+ }
+
+ String json;
+ serializeJson(doc, json);
+
+ httplog(json);
+ return json;
+}
+
+void http_handle_ping() {
+ sendHttpHeader(MimeType::JSON);
+ String message = http_normal_ping_json();
+ server.sendContent(message);
+}
+
+void http_api_basic_setup() {
+ server.on ( "/ping", HTTP_GET, http_handle_ping);
+
+ // Config web ではPingが最初に実行されるので、ここにOPTION CORSの問い合わせが飛んでくる
+ // 一度答えればキャッシュされるようなので他のAPIには不要
+ server.on ( "/ping", HTTP_OPTIONS, http_handle_cors);
+
+ apilog("Basic API initialized.");
+}
\ No newline at end of file
diff --git a/src/network/api/goto_setup_api.cpp b/src/network/api/goto_setup_api.cpp
new file mode 100644
index 0000000..3d81c7a
--- /dev/null
+++ b/src/network/api/goto_setup_api.cpp
@@ -0,0 +1,35 @@
+#include
+#include
+
+#include "config.h"
+
+#include "log.h"
+#include "global.h"
+#include "display/display.h"
+
+#include "network/webserver.h"
+#include "network/api/basic_api.h"
+#include "network/api/api_util.h"
+#include "network/http_utils.h"
+
+extern HTTPWEBSERVER server;
+
+void http_handle_goto_setup() {
+
+ remove_configure_flag_file();
+
+ DynamicJsonDocument json(200);
+ json["command"] = "GOTO_SETUP";
+ json["success"] = true;
+ json["msg"] = "OK. Entering setup mode at next boot.";
+
+ String jsonStr;
+ serializeJson(json, jsonStr);
+ server.send(200, MimeType::JSON, jsonStr);
+}
+
+void http_api_gotosetup_setup() {
+ server.on ( "/goto_setup", HTTP_POST, http_handle_goto_setup );
+
+ apilog("Goto Setup API initialized.");
+}
\ No newline at end of file
diff --git a/src/network/api/http_api_base.cpp b/src/network/api/http_api_base.cpp
deleted file mode 100644
index bc29246..0000000
--- a/src/network/api/http_api_base.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-#include
-#include
-
-#include "config.h"
-
-#include "log.h"
-#include "global.h"
-#include "display/display.h"
-#include "network/http_api.h"
-#include "network/http_api_base_json.h"
-
-extern HTTPWEBSERVER server;
-
-void http_handle_data() {
- String message = http_normal_data_json();
- server.send(200, MimeType::JSON, message);
-}
-
-void http_handle_ping() {
- String message = http_normal_ping_json();
- server.send(200, MimeType::JSON, message);
-}
-
-void http_handle_stastics() {
- server.send(200, MimeType::JSON, stasticsJSON);
-}
-
-void http_handle_goto_setup() {
-
- remove_configure_flag_file();
-
- DynamicJsonDocument json(200);
- json["command"] = "GOTO_SETUP";
- json["success"] = true;
- json["msg"] = "OK. Entering setup mode at next boot.";
-
- String jsonStr;
- serializeJson(json, jsonStr);
- server.send(200, MimeType::JSON, jsonStr);
-}
-
-void http_handle_not_found() {
- String message = http_normal_not_found_html();
- server.send(404, MimeType::HTML, message);
-}
-
-void http_api_base_setup() {
- server.on ( "/ping", HTTP_GET, http_handle_ping);
- server.on ( "/", HTTP_GET, http_handle_data );
- server.on ( "/stastics", HTTP_GET, http_handle_stastics );
- server.on ( "/goto_setup", HTTP_POST, http_handle_goto_setup );
-
- server.onNotFound ( http_handle_not_found );
- apilog("API Base initialized.");
-}
\ No newline at end of file
diff --git a/src/network/api/stastics_api.cpp b/src/network/api/stastics_api.cpp
new file mode 100644
index 0000000..6cb4155
--- /dev/null
+++ b/src/network/api/stastics_api.cpp
@@ -0,0 +1,25 @@
+#include
+#include
+
+#include "config.h"
+
+#include "log.h"
+#include "global.h"
+#include "display/display.h"
+
+#include "network/webserver.h"
+#include "network/api/basic_api.h"
+#include "network/api/api_util.h"
+#include "network/http_utils.h"
+
+extern HTTPWEBSERVER server;
+
+void http_handle_stastics() {
+ server.send(200, MimeType::JSON, stasticsJSON);
+}
+
+void http_api_stastics_setup() {
+ server.on ( "/stastics", HTTP_GET, http_handle_stastics );
+
+ apilog("Stastics API initialized.");
+}
diff --git a/src/network/api/http_api_config.cpp b/src/network/api/v1/config.cpp
similarity index 51%
rename from src/network/api/http_api_config.cpp
rename to src/network/api/v1/config.cpp
index d7e8979..c09dd40 100644
--- a/src/network/api/http_api_config.cpp
+++ b/src/network/api/v1/config.cpp
@@ -4,38 +4,47 @@
#include "log.h"
#include "global.h"
#include "config.h"
-#include "network/http_api.h"
-#include "network/http_api_util.h"
-#include "network/http_api_config_getset.h"
-#include "network/http_api_config_backup.h"
#include "sensors/mhz19_uart.h"
+#include "network/webserver.h"
+#include "network/api/api_util.h"
+#include "network/api/v1/config_getset.h"
+#include "network/api/v1/config_backup.h"
+#include "network//http_utils.h"
+
extern HTTPWEBSERVER server;
void _get_config() {
+ sendHttpHeader(MimeType::JSON);
+
String keys = server.arg("key");
std::vector keyArray = stringSplit(keys, ",");
- DynamicJsonDocument json = create_config_json(keyArray);
+ DynamicJsonDocument json(1200);
json["command"] = "CONFIG_GET";
json["success"] = true;
+ json["config"] = create_config_json(keyArray);
String jsonStr;
serializeJson(json, jsonStr);
- server.send(200, MimeType::JSON, jsonStr);
+ server.sendContent(jsonStr);
}
void _set_config() {
+ sendHttpHeader(MimeType::JSON);
+
String jsonStr = updateConfig();
- server.send(200, MimeType::JSON, jsonStr);
+ server.sendContent(jsonStr);
}
void _revert_config() {
+ sendHttpHeader(MimeType::JSON);
+
// revertすると何が変更されるかわからないので、全ての反映を実行
reflectConfigAll();
@@ -46,27 +55,36 @@ void _revert_config() {
String jsonStr;
serializeJson(json, jsonStr);
- server.send(200, MimeType::JSON, jsonStr);
+ server.sendContent(jsonStr);
}
void _commit_config() {
+
DynamicJsonDocument json(100);
json["command"] = "CONFIG_COMMIT";
json["success"] = true;
save_config();
+ sendHttpHeader(MimeType::JSON);
+
String jsonStr;
serializeJson(json, jsonStr);
- server.send(200, MimeType::JSON, jsonStr);
+ server.sendContent(jsonStr);
}
void _backup_config() {
+
+ sendHttpHeader(MimeType::TEXT);
+
String ret = http_api_backup_config();
- server.send(200, MimeType::TEXT, ret);
+ server.sendContent(ret);
}
void _factory_reset() {
+
+ sendHttpHeader(MimeType::JSON);
+
DynamicJsonDocument json(8000);
apilog("FACTORY RESET INITIATED");
@@ -79,16 +97,21 @@ void _factory_reset() {
apilog("FACTORY RESET DONE");
- server.send(200, MimeType::JSON, jsonToString(json));
+ server.sendContent(jsonToString(json));
}
void http_api_config_setup() {
- server.on ( "/config", HTTP_GET, _get_config );
- server.on ( "/config", HTTP_POST, _set_config );
- server.on ( "/config/revert", HTTP_POST, _revert_config );
- server.on ( "/config/commit", HTTP_POST, _commit_config );
- server.on ( "/config/backup", HTTP_GET, _backup_config );
- server.on ( "/config/factory-reset", HTTP_POST, _factory_reset );
+ server.on ( "/api/v1/config", HTTP_GET, _get_config );
+ server.on ( "/api/v1/config", HTTP_POST, _set_config );
+ server.on ( "/api/v1/config/revert", HTTP_POST, _revert_config );
+ server.on ( "/api/v1/config/commit", HTTP_POST, _commit_config );
+ server.on ( "/api/v1/config/backup", HTTP_GET, _backup_config );
+ server.on ( "/api/v1/config/factory-reset", HTTP_POST, _factory_reset );
+ server.on ( "/api/v1/config", HTTP_OPTIONS, http_handle_cors);
+ server.on ( "/api/v1/config/revert", HTTP_POST, http_handle_cors );
+ server.on ( "/api/v1/config/commit", HTTP_OPTIONS, http_handle_cors );
+ server.on ( "/api/v1/config/backup", HTTP_OPTIONS, http_handle_cors );
+
apilog("API Config initialized.");
}
\ No newline at end of file
diff --git a/src/network/api/http_api_config_backup.cpp b/src/network/api/v1/config_backup.cpp
similarity index 85%
rename from src/network/api/http_api_config_backup.cpp
rename to src/network/api/v1/config_backup.cpp
index eb9f87e..ecbb076 100644
--- a/src/network/api/http_api_config_backup.cpp
+++ b/src/network/api/v1/config_backup.cpp
@@ -21,7 +21,7 @@ String http_api_backup_config() {
ret += keys;
ret += "\"";
- ret += " http://" + config->get(ConfigNames::MDNS) + ".local/config";
+ ret += " http://" + config->get(ConfigNames::MDNS) + ".local/api/v1/config";
return ret;
}
diff --git a/src/network/api/http_api_config_getset.cpp b/src/network/api/v1/config_getset.cpp
similarity index 94%
rename from src/network/api/http_api_config_getset.cpp
rename to src/network/api/v1/config_getset.cpp
index 6b96c18..53806fc 100644
--- a/src/network/api/http_api_config_getset.cpp
+++ b/src/network/api/v1/config_getset.cpp
@@ -10,8 +10,8 @@
#include "mdns_client.h"
-#include "network/http_api.h"
-#include "network/http_api_util.h"
+#include "network/webserver.h"
+#include "network/api/api_util.h"
#include "display/display.h"
extern unsigned int CONF_JSON_SIZE;
@@ -97,6 +97,7 @@ void _reflectConfig(ConfigHookFlags& flags, bool all = false) {
if (all || flags.needMDnsRestart) {
apilog("Exec mDNS restart.");
+ apilog("New mDNS name restart." + config->get(ConfigNames::MDNS));
mdns_hostname_change(config->get(ConfigNames::MDNS));
}
}
@@ -146,9 +147,9 @@ String updateConfig() {
json["msgs"] = msgs;
if (flags.configFailed) {
- json["message"] = "Some error detected. Check msg.";
+ json["message"] = "Some error detected. Check msgs.";
} else {
- json["message"] = "Don't forget calling /config/commit.";
+ json["message"] = "Don't forget calling config/commit. API";
}
json.shrinkToFit();
diff --git a/src/network/api/http_api_display.cpp b/src/network/api/v1/display.cpp
similarity index 84%
rename from src/network/api/http_api_display.cpp
rename to src/network/api/v1/display.cpp
index dbc4a1b..c279b5c 100644
--- a/src/network/api/http_api_display.cpp
+++ b/src/network/api/v1/display.cpp
@@ -4,7 +4,7 @@
#include "log.h"
#include "global.h"
#include "display/display.h"
-#include "network/http_api.h"
+#include "network/webserver.h"
extern HTTPWEBSERVER server;
@@ -43,8 +43,8 @@ void http_handle_brightness() {
}
void http_api_display_setup() {
- server.on ( "/brightness", HTTP_GET, http_handle_brightness );
- server.on ( "/display", HTTP_GET, http_handle_power );
+ server.on ( "/api/v1/brightness", HTTP_GET, http_handle_brightness );
+ server.on ( "/api/v1/display", HTTP_GET, http_handle_power );
apilog("API Display initialized.");
}
\ No newline at end of file
diff --git a/src/network/api/http_api_base_json.cpp b/src/network/api/v1/getdata.cpp
similarity index 55%
rename from src/network/api/http_api_base_json.cpp
rename to src/network/api/v1/getdata.cpp
index da54b8f..478a27a 100644
--- a/src/network/api/http_api_base_json.cpp
+++ b/src/network/api/v1/getdata.cpp
@@ -1,31 +1,21 @@
#include
#include
+#include "config.h"
+
#include "log.h"
#include "global.h"
+#include "display/display.h"
+#include "network/webserver.h"
+#include "network/api/api_util.h"
-String http_normal_not_found_html() {
- String message = "File Not Found\n\n";
- return message;
-}
-
-String get_time_string(unsigned long ms) {
- unsigned long second = ms / 1000;
- unsigned long minute = second / 60;
-
- int sec = second % 60;
- int min = (second / 60) % 60;
- int hr = minute / 60;
- char buf[15];
- snprintf (buf, sizeof buf,"%02d:%02d:%02d", hr, min, sec);
- return String(buf);
-}
+extern HTTPWEBSERVER server;
String http_normal_data_json() {
unsigned long ms = millis();
- String timeString = get_time_string(ms);
+ String timeString = getTimeString(ms);
char temp[10], hum[10], pres[10];
char lux[10], luxIr[10],ppm[10];
@@ -49,19 +39,13 @@ String http_normal_data_json() {
return json;
}
-String http_normal_ping_json() {
-
- unsigned long ms = millis();
- String timeString = get_time_string(ms);
-
- DynamicJsonDocument doc(2000);
- doc["product"] = product;
- doc["uptime"] = timeString;
- doc["uptimeMills"] = ms;
+void http_handle_data() {
+ String message = http_normal_data_json();
+ server.send(200, MimeType::JSON, message);
+}
- String json;
- serializeJson(doc, json);
+void http_api_getdata_setup() {
+ server.on ( "/api/v1/getdata", HTTP_GET, http_handle_data );
- httplog(json);
- return json;
-}
+ apilog("API getdata initialized.");
+}
\ No newline at end of file
diff --git a/src/network/api/http_api_mhz.cpp b/src/network/api/v1/mhz19b.cpp
similarity index 86%
rename from src/network/api/http_api_mhz.cpp
rename to src/network/api/v1/mhz19b.cpp
index 817f60b..1a37261 100644
--- a/src/network/api/http_api_mhz.cpp
+++ b/src/network/api/v1/mhz19b.cpp
@@ -3,8 +3,8 @@
#include "log.h"
#include "global.h"
-#include "network/http_api.h"
-#include "network/http_api_util.h"
+#include "network/webserver.h"
+#include "network/api/api_util.h"
#include "sensors/mhz19_uart.h"
extern HTTPWEBSERVER server;
@@ -72,9 +72,9 @@ void _mhz_zero_calibration() {
}
void http_api_mhz_setup() {
- server.on ( "/mhz19b/abc", HTTP_GET, _get_mhz_abc );
- server.on ( "/mhz19b/abc", HTTP_POST, _set_mhz_abc );
- server.on ( "/mhz19b/zeroCalibration", HTTP_POST, _mhz_zero_calibration );
+ server.on ( "/api/v1/mhz19b/abc", HTTP_GET, _get_mhz_abc );
+ server.on ( "/api/v1/mhz19b/abc", HTTP_POST, _set_mhz_abc );
+ server.on ( "/api/v1/mhz19b/zeroCalibration", HTTP_POST, _mhz_zero_calibration );
apilog("API MHZ-19B initialized.");
}
\ No newline at end of file
diff --git a/src/network/http_normal_web.cpp b/src/network/http_normal_web.cpp
index 5af786f..64f5748 100644
--- a/src/network/http_normal_web.cpp
+++ b/src/network/http_normal_web.cpp
@@ -7,25 +7,36 @@
#include "http_normal.h"
-#include "network/http_api.h"
-#include "network/http_api_base.h"
-#include "network/http_api_display.h"
-#include "network/http_api_mhz.h"
-#include "network/http_api_config.h"
-
-#include "network/http_web_config.h"
-
+#include "network/webserver.h"
+#include "network/http_not_found.h"
+#include "network/stastics_api.h"
+#include "network/goto_setup_api.h"
+#include "network/api/basic_api.h"
+#include "network/api/v1/display.h"
+#include "network/api/v1/mhz19b.h"
+#include "network/api/v1/config.h"
+#include "network/api/v1/getdata.h"
+
+#include "network/web/http_web_config.h"
+#include "network/web/http_web_updater.h"
extern HTTPWEBSERVER server;
void http_setup_normal() {
httplog("HTTP web server initializing");
+ http_not_found_setup();
+ http_api_gotosetup_setup();
+ http_api_stastics_setup();
+
+ http_api_basic_setup();
http_api_display_setup();
- http_api_base_setup();
+ http_api_getdata_setup();
http_api_mhz_setup();
http_api_config_setup();
+
http_web_config_setup();
+ http_web_updater_setup();
server.begin();
httplog("HTTP web server initialized");
diff --git a/src/network/http_not_found.cpp b/src/network/http_not_found.cpp
new file mode 100644
index 0000000..9f37064
--- /dev/null
+++ b/src/network/http_not_found.cpp
@@ -0,0 +1,29 @@
+#include
+#include
+
+#include "config.h"
+
+#include "global.h"
+
+#include "network/http_utils.h"
+#include "network/webserver.h"
+
+extern HTTPWEBSERVER server;
+
+void http_handle_not_found() {
+ // HEADER
+ server.sendContent("HTTP/1.1 404 FILE NOT FOUND\r\n");
+ server.sendContent("Content-Type: text/plain\r\n");
+ if (DEBUG_BUILD) {
+ server.sendContent("Access-Control-Allow-Origin: *\r\n");
+ }
+ server.sendContent("\r\n");
+
+ // CONTENT
+ String message = "404 File Not Found\n\n";
+ server.sendContent(message);
+}
+
+void http_not_found_setup() {
+ server.onNotFound ( http_handle_not_found );
+}
\ No newline at end of file
diff --git a/src/network/http_setup_web.cpp b/src/network/http_setup_web.cpp
index 4efce1c..c81c493 100644
--- a/src/network/http_setup_web.cpp
+++ b/src/network/http_setup_web.cpp
@@ -1,109 +1,36 @@
+
#include
#include "log.h"
#include "global.h"
#include "config.h"
-#include "http_setup.h"
-
-#include "halt.h"
-#include "utils.h"
-
-#include "embed/style_css.h"
+#include "http_normal.h"
#include "network/webserver.h"
-#include "network/http_utils.h"
-
-void http_setup_post_root_error_content(std::vector> errors) {
-
- sendHttpHeader();
- sendHtmlHeader();
-
- String html = "";
- html += "";
- html += "" + product + " Settings (" + SETTING_ID + ")
";
- html += "以下の設定値が正しくありません。
";
- html += "";
- for (auto& error: errors) {
- html += "- " + error.first + " = '" + error.second + "'
";
- }
- html += "
";
- html += "設定にエラーがあるため、保存できませんでした。
";
- html += "以下のリンクから再設定を行ってください。
";
- html += "
";
- html += "再設定";
- html += "";
- html += "