refactor. pull web server handling out of main

lib/MiLight/MiLightClient.cpp

@@ -36,7 +36,6 @@ uint8_t MiLightClient::nextSequenceNum() {
 
 bool MiLightClient::available(const MiLightRadioType radioType) {
   MiLightRadio* radio = getRadio(radioType);
-  radio->begin();
   
   if (radio == NULL) {
     return false;

lib/MiLight/MiLightRadio.cpp

@@ -62,8 +62,7 @@ int MiLightRadio::configure() {
 
 bool MiLightRadio::available()
 {
-  configure();
-  
+  configure(); 
   if (_waiting) {
 #ifdef DEBUG_PRINTF
   printf("_waiting\n");
@@ -123,8 +122,6 @@ int MiLightRadio::write(uint8_t frame[], size_t frame_length)
   if (frame_length > sizeof(_out_packet) - 1) {
     return -1;
   }
-  
-  configure();
 
   memcpy(_out_packet + 1, frame, frame_length);
   _out_packet[0] = frame_length;

lib/WebServer/MiLightHttpServer.cpp

@@ -0,0 +1,270 @@
+#include <fs.h>
+#include <WiFiUdp.h>
+#include <IntParsing.h>
+#include <Settings.h>
+#include <MiLightHttpServer.h>
+#include <MiLightRadioConfig.h>
+
+void MiLightHttpServer::begin() {
+  server.on("/", HTTP_GET, handleServeFile(WEB_INDEX_FILENAME, "text/html"));
+  server.on("/settings", HTTP_GET, handleServeFile(SETTINGS_FILE, "application/json"));
+  server.on("/settings", HTTP_PUT, [this]() { handleUpdateSettings(); });
+  server.on("/gateway_traffic", HTTP_GET, [this]() { handleListenGateway(); });
+  server.onPattern("/gateways/:device_id/:type/:group_id", HTTP_PUT, [this](const UrlTokenBindings* b) { handleUpdateGroup(b); });
+  server.onPattern("/gateways/:device_id/:type", HTTP_PUT, [this](const UrlTokenBindings* b) { handleUpdateGateway(b); });
+  server.on("/web", HTTP_POST, [this]() { server.send(200, "text/plain", "success"); }, handleUpdateFile(WEB_INDEX_FILENAME));
+  server.on("/firmware", HTTP_POST, 
+    [this](){
+      server.sendHeader("Connection", "close");
+      server.sendHeader("Access-Control-Allow-Origin", "*");
+      server.send(200, "text/plain", (Update.hasError())?"FAIL":"OK");
+      ESP.restart();
+    },
+    [this](){
+      HTTPUpload& upload = server.upload();
+      if(upload.status == UPLOAD_FILE_START){
+        WiFiUDP::stopAll();
+        uint32_t maxSketchSpace = (ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000;
+        if(!Update.begin(maxSketchSpace)){//start with max available size
+          Update.printError(Serial);
+        }
+      } else if(upload.status == UPLOAD_FILE_WRITE){
+        if(Update.write(upload.buf, upload.currentSize) != upload.currentSize){
+          Update.printError(Serial);
+        }
+      } else if(upload.status == UPLOAD_FILE_END){
+        if(Update.end(true)){ //true to set the size to the current progress
+        } else {
+          Update.printError(Serial);
+        }
+      }
+      yield();
+    }
+  );
+  
+  server.begin();
+}
+
+void MiLightHttpServer::handleClient() {
+  server.handleClient();
+}
+
+void MiLightHttpServer::applySettings(Settings& settings) {
+  if (server.authenticationRequired() && !settings.hasAuthSettings()) {
+    server.disableAuthentication();
+  } else {
+    server.requireAuthentication(settings.adminUsername, settings.adminPassword);
+  }
+}
+
+void MiLightHttpServer::onSettingsSaved(SettingsSavedHandler handler) {
+  this->settingsSavedHandler = handler;
+}
+  
+ESP8266WebServer::THandlerFunction MiLightHttpServer::handleServeFile(
+  const char* filename, 
+  const char* contentType, 
+  const char* defaultText) {
+    
+  return [this, filename, contentType, defaultText]() {
+    if (!serveFile(filename)) {
+      if (defaultText) {
+        server.send(200, contentType, defaultText);
+      } else {
+        server.send(404);
+      }
+    }
+  };
+}
+
+bool MiLightHttpServer::serveFile(const char* file, const char* contentType) {
+  if (SPIFFS.exists(file)) {
+    File f = SPIFFS.open(file, "r");
+    server.send(200, contentType, f.readString());
+    f.close();
+    return true;
+  }
+  
+  return false;
+}
+
+ESP8266WebServer::THandlerFunction MiLightHttpServer::handleUpdateFile(const char* filename) {
+  return [this, filename]() {
+    HTTPUpload& upload = server.upload();
+    
+    if (upload.status == UPLOAD_FILE_START) {
+      updateFile = SPIFFS.open(filename, "w");
+    } else if(upload.status == UPLOAD_FILE_WRITE){
+      if (updateFile.write(upload.buf, upload.currentSize) != upload.currentSize) {
+        Serial.println("Error updating web file");
+      }
+    } else if (upload.status == UPLOAD_FILE_END) {
+      updateFile.close();
+    }
+  };
+}
+
+void MiLightHttpServer::handleUpdateSettings() {
+  DynamicJsonBuffer buffer;
+  const String& rawSettings = server.arg("plain");
+  JsonObject& parsedSettings = buffer.parse(rawSettings);
+  
+  if (parsedSettings.success()) {
+    settings.patch(parsedSettings);
+    settings.save();
+    
+    this->applySettings(settings);
+    this->settingsSavedHandler();
+    
+    server.send(200, "application/json", "true");
+  } else {
+    server.send(400, "application/json", "\"Invalid JSON\"");
+  }
+}
+
+void MiLightHttpServer::handleListenGateway() {
+  uint8_t readType = 0;
+  MiLightRadioConfig *config;
+  
+  while (readType == 0) {
+    if (!server.clientConnected()) {
+      return;
+    }
+    
+    if (milightClient->available(RGBW)) {
+      readType = RGBW;
+      config = &MilightRgbwConfig;
+    } else if (milightClient->available(CCT)) {
+      readType = CCT;
+      config = &MilightCctConfig;
+    } else if (milightClient->available(RGBW_CCT)) {
+      readType = RGBW_CCT;
+      config = &MilightRgbwCctConfig;
+    }
+    
+    yield();
+  }
+  
+  uint8_t packet[config->packetLength];
+  milightClient->read(static_cast<MiLightRadioType>(readType), packet);
+  
+  String response = "Packet received (";
+  response += String(sizeof(packet)) + " bytes)";
+  response += ":\n";
+  
+  for (int i = 0; i < sizeof(packet); i++) {
+    response += String(packet[i], HEX) + " ";
+  }
+  
+  response += "\n\n";
+  
+  server.send(200, "text/plain", response);
+}
+
+void MiLightHttpServer::handleUpdateGroup(const UrlTokenBindings* urlBindings) {
+  DynamicJsonBuffer buffer;
+  JsonObject& request = buffer.parse(server.arg("plain"));
+  
+  if (!request.success()) {
+    server.send(400, "text/plain", "Invalid JSON");
+    return;
+  }
+  
+  const uint16_t deviceId = parseInt<uint16_t>(urlBindings->get("device_id"));
+  const uint8_t groupId = urlBindings->get("group_id").toInt();
+  const MiLightRadioType type = MiLightClient::getRadioType(urlBindings->get("type"));
+  
+  if (type == UNKNOWN) {
+    String body = "Unknown device type: ";
+    body += urlBindings->get("type");
+    
+    server.send(400, "text/plain", body);
+    return;
+  }
+    
+  if (request.containsKey("status")) {
+    const String& statusStr = request.get<String>("status");
+    MiLightStatus status = (statusStr == "on" || statusStr == "true") ? ON : OFF;
+    milightClient->updateStatus(type, deviceId, groupId, status);
+  }
+      
+  if (request.containsKey("command")) {
+    if (request["command"] == "unpair") {
+      milightClient->unpair(type, deviceId, groupId);
+    }
+    
+    if (request["command"] == "pair") {
+      milightClient->pair(type, deviceId, groupId);
+    }
+  }
+  
+  if (type == RGBW) {
+    if (request.containsKey("hue")) {
+      milightClient->updateHue(deviceId, groupId, request["hue"]);
+    }
+    
+    if (request.containsKey("level")) {
+      milightClient->updateBrightness(deviceId, groupId, request["level"]);
+    }
+    
+    if (request.containsKey("command")) {
+      if (request["command"] == "set_white") {
+        milightClient->updateColorWhite(deviceId, groupId);
+      }
+    }
+  } else if (type == CCT) {
+    if (request.containsKey("temperature")) {
+      milightClient->updateTemperature(deviceId, groupId, request["temperature"]);
+    }
+    
+    if (request.containsKey("level")) {
+      milightClient->updateCctBrightness(deviceId, groupId, request["level"]);
+    }
+    
+    if (request.containsKey("command")) {
+      if (request["command"] == "level_up") {
+        milightClient->increaseCctBrightness(deviceId, groupId);
+      }
+      
+      if (request["command"] == "level_down") {
+        milightClient->decreaseCctBrightness(deviceId, groupId);
+      }
+      
+      if (request["command"] == "temperature_up") {
+        milightClient->increaseTemperature(deviceId, groupId);
+      }
+      
+      if (request["command"] == "temperature_down") {
+        milightClient->decreaseTemperature(deviceId, groupId);
+      }
+    }
+  } 
+  
+  server.send(200, "application/json", "true");
+}
+
+void MiLightHttpServer::handleUpdateGateway(const UrlTokenBindings* urlBindings) {
+  DynamicJsonBuffer buffer;
+  JsonObject& request = buffer.parse(server.arg("plain"));
+  
+  const uint16_t deviceId = parseInt<uint16_t>(urlBindings->get("device_id"));
+  const MiLightRadioType type = MiLightClient::getRadioType(urlBindings->get("type"));
+  
+  if (type == UNKNOWN) {
+    String body = "Unknown device type: ";
+    body += urlBindings->get("type");
+    
+    server.send(400, "text/plain", body);
+    return;
+  }
+  
+  if (request.containsKey("status")) {
+    if (request["status"] == "on") {
+      milightClient->allOn(type, deviceId);
+    } else if (request["status"] == "off") {
+      milightClient->allOff(type, deviceId);
+    }
+  }
+  
+  server.send(200, "application/json", "true");
+}

lib/WebServer/MiLightHttpServer.h

@@ -0,0 +1,48 @@
+#include <WebServer.h>
+#include <MiLightClient.h>
+#include <Settings.h>
+
+#ifndef _MILIGHT_HTTP_SERVER
+#define _MILIGHT_HTTP_SERVER 
+
+typedef std::function<void(void)> SettingsSavedHandler;
+
+class MiLightHttpServer {
+public:
+  MiLightHttpServer(Settings& settings, MiLightClient*& milightClient)
+    : server(WebServer(80)),
+      milightClient(milightClient),
+      settings(settings)
+  { 
+    this->applySettings(settings);
+  }
+  
+  void begin();
+  void handleClient();
+  void onSettingsSaved(SettingsSavedHandler handler);
+  
+protected:
+  ESP8266WebServer::THandlerFunction handleServeFile(
+    const char* filename, 
+    const char* contentType, 
+    const char* defaultText = NULL); 
+    
+  bool serveFile(const char* file, const char* contentType = "text/html");
+  ESP8266WebServer::THandlerFunction handleUpdateFile(const char* filename);
+  void applySettings(Settings& settings);
+  
+  void handleUpdateSettings();
+  void handleListenGateway();
+  void handleUpdateGroup(const UrlTokenBindings* urlBindings);
+  void handleUpdateGateway(const UrlTokenBindings* urlBindings);
+  
+  File updateFile;
+  
+  WebServer server;
+  Settings& settings;
+  MiLightClient*& milightClient;
+  SettingsSavedHandler settingsSavedHandler;
+  
+};
+
+#endif

platformio.ini

@@ -16,7 +16,6 @@ lib_deps_external =
   RF24
   WiFiManager
   ArduinoJson
-  Vector
 
 [env:nodemcuv2]
 platform = espressif8266

src/main.cpp

@@ -3,214 +3,22 @@
 #include <ArduinoJson.h>
 #include <stdlib.h>
 #include <fs.h>
+#include <IntParsing.h>
 #include <MiLightClient.h>
 #include <MiLightRadioConfig.h>
-#include <WebServer.h>
-#include <IntParsing.h>
+#include <MiLightHttpServer.h>
 #include <Settings.h>
 #include <MiLightUdpServer.h>
 
-MiLightClient* milightClient;
-MiLightUdpServer** udpServers;
-int numUdpServers = 0;
 WiFiManager wifiManager;
-WebServer *server = new WebServer(80);
-File updateFile;
-Settings settings;
-
-void handleUpdateGateway(const UrlTokenBindings* urlBindings) {
-  DynamicJsonBuffer buffer;
-  JsonObject& request = buffer.parse(server->arg("plain"));
-  
-  const uint16_t deviceId = parseInt<uint16_t>(urlBindings->get("device_id"));
-  const MiLightRadioType type = MiLightClient::getRadioType(urlBindings->get("type"));
-  
-  if (type == UNKNOWN) {
-    String body = "Unknown device type: ";
-    body += urlBindings->get("type");
-    
-    server->send(400, "text/plain", body);
-    return;
-  }
-  
-  if (request.containsKey("status")) {
-    if (request["status"] == "on") {
-      milightClient->allOn(type, deviceId);
-    } else if (request["status"] == "off") {
-      milightClient->allOff(type, deviceId);
-    }
-  }
-  
-  server->send(200, "application/json", "true");
-}
-
-void handleUpdateGroup(const UrlTokenBindings* urlBindings) {
-  DynamicJsonBuffer buffer;
-  JsonObject& request = buffer.parse(server->arg("plain"));
-  
-  if (!request.success()) {
-    server->send(400, "text/plain", "Invalid JSON");
-    return;
-  }
-  
-  const uint16_t deviceId = parseInt<uint16_t>(urlBindings->get("device_id"));
-  const uint8_t groupId = urlBindings->get("group_id").toInt();
-  const MiLightRadioType type = MiLightClient::getRadioType(urlBindings->get("type"));
-  
-  if (type == UNKNOWN) {
-    String body = "Unknown device type: ";
-    body += urlBindings->get("type");
-    
-    server->send(400, "text/plain", body);
-    return;
-  }
-    
-  if (request.containsKey("status")) {
-    const String& statusStr = request.get<String>("status");
-    MiLightStatus status = (statusStr == "on" || statusStr == "true") ? ON : OFF;
-    milightClient->updateStatus(type, deviceId, groupId, status);
-  }
-      
-  if (request.containsKey("command")) {
-    if (request["command"] == "unpair") {
-      milightClient->unpair(type, deviceId, groupId);
-    }
-    
-    if (request["command"] == "pair") {
-      milightClient->pair(type, deviceId, groupId);
-    }
-  }
-  
-  if (type == RGBW) {
-    if (request.containsKey("hue")) {
-      milightClient->updateHue(deviceId, groupId, request["hue"]);
-    }
-    
-    if (request.containsKey("level")) {
-      milightClient->updateBrightness(deviceId, groupId, request["level"]);
-    }
-    
-    if (request.containsKey("command")) {
-      if (request["command"] == "set_white") {
-        milightClient->updateColorWhite(deviceId, groupId);
-      }
-    }
-  } else if (type == CCT) {
-    if (request.containsKey("temperature")) {
-      milightClient->updateTemperature(deviceId, groupId, request["temperature"]);
-    }
-    
-    if (request.containsKey("level")) {
-      milightClient->updateCctBrightness(deviceId, groupId, request["level"]);
-    }
-    
-    if (request.containsKey("command")) {
-      if (request["command"] == "level_up") {
-        milightClient->increaseCctBrightness(deviceId, groupId);
-      }
-      
-      if (request["command"] == "level_down") {
-        milightClient->decreaseCctBrightness(deviceId, groupId);
-      }
-      
-      if (request["command"] == "temperature_up") {
-        milightClient->increaseTemperature(deviceId, groupId);
-      }
-      
-      if (request["command"] == "temperature_down") {
-        milightClient->decreaseTemperature(deviceId, groupId);
-      }
-    }
-  } 
-  
-  server->send(200, "application/json", "true");
-}
 
-void handleListenGateway() {
-  uint8_t readType = 0;
-  MiLightRadioConfig *config;
-  
-  while (readType == 0) {
-    if (!server->clientConnected()) {
-      return;
-    }
-    
-    if (milightClient->available(RGBW)) {
-      readType = RGBW;
-      config = &MilightRgbwConfig;
-    } else if (milightClient->available(CCT)) {
-      readType = CCT;
-      config = &MilightCctConfig;
-    } else if (milightClient->available(RGBW_CCT)) {
-      readType = RGBW_CCT;
-      config = &MilightRgbwCctConfig;
-    }
-    
-    yield();
-  }
-  
-  uint8_t packet[config->packetLength];
-  milightClient->read(static_cast<MiLightRadioType>(readType), packet);
-  
-  String response = "Packet received (";
-  response += String(sizeof(packet)) + " bytes)";
-  response += ":\n";
-  
-  for (int i = 0; i < sizeof(packet); i++) {
-    response += String(packet[i], HEX) + " ";
-  }
-  
-  response += "\n\n";
-  
-  server->send(200, "text/plain", response);
-}
-
-bool serveFile(const char* file, const char* contentType = "text/html") {
-  if (SPIFFS.exists(file)) {
-    File f = SPIFFS.open(file, "r");
-    server->send(200, contentType, f.readString());
-    f.close();
-    return true;
-  }
-  
-  return false;
-}
-
-ESP8266WebServer::THandlerFunction handleServeFile(const char* filename, 
-  const char* contentType, 
-  const char* defaultText = NULL) {
-    
-  return [filename, contentType, defaultText]() {
-    if (!serveFile(filename)) {
-      if (defaultText) {
-        server->send(200, contentType, defaultText);
-      } else {
-        server->send(404);
-      }
-    }
-  };
-}
+Settings settings;
 
-ESP8266WebServer::THandlerFunction handleUpdateFile(const char* filename) {
-  return [filename]() {
-    HTTPUpload& upload = server->upload();
-    
-    if (upload.status == UPLOAD_FILE_START) {
-      updateFile = SPIFFS.open(filename, "w");
-    } else if(upload.status == UPLOAD_FILE_WRITE){
-      if (updateFile.write(upload.buf, upload.currentSize) != upload.currentSize) {
-        Serial.println("Error updating web file");
-      }
-    } else if (upload.status == UPLOAD_FILE_END) {
-      updateFile.close();
-    }
-  };
-  yield();
-}
+MiLightClient* milightClient;
+MiLightHttpServer *httpServer;
 
-void onWebUpdated() {
-  server->send(200, "text/plain", "success");
-}
+int numUdpServers = 0;
+MiLightUdpServer** udpServers;
 
 void initMilightUdpServers() {
   if (udpServers) {
@@ -248,27 +56,9 @@ void initMilightClient() {
   milightClient->begin();
 }
 
-void handleUpdateSettings() {
-  DynamicJsonBuffer buffer;
-  const String& rawSettings = server->arg("plain");
-  JsonObject& parsedSettings = buffer.parse(rawSettings);
-  
-  if (parsedSettings.success()) {
-    settings.patch(parsedSettings);
-    settings.save();
-    initMilightClient();
-    initMilightUdpServers();
-    
-    if (server->authenticationRequired() && !settings.hasAuthSettings()) {
-      server->disableAuthentication();
-    } else {
-      server->requireAuthentication(settings.adminUsername, settings.adminPassword);
-    }
-    
-    server->send(200, "application/json", "true");
-  } else {
-    server->send(400, "application/json", "\"Invalid JSON\"");
-  }
+void applySettings() {
+  initMilightClient();
+  initMilightUdpServers();
 }
 
 void setup() {
@@ -276,54 +66,15 @@ void setup() {
   wifiManager.autoConnect();
   SPIFFS.begin();
   Settings::load(settings);
-  initMilightClient();
-  initMilightUdpServers();
-  
-  server->on("/", HTTP_GET, handleServeFile(WEB_INDEX_FILENAME, "text/html"));
-  server->on("/settings", HTTP_GET, handleServeFile(SETTINGS_FILE, "application/json"));
-  server->on("/settings", HTTP_PUT, handleUpdateSettings);
-  server->on("/gateway_traffic", HTTP_GET, handleListenGateway);
-  server->onPattern("/gateways/:device_id/:type/:group_id", HTTP_PUT, handleUpdateGroup);
-  server->onPattern("/gateways/:device_id/:type", HTTP_PUT, handleUpdateGateway);
-  server->on("/web", HTTP_POST, onWebUpdated, handleUpdateFile(WEB_INDEX_FILENAME));
-  server->on("/firmware", HTTP_POST, 
-    [](){
-      server->sendHeader("Connection", "close");
-      server->sendHeader("Access-Control-Allow-Origin", "*");
-      server->send(200, "text/plain", (Update.hasError())?"FAIL":"OK");
-      ESP.restart();
-    },
-    [](){
-      HTTPUpload& upload = server->upload();
-      if(upload.status == UPLOAD_FILE_START){
-        WiFiUDP::stopAll();
-        uint32_t maxSketchSpace = (ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000;
-        if(!Update.begin(maxSketchSpace)){//start with max available size
-          Update.printError(Serial);
-        }
-      } else if(upload.status == UPLOAD_FILE_WRITE){
-        if(Update.write(upload.buf, upload.currentSize) != upload.currentSize){
-          Update.printError(Serial);
-        }
-      } else if(upload.status == UPLOAD_FILE_END){
-        if(Update.end(true)){ //true to set the size to the current progress
-        } else {
-          Update.printError(Serial);
-        }
-      }
-      yield();
-    }
-  );
-  
-  if (settings.adminUsername.length() > 0 && settings.adminPassword.length() > 0) {
-    server->requireAuthentication(settings.adminUsername, settings.adminPassword);
-  }
+  applySettings();
   
-  server->begin();
+  httpServer = new MiLightHttpServer(settings, milightClient);
+  httpServer->onSettingsSaved(applySettings);
+  httpServer->begin();
 }
 
 void loop() {
-  server->handleClient();
+  httpServer->handleClient();
   
   if (udpServers) {
     for (size_t i = 0; i < settings.numGatewayConfigs; i++) {