Dynamic script name (#7)

Allow selection of script file on webscreen.json

Author: eleonel

websocket/dynamic_js.cpp

@@ -6,9 +6,13 @@
 #include "pins_config.h"
 #include "rm67162.h"
 #include "lvgl_elk.h"  // Contains init_lvgl_display(), init_lv_fs(), etc.
+#include "globals.h"
+
+// Initialize with the default script filename
+String g_script_filename = "/app.js";
 
 void dynamic_js_setup() {
-  Serial.println("DYNAMIC_JS: Setting up Elk + script.js scenario...");
+  Serial.println("DYNAMIC_JS: Setting up Elk + script scenario...");
 
   // If needed, mount the SD again (or confirm it’s already mounted):
   SD_MMC.setPins(PIN_SD_CLK, PIN_SD_CMD, PIN_SD_D0);

websocket/dynamic_js.h

@@ -1,5 +1,5 @@
 #pragma once
 
-// Functions to set up and loop your “dynamic” (Elk + script.js) code
+// Functions to set up and loop your “dynamic” (Elk + script) code
 void dynamic_js_setup();
 void dynamic_js_loop();

websocket/globals.h

@@ -0,0 +1,5 @@
+#pragma once
+#include <Arduino.h>
+
+// Declare the global script filename variable
+extern String g_script_filename;

websocket/lvgl_elk.h

@@ -13,6 +13,8 @@
 #include <vector>
 #include <utility>  // for std::pair
 
+#include "globals.h"
+
 // Global WiFiClient + PubSubClient
 static WiFiClient    g_wifiClient;
 static PubSubClient  g_mqttClient(g_wifiClient);
@@ -3250,9 +3252,10 @@ static void elk_task(void *pvParam) {
   // 2) Register bridging
   register_js_functions();
 
-  // 3) Load & execute your script
-  if(!load_and_execute_js_script("/script.js")) {
-    Serial.println("Failed to load and execute JavaScript script");
+  // 3) Load & execute your script using the filename from the configuration
+  if(!load_and_execute_js_script(g_script_filename.c_str())) {
+    Serial.printf("Failed to load and execute JavaScript script from %s\n", g_script_filename.c_str());
+    // Optionally handle the error
   } else {
     Serial.println("Script executed successfully in elk_task");
   }

websocket/websocket.ino

@@ -6,13 +6,14 @@
 #include "pins_config.h"     // For PIN_SD_CMD, etc.
 #include "fallback.h"        // Fallback header
 #include "dynamic_js.h"      // Dynamic (Elk + JS) header
+#include "globals.h"
 
 #include <ArduinoJson.h>
 
 // Global flag to decide fallback vs dynamic
 static bool useFallback = false;
 
-static bool readWiFiConfigJSON(const char* path, String &outSSID, String &outPASS) {
+static bool readConfigJSON(const char* path, String &outSSID, String &outPASS, String &outScript) {
   File f = SD_MMC.open(path);
   if (!f) {
     Serial.println("No JSON file");
@@ -28,23 +29,25 @@ static bool readWiFiConfigJSON(const char* path, String &outSSID, String &outPAS
     return false;
   }
 
-  // Extract SSID/PASS from doc
+  // Extract Wi-Fi settings
   outSSID = doc["settings"]["wifi"]["ssid"] | "";
   outPASS = doc["settings"]["wifi"]["pass"] | "";
   if (outSSID.isEmpty() || outPASS.isEmpty()) {
     Serial.println("SSID or PASS empty in JSON");
     return false;
   }
 
-  // Optionally update 'last_read' with current time
+  // Extract the script filename (default to "app.js" if not provided)
+  outScript = doc["script"] | "app.js";
+
+  // Update 'last_read' if desired
   time_t now;
   time(&now);
   doc["last_read"] = (unsigned long)now;
 
-  // Re-serialize and write back to the same file (if you want to save changes)
+  // Optionally write back the updated JSON
   String updated;
   serializeJson(doc, updated);
-
   f = SD_MMC.open(path, FILE_WRITE);
   if (!f) {
     Serial.println("Failed to open JSON for writing");
@@ -70,14 +73,20 @@ void setup() {
   }
 
   // Optionally read /webscreen.json for Wi-Fi
-  String s, p;
-  if(!readWiFiConfigJSON("/webscreen.json", s, p)) {
+  String s, p, scriptFile;
+  if(!readConfigJSON("/webscreen.json", s, p, scriptFile)) {
     Serial.println("Failed to read /webscreen.json => fallback");
     useFallback = true;
     fallback_setup();
     return;
   }
 
+  // Ensure the script filename starts with a '/'
+  if (!scriptFile.startsWith("/")) {
+    scriptFile = "/" + scriptFile;
+  }
+  g_script_filename = scriptFile;  // update global variable
+
   // Connect Wi-Fi
   WiFi.mode(WIFI_STA);
   WiFi.begin(s.c_str(), p.c_str());
@@ -95,19 +104,22 @@ void setup() {
   }
   Serial.println("Wi-Fi connected => " + WiFi.localIP().toString());
 
-  // Check if /script.js exists
-  {
-    File checkF = SD_MMC.open("/script.js");
-    if(!checkF) {
-      Serial.println("No script.js => fallback");
-      useFallback = true;
-      fallback_setup();
-      return;
-    }
-    checkF.close();
+  // Use the filename specified in the config; ensure it has a leading '/'
+  String scriptPath = scriptFile;
+  if (!scriptPath.startsWith("/")) {
+    scriptPath = "/" + scriptPath;
+  }
+  // Check if the script file exists on the SD card:
+  File checkF = SD_MMC.open(g_script_filename);
+  if(!checkF) {
+    Serial.printf("No %s found => fallback\n", g_script_filename.c_str());
+    useFallback = true;
+    fallback_setup();
+    return;
   }
+  checkF.close();
 
-  // We have script.js => run dynamic
+  // If everything is okay, run the dynamic JS functionality:
   useFallback = false;
   dynamic_js_setup();
 }