From 618037ed95e7cc7212b669d59d2b752d1c117255 Mon Sep 17 00:00:00 2001
From: Stephan Hadinger <stephan.hadinger@gmail.com>
Date: Sat, 11 Nov 2023 16:09:00 +0100
Subject: [PATCH 1/4] Partition Wizard can be loaded dynamically

---
 CHANGELOG.md                                  |   1 +
 lib/libesp32/berry/src/be_bytecode.c          |  35 ++++----
 lib/libesp32/berry/src/be_bytecode.h          |   1 +
 .../Partition_Wizard/partition_wizard.bec     | Bin 0 -> 16720 bytes
 .../xdrv_23_zigbee_7_6_flash_fs.ino           |   8 +-
 .../xdrv_52_0_berry_struct.ino                |   3 +
 .../tasmota_xdrv_driver/xdrv_52_9_berry.ino   |  84 ++++++++++++++++++
 7 files changed, 116 insertions(+), 16 deletions(-)
 create mode 100644 tasmota/berry/modules/Partition_Wizard/partition_wizard.bec

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 38e54d0b1679..2c7ab8cec43c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ All notable changes to this project will be documented in this file.
 - NeoPool sensor delta trigger (command ``NPTelePeriod``) (#19973)
 - NeoPool store settings on unified file system (#19973)
 - NeoPool command ``NPBoost`` (#19973)
+- Partition Wizard can be loaded dynamically
 
 ### Breaking Changed
 
diff --git a/lib/libesp32/berry/src/be_bytecode.c b/lib/libesp32/berry/src/be_bytecode.c
index 133a96618075..a636567facf1 100644
--- a/lib/libesp32/berry/src/be_bytecode.c
+++ b/lib/libesp32/berry/src/be_bytecode.c
@@ -596,6 +596,24 @@ void load_global_info(bvm *vm, void *fp)
     be_global_release_space(vm);
 }
 
+bclosure* be_bytecode_load_from_fs(bvm *vm, void *fp)
+{
+    int version = load_head(fp);
+    if (version == BYTECODE_VERSION) {
+        bclosure *cl = be_newclosure(vm, 0);
+        var_setclosure(vm->top, cl);
+        be_stackpush(vm);
+        load_global_info(vm, fp);
+        load_proto(vm, fp, &cl->proto, -1, version);
+        be_stackpop(vm, 2); /* pop the closure and list */
+        be_fclose(fp);
+        return cl;
+    }
+    bytecode_error(vm, be_pushfstring(vm,
+        "invalid bytecode version."));
+    return NULL;
+}
+
 bclosure* be_bytecode_load(bvm *vm, const char *filename)
 {
     void *fp = be_fopen(filename, "rb");
@@ -603,22 +621,9 @@ bclosure* be_bytecode_load(bvm *vm, const char *filename)
         bytecode_error(vm, be_pushfstring(vm,
             "can not open file '%s'.", filename));
     } else {
-        int version = load_head(fp);
-        if (version == BYTECODE_VERSION) {
-            bclosure *cl = be_newclosure(vm, 0);
-            var_setclosure(vm->top, cl);
-            be_stackpush(vm);
-            load_global_info(vm, fp);
-            load_proto(vm, fp, &cl->proto, -1, version);
-            be_stackpop(vm, 2); /* pop the closure and list */
-            be_fclose(fp);
-            return cl;
-        }
-        bytecode_error(vm, be_pushfstring(vm,
-            "invalid bytecode version '%s'.", filename));
+        return be_bytecode_load_from_fs(vm, fp);
     }
-    bytecode_error(vm, be_pushfstring(vm,
-        "invalid bytecode file '%s'.", filename));
     return NULL;
 }
+
 #endif /* BE_USE_BYTECODE_LOADER */
diff --git a/lib/libesp32/berry/src/be_bytecode.h b/lib/libesp32/berry/src/be_bytecode.h
index 08affe1decfa..61223952c6ba 100644
--- a/lib/libesp32/berry/src/be_bytecode.h
+++ b/lib/libesp32/berry/src/be_bytecode.h
@@ -12,6 +12,7 @@
 
 void be_bytecode_save(bvm *vm, const char *filename, bproto *proto);
 bclosure* be_bytecode_load(bvm *vm, const char *filename);
+bclosure* be_bytecode_load_from_fs(bvm *vm, void *fp);
 bbool be_bytecode_check(const char *path);
 
 #endif
diff --git a/tasmota/berry/modules/Partition_Wizard/partition_wizard.bec b/tasmota/berry/modules/Partition_Wizard/partition_wizard.bec
new file mode 100644
index 0000000000000000000000000000000000000000..e6e82953351dc4f9cefc1fa6255d1485af6aa58d
GIT binary patch
literal 16720
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
P_>vu8x{vrY7!&_LSNt4y

literal 0
HcmV?d00001

diff --git a/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_7_6_flash_fs.ino b/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_7_6_flash_fs.ino
index 0554c8de4b67..e555f7d5e0f7 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_7_6_flash_fs.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_7_6_flash_fs.ino
@@ -17,7 +17,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifdef USE_ZIGBEE
+#if defined(USE_ZIGBEE) || defined(USE_BERRY)
 
 #ifdef ESP32
 #include <vfs_api.h>
@@ -43,6 +43,12 @@ public:
     _seek = 0;
   }
 
+  FlashFileImpl(const void* buf, size_t len) {
+    _buf = (const char*)buf;
+    _len = len;
+    _seek = 0;
+  }
+
   virtual ~FlashFileImpl() {}
 
   size_t write(const uint8_t *buf, size_t size) {
diff --git a/tasmota/tasmota_xdrv_driver/xdrv_52_0_berry_struct.ino b/tasmota/tasmota_xdrv_driver/xdrv_52_0_berry_struct.ino
index ba32bd06f5a3..04dfede3409e 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_52_0_berry_struct.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_52_0_berry_struct.ino
@@ -93,6 +93,9 @@ public:
   int32_t timeout = 0;                  // Berry heartbeat timeout, preventing code to run for too long. `0` means not enabled
   bool rules_busy = false;              // are we already processing rules, avoid infinite loop
   bool web_add_handler_done = false;    // did we already sent `web_add_handler` event
+#ifdef USE_BERRY_PARTITION_WIZARD
+  bool partition_wizard_loaded = false; // did we already load Parition_Wizard
+#endif // USE_BERRY_PARTITION_WIZARD
   bool autoexec_done = false;           // do we still need to load 'autoexec.be'
   bool repl_active = false;             // is REPL running (activates log recording)
   // output log is stored as a LinkedList of buffers
diff --git a/tasmota/tasmota_xdrv_driver/xdrv_52_9_berry.ino b/tasmota/tasmota_xdrv_driver/xdrv_52_9_berry.ino
index 0a356e59e5a1..49938e0bd692 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_52_9_berry.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_52_9_berry.ino
@@ -23,6 +23,9 @@
 #define XDRV_52             52
 
 #include <berry.h>
+extern "C" {
+  #include "be_bytecode.h"
+}
 #include "berry_tasmota.h"
 #ifdef USE_MATTER_DEVICE
   #include "berry_matter.h"
@@ -757,6 +760,79 @@ void HandleBerryConsole(void)
   WSContentStop();
 }
 
+// Display a Button to dynamically load the Partition Wizard
+void HandleBerryPartiionWizardLoaderButton(void) {
+  WSContentSend_P("<form id=but_part_mgr style='display: block;' action='tapp' method='get'><input type='hidden' name='n' value='Partition_Wizard'/><button>[Load Partition Wizard]</button></form><p></p>");
+}
+
+#define PARTITION_WIZARD_URL      "http://ota.tasmota.com/tapp/partition_wizard.bec"
+
+void HandleBerryPartitionWizardLoader(void) {
+  if (BerryBECLoader(PARTITION_WIZARD_URL)) {
+    // All good, redirect
+    Webserver->sendHeader("Location", "/part_wiz", true);
+    Webserver->send(302, "text/plain", "");
+    berry.partition_wizard_loaded = true;
+  } else {
+    Webserver->sendHeader("Location", "/mn?", true);
+    Webserver->send(302, "text/plain", "");
+  }
+}
+
+// return true if successful
+bool BerryBECLoader(const char * url) {
+  bvm *vm = berry.vm;
+
+  HTTPClientLight cl;
+  cl.setUserAgent(USE_BERRY_WEBCLIENT_USERAGENT);
+  cl.setConnectTimeout(USE_BERRY_WEBCLIENT_TIMEOUT);   // set default timeout
+  cl.setFollowRedirects(HTTPC_STRICT_FOLLOW_REDIRECTS);
+
+  if (!cl.begin(url)) {
+    AddLog(LOG_LEVEL_INFO, "BRY: unable to load URL '%s'", url);
+    // cl.end();
+    return false;
+  }
+  
+  uint32_t http_connect_time = millis();
+  int32_t httpCode = cl.GET();
+  if (httpCode != 200) {
+    AddLog(LOG_LEVEL_INFO, "BRY: unable to load URL '%s' code %i", url, httpCode);
+    // cl.end();
+    return false;
+  }
+
+  int32_t sz = cl.getSize();
+  AddLog(LOG_LEVEL_DEBUG, "BRY: Response http_code %i size %i bytes in %i ms", httpCode, sz, millis() - http_connect_time);
+  // abort if we exceed 32KB size, things will not go well otherwise
+  if (sz >= 32767 || sz <= 0) {
+    AddLog(LOG_LEVEL_DEBUG, "BRY: Response size too big %i bytes", sz);
+    return false;
+  }
+
+  // create a bytes object at top of stack.
+  // the streamwriter knows how to get it. 
+  uint8_t * buf = (uint8_t*) be_pushbytes(vm, nullptr, sz);
+  StreamBeBytesWriter memory_writer(vm);
+  int32_t written = cl.writeToStream(&memory_writer);
+  cl.end();  // free allocated memory ~16KB
+
+  size_t loaded_sz = 0;
+  const void * loaded_buf = be_tobytes(vm, -1, &loaded_sz);
+
+  FlashFileImplPtr fp = FlashFileImplPtr(new FlashFileImpl(loaded_buf, loaded_sz));
+  File * f_ptr = new File(fp);   // we need to allocate dynamically because be_close calls `delete` on it
+  bclosure* loaded_bec = be_bytecode_load_from_fs(vm, f_ptr);
+  be_pop(vm, 1);
+  if (loaded_bec != NULL) {
+    be_pushclosure(vm, loaded_bec);
+    be_call(vm, 0);
+    be_pop(vm, 1);
+  }
+   be_gc_collect(vm);   // force a GC to free the buffer now
+  return true;
+}
+
 #endif // USE_WEBSERVER
 
 /*********************************************************************************************\
@@ -839,6 +915,11 @@ bool Xdrv52(uint32_t function)
         XdrvMailbox.index++;
       } else {
         WSContentSend_P(HTTP_BTN_BERRY_CONSOLE);
+#ifdef USE_BERRY_PARTITION_WIZARD
+      if (!berry.partition_wizard_loaded) {
+        HandleBerryPartiionWizardLoaderButton();
+      }
+#endif // USE_BERRY_PARTITION_WIZARD
         callBerryEventDispatcher(PSTR("web_add_button"), nullptr, 0, nullptr);
         callBerryEventDispatcher(PSTR("web_add_console_button"), nullptr, 0, nullptr);
       }
@@ -858,6 +939,9 @@ bool Xdrv52(uint32_t function)
         berry.web_add_handler_done = true;
       }
       WebServer_on(PSTR("/bc"), HandleBerryConsole);
+#ifdef USE_BERRY_PARTITION_WIZARD
+      Webserver->on("/tapp", HTTP_GET, HandleBerryPartitionWizardLoader);
+#endif // USE_BERRY_PARTITION_WIZARD
       break;
 #endif // USE_WEBSERVER
     case FUNC_SAVE_BEFORE_RESTART:

From 0713cd14872045c7049a71d44e6216e988af88ac Mon Sep 17 00:00:00 2001
From: Stephan Hadinger <stephan.hadinger@gmail.com>
Date: Sat, 11 Nov 2023 16:15:43 +0100
Subject: [PATCH 2/4] Centralize config

---
 tasmota/my_user_config.h                        | 2 ++
 tasmota/tasmota_xdrv_driver/xdrv_52_9_berry.ino | 4 +---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index f8e3fd4a1086..7e918a675fd1 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -1141,6 +1141,8 @@
                                                  // Note that only one cipher is enabled: ECDHE_RSA_WITH_AES_128_GCM_SHA256 which is very commonly used and highly secure
     #define USE_BERRY_WEBCLIENT_USERAGENT  "TasmotaClient" // default user-agent used, can be changed with `wc.set_useragent()`
     #define USE_BERRY_WEBCLIENT_TIMEOUT  2000    // Default timeout in milliseconds
+    #define USE_BERRY_PARTITION_WIZARD           // Add a button to dynamically load the Partion Wizard from a bec file online (+1.3KB Flash)
+    #define USE_BERRY_PARTITION_WIZARD_URL      "http://ota.tasmota.com/tapp/partition_wizard.bec"
   #define USE_BERRY_TCPSERVER                    // Enable TCP socket server (+0.6k)
   // #define USE_BERRY_ULP                          // Enable ULP (Ultra Low Power) support (+4.9k)
   // Berry crypto extensions below:
diff --git a/tasmota/tasmota_xdrv_driver/xdrv_52_9_berry.ino b/tasmota/tasmota_xdrv_driver/xdrv_52_9_berry.ino
index 49938e0bd692..324684a9cf93 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_52_9_berry.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_52_9_berry.ino
@@ -765,10 +765,8 @@ void HandleBerryPartiionWizardLoaderButton(void) {
   WSContentSend_P("<form id=but_part_mgr style='display: block;' action='tapp' method='get'><input type='hidden' name='n' value='Partition_Wizard'/><button>[Load Partition Wizard]</button></form><p></p>");
 }
 
-#define PARTITION_WIZARD_URL      "http://ota.tasmota.com/tapp/partition_wizard.bec"
-
 void HandleBerryPartitionWizardLoader(void) {
-  if (BerryBECLoader(PARTITION_WIZARD_URL)) {
+  if (BerryBECLoader(USE_BERRY_PARTITION_WIZARD_URL)) {
     // All good, redirect
     Webserver->sendHeader("Location", "/part_wiz", true);
     Webserver->send(302, "text/plain", "");

From 4f45adf84ba942eddc9bd1cd4f8be2a48e746d8b Mon Sep 17 00:00:00 2001
From: Stephan Hadinger <stephan.hadinger@gmail.com>
Date: Sat, 11 Nov 2023 19:08:57 +0100
Subject: [PATCH 3/4] Don't display duplicate buttons

---
 tasmota/tasmota_xdrv_driver/xdrv_52_9_berry.ino | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/tasmota/tasmota_xdrv_driver/xdrv_52_9_berry.ino b/tasmota/tasmota_xdrv_driver/xdrv_52_9_berry.ino
index 324684a9cf93..61e95b85bf53 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_52_9_berry.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_52_9_berry.ino
@@ -25,6 +25,7 @@
 #include <berry.h>
 extern "C" {
   #include "be_bytecode.h"
+  #include "be_var.h"
 }
 #include "berry_tasmota.h"
 #ifdef USE_MATTER_DEVICE
@@ -762,7 +763,15 @@ void HandleBerryConsole(void)
 
 // Display a Button to dynamically load the Partition Wizard
 void HandleBerryPartiionWizardLoaderButton(void) {
-  WSContentSend_P("<form id=but_part_mgr style='display: block;' action='tapp' method='get'><input type='hidden' name='n' value='Partition_Wizard'/><button>[Load Partition Wizard]</button></form><p></p>");
+  bvm * vm = berry.vm;
+  static const char PARTITION_WIZARD_NAME[] = "partition_wizard";
+  if (!berry.partition_wizard_loaded) {
+    if (!be_global_find(vm, be_newstr(vm, PARTITION_WIZARD_NAME)) < 0) {    // the global name `partition_wizard` doesn't exist
+      WSContentSend_P("<form id=but_part_mgr style='display: block;' action='tapp' method='get'><input type='hidden' name='n' value='Partition_Wizard'/><button>[Load Partition Wizard]</button></form><p></p>");
+    } else {
+      berry.partition_wizard_loaded = true;
+    }
+  }
 }
 
 void HandleBerryPartitionWizardLoader(void) {
@@ -914,9 +923,7 @@ bool Xdrv52(uint32_t function)
       } else {
         WSContentSend_P(HTTP_BTN_BERRY_CONSOLE);
 #ifdef USE_BERRY_PARTITION_WIZARD
-      if (!berry.partition_wizard_loaded) {
-        HandleBerryPartiionWizardLoaderButton();
-      }
+      HandleBerryPartiionWizardLoaderButton();
 #endif // USE_BERRY_PARTITION_WIZARD
         callBerryEventDispatcher(PSTR("web_add_button"), nullptr, 0, nullptr);
         callBerryEventDispatcher(PSTR("web_add_console_button"), nullptr, 0, nullptr);

From dec52e19ed0d51292a79c18ec786fb183e3c4e99 Mon Sep 17 00:00:00 2001
From: Stephan Hadinger <stephan.hadinger@gmail.com>
Date: Sat, 11 Nov 2023 19:10:11 +0100
Subject: [PATCH 4/4] Fix test

---
 tasmota/tasmota_xdrv_driver/xdrv_52_9_berry.ino | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasmota/tasmota_xdrv_driver/xdrv_52_9_berry.ino b/tasmota/tasmota_xdrv_driver/xdrv_52_9_berry.ino
index 61e95b85bf53..c4505b0af96d 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_52_9_berry.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_52_9_berry.ino
@@ -766,7 +766,7 @@ void HandleBerryPartiionWizardLoaderButton(void) {
   bvm * vm = berry.vm;
   static const char PARTITION_WIZARD_NAME[] = "partition_wizard";
   if (!berry.partition_wizard_loaded) {
-    if (!be_global_find(vm, be_newstr(vm, PARTITION_WIZARD_NAME)) < 0) {    // the global name `partition_wizard` doesn't exist
+    if (be_global_find(vm, be_newstr(vm, PARTITION_WIZARD_NAME)) < 0) {    // the global name `partition_wizard` doesn't exist
       WSContentSend_P("<form id=but_part_mgr style='display: block;' action='tapp' method='get'><input type='hidden' name='n' value='Partition_Wizard'/><button>[Load Partition Wizard]</button></form><p></p>");
     } else {
       berry.partition_wizard_loaded = true;