Note on Arduino JSON

- Also authing websockets
- Implemented on begin and beginSpiffs
- Added notes to Gui example

README.md

@@ -1,87 +1,119 @@
 # ESPUI
+
 ![ESPUI](https://github.com/s00500/ESPUI/blob/master/docs/ui_complete.png)
 
+ESPUI is a simple library to make a web user interface for your projects using
+the **ESP8266** or the **ESP32** It uses web sockets and lets you create,
+control, and update elements on your GUI through multiple devices like phones
+and tablets.
 
-ESPUI is a simple library to make a web user interface for your projects using the **ESP8266** or the **ESP32**
+ESPUI uses simple Arduino-style syntax for creating a solid, functioning user
-It uses web sockets and lets you create, control, and update elements on your GUI through multiple devices like phones and tablets.
+interface without too much boilerplate code.
 
-ESPUI uses simple Arduino-style syntax for creating a solid, functioning user interface without too much boilerplate code.
+So if you either don't know how or just don't want to waste time: this is your
+simple solution user interface without the need of internet connectivity or any
+additional servers.
 
-So if you either don't know how or just don't want to waste time: this is your simple solution user interface without the need of internet connectivity or any additional servers.
+I completely rewrote the EasyUI Library created by ayushsharma82
+[Here](https://github.com/ayushsharma82/) Now it uses ESPAsyncWebserver and is
+mainly to be used with the ESP32 Processor.
 
-I completely rewrote the EasyUI Library created by ayushsharma82 [Here](https://github.com/ayushsharma82/)
+# Important notes
-Now it uses ESPAsyncWebserver and is mainly to be used with the ESP32 Processor.
+
+Currently ESPUI only supports ArduinoJSON 5.x, please keep that in mind! Version
+6 support is work in progress
 
 ## Dependencies
+
 This library is dependent on the following libraries to function properly.
 
 - [ESPAsyncWebserver](https://github.com/me-no-dev/ESPAsyncWebServer)
-- [ArduinoJson](https://github.com/bblanchon/ArduinoJson)
+- [ArduinoJson](https://github.com/bblanchon/ArduinoJson) **(VERSIONS 5.x only
+  currently)**
 
 **Plus for ESP8266**
+
 - [ESPAsyncTCP](https://github.com/me-no-dev/ESPAsyncTCP)
 
 **Additionally necessary for ESP32**
-- [AsyncTCP](https://github.com/me-no-dev/AsyncTCP)
 
+- [AsyncTCP](https://github.com/me-no-dev/AsyncTCP)
 
 ## How to Install
 
 Make sure all the dependencies are installed, then install like so:
 
-#### Directly Through Arduino IDE (*recommended*)
+#### Directly Through Arduino IDE (_recommended_)
 
-You can find this Library in the Arduino IDE library manager
+You can find this Library in the Arduino IDE library manager Go to Sketch >
-Go to Sketch > Include Library > Library Manager > Search for "ESPUI" > Install
+Include Library > Library Manager > Search for "ESPUI" > Install
 
 #### Manual Install
 
-For Windows: Download the [Repository](https://github.com/s00500/ESPUI/archive/master.zip) and extract the .zip in Documents>Arduino>Libraries>{Place "ESPUI" folder Here}
+For Windows: Download the
+[Repository](https://github.com/s00500/ESPUI/archive/master.zip) and extract the
+.zip in Documents>Arduino>Libraries>{Place "ESPUI" folder Here}
 
-For Linux: Download the [Repository](https://github.com/s00500/ESPUI/archive/master.zip) and extract the .zip in Sketchbook/Libraries/{Place "ESPUI" folder Here}
+For Linux: Download the
+[Repository](https://github.com/s00500/ESPUI/archive/master.zip) and extract the
+.zip in Sketchbook/Libraries/{Place "ESPUI" folder Here}
 
-For macOs: Download the [Repository](https://github.com/s00500/ESPUI/archive/master.zip) and extract the .zip in ~/Documents/Arduino/libraries/{Place "ESPUI" folder Here}
+For macOs: Download the
+[Repository](https://github.com/s00500/ESPUI/archive/master.zip) and extract the
+.zip in ~/Documents/Arduino/libraries/{Place "ESPUI" folder Here}
 
 #### Manually through IDE
 
-Download the [Repository](https://github.com/s00500/ESPUI/archive/master.zip), Go to Sketch>Include Library>Add .zip Library> Select the Downloaded .zip File.
+Download the [Repository](https://github.com/s00500/ESPUI/archive/master.zip),
+Go to Sketch>Include Library>Add .zip Library> Select the Downloaded .zip File.
 
 ## Getting started
 
-ESPUI serves several files to the browser to build up its webinterface. This can be achieved in 2 ways: 
+ESPUI serves several files to the browser to build up its webinterface. This can
-*PROGMEM* or *SPIFFS*
+be achieved in 2 ways: _PROGMEM_ or _SPIFFS_
 
-*When `ESPUI.begin()` is called the default is serving files from Memory and ESPUI should work out of the box!*
+_When `ESPUI.begin()` is called the default is serving files from Memory and
+ESPUI should work out of the box!_
 
-But if this causes your program to *use too much memory* you can burn the files into the SPIFFS filesystem on the ESP.
+But if this causes your program to _use too much memory_ you can burn the files
-There are now two ways to do this: you can either use the ESP file upload tool or you use the library function `ESPUI.prepareFileSystem()`
+into the SPIFFS filesystem on the ESP. There are now two ways to do this: you
+can either use the ESP file upload tool or you use the library function
+`ESPUI.prepareFileSystem()`
 
-#### Simple filesystem preparation (*recommended*)
+#### Simple filesystem preparation (_recommended_)
-
-Just open the example sketch **prepareFileSystem** and run it on the ESP, (give it up to 30 seconds, you can see the status on the Serial Monitor),
-The library will create all needed files.
-Congratulations, you are done, from now on you just need to to this again when there is a library update, or when you want to use another chip :-)
-Now you can upload your normal sketch, when you do not call the `ESPUI.prepareFileSystem()` function the compiler will strip out all the unnecessary that is already saved in the chip's filesystem and you have more programm memory to work with.
 
+Just open the example sketch **prepareFileSystem** and run it on the ESP, (give
+it up to 30 seconds, you can see the status on the Serial Monitor), The library
+will create all needed files. Congratulations, you are done, from now on you
+just need to to this again when there is a library update, or when you want to
+use another chip :-) Now you can upload your normal sketch, when you do not call
+the `ESPUI.prepareFileSystem()` function the compiler will strip out all the
+unnecessary that is already saved in the chip's filesystem and you have more
+programm memory to work with.
 
 #### Manual way (mainly for development)
 
-To do this download and install me-no-devs wonderful [ESP32 sketch data uploader](https://github.com/me-no-dev/arduino-esp32fs-plugin) or for ESP8266 [ESP8266 sketch data uploader](https://github.com/esp8266/arduino-esp8266fs-plugin)
+To do this download and install me-no-devs wonderful
+[ESP32 sketch data uploader](https://github.com/me-no-dev/arduino-esp32fs-plugin)
+or for ESP8266
+[ESP8266 sketch data uploader](https://github.com/esp8266/arduino-esp8266fs-plugin)
 
-Then open the **gui** example sketch and select "Upload Sketch Data" from the Tools menu for your processor.
+Then open the **gui** example sketch and select "Upload Sketch Data" from the
-Now you are set to go and use any code you want to with this library
+Tools menu for your processor. Now you are set to go and use any code you want
+to with this library
 
 ## User interface Elements
-  - Label (updateable)
-  - Button
-  - Switch (updateable)
-  - Control pad
-  - Control pad with center button
-  - Slider
-  - Text Input (updateable)
-  - Numberinput (updateable)
 
-  Checkout the example for the usage
+- Label (updateable)
+- Button
+- Switch (updateable)
+- Control pad
+- Control pad with center button
+- Slider
+- Text Input (updateable)
+- Numberinput (updateable)
+
+Checkout the example for the usage
 
 ## Available colors:
 
@@ -101,75 +133,118 @@ Now you are set to go and use any code you want to with this library
 - ~~PlattformIO Integration~~
 - ~~Multiline Labels~~
 - ~~GZip Files and serve from memory~~
-- Datagraph output -> *WIP*
+- Datagraph output -> _WIP_
 - ~~Number input ~~
 - ~~Text input ~~
 - Dokumentation for Text and number widget
 - Number min and max value
 - proper return value (as int and not as string) for slider
-- Maybe a slider range setting, meanwhile please use *map()*
+- Maybe a slider range setting, meanwhile please use _map()_
 
 ## Documentation
 
-The heart of ESPUI is [ESPAsyncWebserver](https://github.com/me-no-dev/ESPAsyncWebServer).
+The heart of ESPUI is
-ESPUI's frontend is based on [Skeleton CSS](http://getskeleton.com/) and jQuery-like lightweight [zepto.js](https://zeptojs.com/) for Handling Click Events Etc. The communication between the *ESP32* and the client browser works using web sockets.
+[ESPAsyncWebserver](https://github.com/me-no-dev/ESPAsyncWebServer). ESPUI's
-ESPUI does not need network access and can be used in standalone access point mode.
+frontend is based on [Skeleton CSS](http://getskeleton.com/) and jQuery-like
-All assets are loaded from the internal SPIFFS filesystem of the ESP32.
+lightweight [zepto.js](https://zeptojs.com/) for Handling Click Events Etc. The
-
+communication between the _ESP32_ and the client browser works using web
-This section will explain in detail how the Library is to be used from the Arduino code side. As of now the Facilino blocks are not implemented.
+sockets. ESPUI does not need network access and can be used in standalone access
-In the arduino setup() routine the interface can be customised by adding UI Elements. This is done by calling the corresponding library methods on the Library object ESPUI. Eg: `ESPUI.button(“button”, &myCallback);` creates a button in the interface that calls the “myCallback” function when changed. All buttons and items call their callback whenever there is a state change from them. This means the button will call the callback when it is pressed and also again when it is released. To separate different events an integer number with the event name is passed to the callback function that can be handled in a `switch(){}case{}` statement. Here is an overview of the currently implemented different elements of the UI library:
+point mode. All assets are loaded from the internal SPIFFS filesystem of the
+ESP32.
 
+This section will explain in detail how the Library is to be used from the
+Arduino code side. As of now the Facilino blocks are not implemented. In the
+arduino setup() routine the interface can be customised by adding UI Elements.
+This is done by calling the corresponding library methods on the Library object
+ESPUI. Eg: `ESPUI.button(“button”, &myCallback);` creates a button in the
+interface that calls the “myCallback” function when changed. All buttons and
+items call their callback whenever there is a state change from them. This means
+the button will call the callback when it is pressed and also again when it is
+released. To separate different events an integer number with the event name is
+passed to the callback function that can be handled in a `switch(){}case{}`
+statement. Here is an overview of the currently implemented different elements
+of the UI library:
 
 #### Button
 
 ![Buttons](https://github.com/s00500/ESPUI/blob/master/docs/ui_button.png)
 
-Buttons have a name and a callback value. They have one event for press and one for release.
+Buttons have a name and a callback value. They have one event for press and one
-
+for release.
 
 #### Switch
 
 ![Switches](https://github.com/s00500/ESPUI/blob/master/docs/ui_switches.png)
 
-Switches sync their state on all connected devices. This means when you change their value they change visibly on all tablets or computers that currently display the interface. They also have two types of events: one for turning on and one for turning off.
+Switches sync their state on all connected devices. This means when you change
-
+their value they change visibly on all tablets or computers that currently
+display the interface. They also have two types of events: one for turning on
+and one for turning off.
 
 #### Buttonpad
 
 ![control pads](https://github.com/s00500/ESPUI/blob/master/docs/ui_controlpad.png)
 
-Button pads come in two flavours: with or without a center button. They are very useful for con-trolling all kinds of movements of vehicles or also of course our walking robots. They use a single callback per pad and have 8 or 10 different event types to differentiate the button actions.
+Button pads come in two flavours: with or without a center button. They are very
-
+useful for con-trolling all kinds of movements of vehicles or also of course our
+walking robots. They use a single callback per pad and have 8 or 10 different
+event types to differentiate the button actions.
 
 #### Labels
 
 ![labels](https://github.com/s00500/ESPUI/blob/master/docs/ui_labels.png)
 
-Labels are a nice tool to get information from the robot to the user interface. This can be done to show states, values of sensors and configuration parameters. To send data from the code use `ESP.print(labelId, “Text”);` . Labels get a name on creation and a initial value. The name is not changeable once the UI initialised.
+Labels are a nice tool to get information from the robot to the user interface.
+This can be done to show states, values of sensors and configuration parameters.
+To send data from the code use `ESP.print(labelId, “Text”);` . Labels get a name
+on creation and a initial value. The name is not changeable once the UI
+initialised.
 
-Labels automatically wrap your text. If you want them to have multiple lines use the normal `<br>` tag in the string you print to the label
+Labels automatically wrap your text. If you want them to have multiple lines use
+the normal `<br>` tag in the string you print to the label
 
 #### Slider
 
 ![labels](https://github.com/s00500/ESPUI/blob/master/docs/ui_slider.png)
 
-The Slider can be used to slide through a value from 1 to 100. Slides provide realtime data, are touch compatible and can be used to for example control a Servo. The current value is shown while the slider is dragged in a little bubble over the handle.
+The Slider can be used to slide through a value from 1 to 100. Slides provide
+realtime data, are touch compatible and can be used to for example control a
+Servo. The current value is shown while the slider is dragged in a little bubble
+over the handle.
 
 #### Initialisation of the UI
 
-After all the elements are configured you can use `ESPUI.begin(“Some Title”);` to start the UI interface. (Or `ESPUI.beginSPIFFS(“Some Title”);` respectively) Make sure you setup a working network connection or AccesPoint **before** (See example). The web interface can then be used from multiple devices at once and also shows an connection status in the top bar.
+After all the elements are configured you can use `ESPUI.begin(“Some Title”);`
-The library is designed to be easy to use and can still be extended with a lot of more functionality.
+to start the UI interface. (Or `ESPUI.beginSPIFFS(“Some Title”);` respectively)
-
+Make sure you setup a working network connection or AccesPoint **before** (See
+example). The web interface can then be used from multiple devices at once and
+also shows an connection status in the top bar. The library is designed to be
+easy to use and can still be extended with a lot of more functionality.
 
 # Notes for Development
-If you want to work on the HTML/CSS/JS files, do make changes in the `examples/gui/data` directory. When you need to transfer that code to the ESP, run `tools/prepare_static_ui_sources.py -a` (this script needs python3 with the modules htmlmin, jsmin and csscompressor).
-This will generate a) minified files next to the original files to be uploaded with the ESP32 sketch data uploader mentioned above and b) the C header files in `src` that contain the minified and gzipped HTML/CSS/JS data (which are used by the **prepareFileSystem** example sketch or when they are served from PROGMEM; see above in the section "Getting started").
-Alternatively, you can duplicate the `examples/gui` directory and work on the copy. Then specify the `--source` and `--target` arguments to the `prepare_static_ui_sources.py` script (run the script without arguments for help).
 
-If you don't have a python environment, you need to minify and gzip the HTML/CSS/JS files manually. I wrote a little useful jsfiddle for this, [see here](https://jsfiddle.net/s00500/yvLbhuuv/).
+If you want to work on the HTML/CSS/JS files, do make changes in the
+`examples/gui/data` directory. When you need to transfer that code to the ESP,
+run `tools/prepare_static_ui_sources.py -a` (this script needs python3 with the
+modules htmlmin, jsmin and csscompressor). This will generate a) minified files
+next to the original files to be uploaded with the ESP32 sketch data uploader
+mentioned above and b) the C header files in `src` that contain the minified and
+gzipped HTML/CSS/JS data (which are used by the **prepareFileSystem** example
+sketch or when they are served from PROGMEM; see above in the section "Getting
+started"). Alternatively, you can duplicate the `examples/gui` directory and
+work on the copy. Then specify the `--source` and `--target` arguments to the
+`prepare_static_ui_sources.py` script (run the script without arguments for
+help).
 
-If you change something in HTML/CSS/JS and want to create a pull request, please do include the minified versions and corresponding C header files in your commits.
+If you don't have a python environment, you need to minify and gzip the
+HTML/CSS/JS files manually. I wrote a little useful jsfiddle for this,
+[see here](https://jsfiddle.net/s00500/yvLbhuuv/).
 
+If you change something in HTML/CSS/JS and want to create a pull request, please
+do include the minified versions and corresponding C header files in your
+commits.
 
 # Contribute
-Liked this Library? You can **support** me by sending me a :coffee: [Coffee](https://paypal.me/lukasbachschwell/3).
+
+Liked this Library? You can **support** me by sending me a :coffee:
+[Coffee](https://paypal.me/lukasbachschwell/3).

examples/gui/data/js/controls.js

@@ -1,3 +1,4 @@
+const UI_INITIAL_GUI = 100;
 const UI_TITEL = 0;
 
 const UI_LABEL = 1;
@@ -39,42 +40,34 @@ const C_SUNFLOWER = 4;
 const C_CARROT = 5;
 const C_ALIZARIN = 6;
 const C_NONE = 7;
+const C_DARK = 8;
 
 function colorClass(colorId) {
   colorId = Number(colorId);
   switch (colorId) {
     case C_TURQUOISE:
       return "turquoise";
-      break;
 
     case C_EMERALD:
       return "emerald";
-      break;
 
     case C_PETERRIVER:
       return "peterriver";
-      break;
 
     case C_WETASPHALT:
       return "wetasphalt";
-      break;
 
     case C_SUNFLOWER:
       return "sunflower";
-      break;
 
     case C_CARROT:
       return "carrot";
-      break;
 
     case C_ALIZARIN:
       return "alizarin";
-      break;
 
     case C_NONE:
-      return "";
+      return "dark";
-      break;
-
     default:
       return "";
   }
@@ -118,20 +111,31 @@ function start() {
     $("#conStatus").text("Connected");
     websockConnected = true;
   };
+
   websock.onclose = function(evt) {
     console.log("websock close");
     conStatusError();
   };
+
   websock.onerror = function(evt) {
     console.log(evt);
     conStatusError();
   };
-  websock.onmessage = function(evt) {
+
-    console.log(evt);
+  var handleEvent = function(evt) {
+    //console.log(evt);
     var data = JSON.parse(evt.data);
     var e = document.body;
     var center = "";
     switch (data.type) {
+      case UI_INITIAL_GUI:
+        data.controls.forEach(element => {
+          var fauxEvent = {
+            data: JSON.stringify(element)
+          };
+          handleEvent(fauxEvent);
+        });
+        break;
       case UI_TITEL:
         document.title = data.label;
         $("#mainHeader").html(data.label);
@@ -418,6 +422,8 @@ function start() {
         break;
     }
   };
+
+  websock.onmessage = handleEvent;
 }
 
 function numberchange(number) {

examples/gui/data/js/controls.min.js

@@ -1,8 +1,8 @@
-const UI_TITEL=0;const UI_LABEL=1;const UPDATE_LABEL=6;const UI_BUTTON=2;const UI_SWITCHER=3;const UPDATE_SWITCHER=7;const UI_PAD=4;const UI_CPAD=5;const UI_SLIDER=8;const UPDATE_SLIDER=9;const UI_NUMBER=10;const UPDATE_NUMBER=11;const UI_TEXT_INPUT=12;const UPDATE_TEXT_INPUT=13;const UI_GRAPH=14;const CLEAR_GRAPH=15;const ADD_GRAPH_POINT=16;const FOR=0;const BACK=1;const LEFT=2;const RIGHT=3;const CENTER=4;const C_TURQUOISE=0;const C_EMERALD=1;const C_PETERRIVER=2;const C_WETASPHALT=3;const C_SUNFLOWER=4;const C_CARROT=5;const C_ALIZARIN=6;const C_NONE=7;function colorClass(colorId){colorId=Number(colorId);switch(colorId){case C_TURQUOISE:return"turquoise";break;case C_EMERALD:return"emerald";break;case C_PETERRIVER:return"peterriver";break;case C_WETASPHALT:return"wetasphalt";break;case C_SUNFLOWER:return"sunflower";break;case C_CARROT:return"carrot";break;case C_ALIZARIN:return"alizarin";break;case C_NONE:return"";break;default:return"";}}
+const UI_INITIAL_GUI=100;const UI_TITEL=0;const UI_LABEL=1;const UPDATE_LABEL=6;const UI_BUTTON=2;const UI_SWITCHER=3;const UPDATE_SWITCHER=7;const UI_PAD=4;const UI_CPAD=5;const UI_SLIDER=8;const UPDATE_SLIDER=9;const UI_NUMBER=10;const UPDATE_NUMBER=11;const UI_TEXT_INPUT=12;const UPDATE_TEXT_INPUT=13;const UI_GRAPH=14;const CLEAR_GRAPH=15;const ADD_GRAPH_POINT=16;const FOR=0;const BACK=1;const LEFT=2;const RIGHT=3;const CENTER=4;const C_TURQUOISE=0;const C_EMERALD=1;const C_PETERRIVER=2;const C_WETASPHALT=3;const C_SUNFLOWER=4;const C_CARROT=5;const C_ALIZARIN=6;const C_NONE=7;const C_DARK=8;function colorClass(colorId){colorId=Number(colorId);switch(colorId){case C_TURQUOISE:return"turquoise";case C_EMERALD:return"emerald";case C_PETERRIVER:return"peterriver";case C_WETASPHALT:return"wetasphalt";case C_SUNFLOWER:return"sunflower";case C_CARROT:return"carrot";case C_ALIZARIN:return"alizarin";case C_NONE:return"dark";default:return"";}}
 var websock;var websockConnected=false;function restart(){$(document).add("*").off();$("#row").html("");websock.close();start();}
 function conStatusError(){websockConnected=false;$("#conStatus").removeClass("color-green");$("#conStatus").addClass("color-red");$("#conStatus").html("Error / No Connection ↻");$("#conStatus").off();$("#conStatus").on({click:restart});}
 function handleVisibilityChange(){if(!websockConnected&&!document.hidden){restart();}}
-function start(){document.addEventListener("visibilitychange",handleVisibilityChange,false);websock=new WebSocket("ws://"+window.location.hostname+"/ws");websock.onopen=function(evt){console.log("websock open");$("#conStatus").addClass("color-green");$("#conStatus").text("Connected");websockConnected=true;};websock.onclose=function(evt){console.log("websock close");conStatusError();};websock.onerror=function(evt){console.log(evt);conStatusError();};websock.onmessage=function(evt){console.log(evt);var data=JSON.parse(evt.data);var e=document.body;var center="";switch(data.type){case UI_TITEL:document.title=data.label;$("#mainHeader").html(data.label);break;case UI_LABEL:$("#row").append("<div class='two columns card tcenter "+
+function start(){document.addEventListener("visibilitychange",handleVisibilityChange,false);websock=new WebSocket("ws://"+window.location.hostname+"/ws");websock.onopen=function(evt){console.log("websock open");$("#conStatus").addClass("color-green");$("#conStatus").text("Connected");websockConnected=true;};websock.onclose=function(evt){console.log("websock close");conStatusError();};websock.onerror=function(evt){console.log(evt);conStatusError();};var handleEvent=function(evt){var data=JSON.parse(evt.data);var e=document.body;var center="";switch(data.type){case UI_INITIAL_GUI:data.controls.forEach(element=>{var fauxEvent={data:JSON.stringify(element)};handleEvent(fauxEvent);});break;case UI_TITEL:document.title=data.label;$("#mainHeader").html(data.label);break;case UI_LABEL:$("#row").append("<div class='two columns card tcenter "+
 colorClass(data.color)+
 "'><h5 id='"+
 data.id+
@@ -134,7 +134,7 @@ data.value+
 "' onchange='textchange("+
 data.id+
 ")' />"+
-"</div>");break;case UPDATE_TEXT_INPUT:$("#text"+data.id).val(data.value);break;default:console.error("Unknown type or event");break;}};}
+"</div>");break;case UPDATE_TEXT_INPUT:$("#text"+data.id).val(data.value);break;default:console.error("Unknown type or event");break;}};websock.onmessage=handleEvent;}
 function numberchange(number){var val=$("#num"+number).val();websock.send("nvalue:"+val+":"+number);console.log(val);}
 function textchange(number){var val=$("#text"+number).val();websock.send("tvalue:"+val+":"+number);console.log(val);}
 function buttonclick(number,isdown){if(isdown)websock.send("bdown:"+number);else websock.send("bup:"+number);}

examples/gui/gui.ino

@@ -157,11 +157,19 @@ void setup(void) {
 
   /*
      .begin loads and serves all files from PROGMEM directly.
-     If you want to serve the files from SPIFFS use .beginSPIFFS
+     If you want to serve the files from SPIFFS use ESPUI.beginSPIFFS
      (.prepareFileSystem has to be run in an empty sketch before)
    */
 
   dnsServer.start(DNS_PORT, "*", apIP);
+
+  /*
+   * Optionally you can use HTTP BasicAuth. Keep in mind that this is NOT a
+   SECURE way of limiting access.
+   * Anyone who is able to sniff traffic will be able to intercept your password
+   since it is transmitted in cleartext ESPUI.begin("ESPUI Control", "myuser",
+   "mypassword");
+  */
   ESPUI.begin("ESPUI Control");
 }
 

library.json

@@ -26,7 +26,7 @@
       "frameworks": "arduino"
     }
   ],
-  "version": "1.6.0",
+  "version": "1.6.2",
   "frameworks": "arduino",
   "platforms": "*"
 }

library.properties

@@ -1,5 +1,5 @@
 name=ESPUI
-version=1.6.0
+version=1.6.2
 author=Lukas Bachschwell
 maintainer=Lukas Bachschwell <lukas@lbsfilm.at>
 sentence=ESP32 and ESP8266 Web Interface Library

src/ESPUI.cpp

@@ -492,6 +492,16 @@ void ESPUIClass::updateSlider(int id, int nValue, int clientId) {
   }
 }
 
+void ESPUIClass::updateSlider(String label, int nValue, int clientId) {
+  if (!labelExists(label)) {
+    if (DEBUG_ESPUI)
+      Serial.println("UI ERROR: Element does not " + String(label) +
+                     " exist, cannot update!");
+    return;
+  }
+  updateSlider(getIdByLabel(label), nValue, clientId);
+}
+
 void ESPUIClass::updateSwitcher(int id, bool nValue, int clientId) {
   if (id < cIndex && controls[id]->type == UI_SWITCHER) {
     controls[id]->value = nValue ? 1 : 0;
@@ -603,28 +613,48 @@ bool ESPUIClass::labelExists(String label) {
   return false;
 }
 
-// Convert & Transfer Arduino elements to JSON elements
+/*
+Convert & Transfer Arduino elements to JSON elements
+Initially this function used to send the control element data individually.
+Due to a change in the ESPAsyncWebserver library this had top be changed to be
+sent as one blob at the beginning. Therefore a new type is used as well
+*/
 void ESPUIClass::jsonDom(AsyncWebSocketClient *client) {
+  String json;
+  DynamicJsonBuffer jsonBuffer(2000);
+  JsonObject &root = jsonBuffer.createObject();
+  root["type"] = UI_INITIAL_GUI;
+  JsonArray &items = jsonBuffer.createArray();
+
   for (int i = -1; i < cIndex; i++) {
-    String json;
+    JsonObject &item = jsonBuffer.createObject();
-    StaticJsonBuffer<200> jsonBuffer;
+
-    JsonObject &root = jsonBuffer.createObject();
     if (i == -1) {
-      root["type"] = UI_TITEL;
+      item["type"] = UI_TITEL;
-      root["label"] = String(ui_title);
+      item["label"] = String(ui_title);
     } else {
-      root["type"] = controls[i]->type;
+      item["type"] = controls[i]->type;
-      root["label"] = String(controls[i]->label);
+      item["label"] = String(controls[i]->label);
-      root["value"] = String(controls[i]->value);
+      item["value"] = String(controls[i]->value);
-      root["color"] = String(controls[i]->color);
+      item["color"] = String(controls[i]->color);
-      root["id"] = String(i);
+      item["id"] = String(i);
     }
-    root.printTo(json);
+    items.add(item);
-    client->text(json);
   }
+
+  // Send as one big bunch
+  root["controls"] = items;
+  root.printTo(json);
+  client->text(json);
 }
 
 void ESPUIClass::beginSPIFFS(const char *_title) {
+  begin(_title, NULL, NULL);
+  basicAuth = false;
+}
+
+void ESPUIClass::beginSPIFFS(const char *_title, const char *username,
+                             const char *password) {
   ui_title = _title;
   server = new AsyncWebServer(80);
   ws = new AsyncWebSocket("/ws");
@@ -646,10 +676,29 @@ void ESPUIClass::beginSPIFFS(const char *_title) {
 
   ws->onEvent(onWsEvent);
   server->addHandler(ws);
-  server->serveStatic("/", SPIFFS, "/").setDefaultFile("index.htm");
+
+  if (basicAuth && username != NULL && password != NULL) {
+    basicAuthPassword = password;
+    basicAuthUsername = username;
+    basicAuth = true;
+    if (WS_AUTHENTICATION)
+      ws->setAuthentication(this->basicAuthUsername, this->basicAuthPassword);
+    server->serveStatic("/", SPIFFS, "/")
+        .setDefaultFile("index.htm")
+        .setAuthentication(ESPUI.basicAuthUsername, ESPUI.basicAuthPassword);
+
+  } else if (basicAuth) {
+    Serial.println(
+        "Could not enable BasicAuth: Username or password are not set");
+  } else {
+    server->serveStatic("/", SPIFFS, "/").setDefaultFile("index.htm");
+  }
 
   // Heap for general Servertest
   server->on("/heap", HTTP_GET, [](AsyncWebServerRequest *request) {
+    if (ESPUI.basicAuth && !request->authenticate(ESPUI.basicAuthUsername,
+                                                  ESPUI.basicAuthPassword))
+      return request->requestAuthentication();
     request->send(200, "text/plain",
                   String(ESP.getFreeHeap()) + " In SPIFFSmode");
   });
@@ -657,26 +706,50 @@ void ESPUIClass::beginSPIFFS(const char *_title) {
   server->onNotFound(
       [](AsyncWebServerRequest *request) { request->send(404); });
 
-  server->on("/zepto.js", HTTP_GET, [](AsyncWebServerRequest *request) {
-    AsyncWebServerResponse *response = request->beginResponse_P(
-        200, "application/javascript", JS_ZEPTO_GZIP, sizeof(JS_ZEPTO_GZIP));
-    response->addHeader("Content-Encoding", "gzip");
-    request->send(response);
-  });
-
   server->begin();
   if (DEBUG_ESPUI) Serial.println("UI Initialized");
 }
 
 void ESPUIClass::begin(const char *_title) {
+  begin(_title, NULL, NULL);
+  basicAuth = false;
+}
+
+void ESPUIClass::begin(const char *_title, const char *username,
+                       const char *password) {
+  if (basicAuth && username != NULL && password != NULL) {
+    basicAuthPassword = password;
+    basicAuthUsername = username;
+    basicAuth = true;
+  } else if (basicAuth) {
+    Serial.println(
+        "Could not enable BasicAuth: Username or password are not set");
+  }
+
   ui_title = _title;
+
   server = new AsyncWebServer(80);
   ws = new AsyncWebSocket("/ws");
 
   ws->onEvent(onWsEvent);
   server->addHandler(ws);
 
+  if (basicAuth && username != NULL && password != NULL) {
+    basicAuthPassword = password;
+    basicAuthUsername = username;
+    basicAuth = true;
+    if (WS_AUTHENTICATION)
+      ws->setAuthentication(this->basicAuthUsername, this->basicAuthPassword);
+
+  } else if (basicAuth) {
+    Serial.println(
+        "Could not enable BasicAuth: Username or password are not set");
+  }
+
   server->on("/", HTTP_GET, [](AsyncWebServerRequest *request) {
+    if (ESPUI.basicAuth && !request->authenticate(ESPUI.basicAuthUsername,
+                                                  ESPUI.basicAuthPassword))
+      return request->requestAuthentication();
     AsyncWebServerResponse *response =
         request->beginResponse_P(200, "text/html", HTML_INDEX);
     request->send(response);
@@ -685,6 +758,9 @@ void ESPUIClass::begin(const char *_title) {
   // Javascript files
 
   server->on("/js/zepto.min.js", HTTP_GET, [](AsyncWebServerRequest *request) {
+    if (ESPUI.basicAuth && !request->authenticate(ESPUI.basicAuthUsername,
+                                                  ESPUI.basicAuthPassword))
+      return request->requestAuthentication();
     AsyncWebServerResponse *response = request->beginResponse_P(
         200, "application/javascript", JS_ZEPTO_GZIP, sizeof(JS_ZEPTO_GZIP));
     response->addHeader("Content-Encoding", "gzip");
@@ -692,6 +768,9 @@ void ESPUIClass::begin(const char *_title) {
   });
 
   server->on("/js/controls.js", HTTP_GET, [](AsyncWebServerRequest *request) {
+    if (ESPUI.basicAuth && !request->authenticate(ESPUI.basicAuthUsername,
+                                                  ESPUI.basicAuthPassword))
+      return request->requestAuthentication();
     AsyncWebServerResponse *response =
         request->beginResponse_P(200, "application/javascript",
                                  JS_CONTROLS_GZIP, sizeof(JS_CONTROLS_GZIP));
@@ -700,6 +779,9 @@ void ESPUIClass::begin(const char *_title) {
   });
 
   server->on("/js/slider.js", HTTP_GET, [](AsyncWebServerRequest *request) {
+    if (ESPUI.basicAuth && !request->authenticate(ESPUI.basicAuthUsername,
+                                                  ESPUI.basicAuthPassword))
+      return request->requestAuthentication();
     AsyncWebServerResponse *response = request->beginResponse_P(
         200, "application/javascript", JS_SLIDER_GZIP, sizeof(JS_SLIDER_GZIP));
     response->addHeader("Content-Encoding", "gzip");
@@ -709,6 +791,9 @@ void ESPUIClass::begin(const char *_title) {
   // Stylesheets
 
   server->on("/css/style.css", HTTP_GET, [](AsyncWebServerRequest *request) {
+    if (ESPUI.basicAuth && !request->authenticate(ESPUI.basicAuthUsername,
+                                                  ESPUI.basicAuthPassword))
+      return request->requestAuthentication();
     AsyncWebServerResponse *response = request->beginResponse_P(
         200, "text/css", CSS_STYLE_GZIP, sizeof(CSS_STYLE_GZIP));
     response->addHeader("Content-Encoding", "gzip");
@@ -717,6 +802,9 @@ void ESPUIClass::begin(const char *_title) {
 
   server->on(
       "/css/normalize.css", HTTP_GET, [](AsyncWebServerRequest *request) {
+        if (ESPUI.basicAuth && !request->authenticate(ESPUI.basicAuthUsername,
+                                                      ESPUI.basicAuthPassword))
+          return request->requestAuthentication();
         AsyncWebServerResponse *response = request->beginResponse_P(
             200, "text/css", CSS_NORMALIZE_GZIP, sizeof(CSS_NORMALIZE_GZIP));
         response->addHeader("Content-Encoding", "gzip");
@@ -725,6 +813,9 @@ void ESPUIClass::begin(const char *_title) {
 
   // Heap for general Servertest
   server->on("/heap", HTTP_GET, [](AsyncWebServerRequest *request) {
+    if (ESPUI.basicAuth && !request->authenticate(ESPUI.basicAuthUsername,
+                                                  ESPUI.basicAuthPassword))
+      return request->requestAuthentication();
     request->send(200, "text/plain",
                   String(ESP.getFreeHeap()) + " In Memorymode");
   });

src/ESPUI.h

@@ -2,6 +2,7 @@
 #define ESPUI_h
 
 #define DEBUG_ESPUI true
+#define WS_AUTHENTICATION false
 
 #include "Arduino.h"
 #include "ArduinoJson.h"
@@ -40,6 +41,7 @@ typedef struct Control {
 } Control;
 
 // Message Types (and control types)
+#define UI_INITIAL_GUI 100
 #define UI_TITEL 0
 
 #define UI_LABEL 1
@@ -96,12 +98,16 @@ typedef struct Control {
 #define COLOR_SUNFLOWER 4
 #define COLOR_CARROT 5
 #define COLOR_ALIZARIN 6
-#define COLOR_NONE 6
+#define COLOR_NONE 7
 
 class ESPUIClass {
  public:
-  void begin(const char *_title);        // Setup servers and page in Memorymode
+  void begin(const char *_title);  // Setup servers and page in Memorymode
+  void begin(const char *_title, const char *username, const char *password);
+
   void beginSPIFFS(const char *_title);  // Setup servers and page in SPIFFSmode
+  void beginSPIFFS(const char *_title, const char *username,
+                   const char *password);
 
   void prepareFileSystem();  // Initially preps the filesystem and loads a lot
                              // of stuff into SPIFFS
@@ -159,6 +165,9 @@ class ESPUIClass {
   bool labelExists(String label);
 
  private:
+  const char *basicAuthUsername;
+  const char *basicAuthPassword;
+  bool basicAuth = true;
   AsyncWebServer *server;
   AsyncWebSocket *ws;
 };