Static API fixes and some refactoring

Author: kind3r

.gitignore

@@ -33,4 +33,4 @@
 
 .pio
 .vscode
-src/config.h
+src/config.cpp

src/ble_api.cpp

@@ -15,13 +15,16 @@ BLEAdvertisedDeviceCallbacks *BLEApi::_advertisedDeviceCallback = new myAdvertis
 
 void BLEApi::init()
 {
-  BLEDevice::init("ESP32BLEGW");
-  bleScan = BLEDevice::getScan();
-  bleScan->setAdvertisedDeviceCallbacks(BLEApi::_advertisedDeviceCallback);
-  bleScan->setInterval(1349);
-  bleScan->setWindow(449);
-  bleScan->setActiveScan(true);
-  _isReady = true;
+  if (!_isReady) {
+    esp_bt_controller_mem_release(ESP_BT_MODE_CLASSIC_BT);
+    BLEDevice::init("ESP32BLEGW");
+    bleScan = BLEDevice::getScan();
+    bleScan->setAdvertisedDeviceCallbacks(BLEApi::_advertisedDeviceCallback);
+    bleScan->setInterval(1349);
+    bleScan->setWindow(449);
+    bleScan->setActiveScan(true);
+    _isReady = true;
+  }
 }
 
 bool BLEApi::isReady() {

src/config.cpp.example

@@ -0,0 +1,5 @@
+#include "config.h"
+
+const char *aesKey = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; // 128 bits hex representation (32 characters) 
+const char *ssid = "YOUR_WIFI_SSID";
+const char *password = "YOUR_WIFI_PASSWORD";

src/config.h

@@ -0,0 +1,8 @@
+#ifndef ESP_GW_CONFIG_H
+#define ESP_GW_CONFIG_H
+
+extern const char *aesKey;
+extern const char *ssid;
+extern const char *password;
+
+#endif

src/config.h.example

@@ -3,14 +3,8 @@
 
 #include <WiFi.h>
 
-#include <WebSocketsServer.h>
-WebSocketsServer webSocket = WebSocketsServer(80);
-
 #include <ArduinoJson.h>
 
-#include "security.h"
-Security sec = Security();
-
 #include "noble_api.h"
 
 #include <esp_bt.h>
@@ -35,38 +29,23 @@ bool setupWifi()
   return true;
 }
 
-void setupServer()
-{
-  NobleApi::init(&sec);
-}
-
-
-void setupBLE() {
-  esp_bt_controller_mem_release(ESP_BT_MODE_CLASSIC_BT);
-  BLEApi::init();
-}
-
 void setup()
 {
   Serial.begin(115200);
   esp_log_level_set("*", ESP_LOG_INFO);
 
-  sec.setKey(aesKey);
-
   do
   {
     delay(200);
   } while (!setupWifi());
 
-  setupBLE();
-
-  setupServer();
+  NobleApi::init();
 
   Serial.println("Setup complete");
   meminfo("After full setup");
 }
 
 void loop()
 {
-  webSocket.loop();
+  NobleApi::loop();
 }

src/main.cpp

@@ -1,18 +1,21 @@
 #include "noble_api.h"
-#include "ble_api.h"
 
 Security *NobleApi::sec = nullptr;
 WebSocketsServer *NobleApi::ws = nullptr;
 std::map<uint32_t, std::string> *NobleApi::challenges = nullptr;
 
-void NobleApi::init(Security *security)
+void NobleApi::init()
 {
-  sec = security;
+  sec = new Security(aesKey);
   challenges = new std::map<uint32_t, std::string>();
+  BLEApi::init();
   ws = new WebSocketsServer(ESP_GW_WEBSOCKET_PORT);
   ws->begin();
-  ws->onEvent(std::bind(onWsEvent, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4));
-  Serial.println(ESP_GW_WEBSOCKET_PORT);
+  ws->onEvent(onWsEvent);
+}
+
+void NobleApi::loop() {
+  ws->loop();
 }
 
 void NobleApi::onWsEvent(uint8_t client, WStype_t type, uint8_t *payload, size_t length)
@@ -41,20 +44,19 @@ void NobleApi::onWsEvent(uint8_t client, WStype_t type, uint8_t *payload, size_t
     StaticJsonDocument<1024> command;
     DeserializationError error = deserializeJson(command, payload, length);
 
-    if (error)
+    if (error != DeserializationError::Ok)
     { //Check for errors in parsing
-      Serial.println("Parsing failed");
+      Serial.printf("Message parsing failed: ");
       Serial.println(error.f_str());
       return;
     }
     else
     {
       const char *action = command["action"];
-      if (action)
+      if (action && strlen(action) > 0)
       {
         bool authenticated = false;
-        std::string stringIV = challenges->at(client);
-        if (stringIV.length() == 0)
+        if (challenges->find(client) == challenges->end())
         {
           authenticated = true;
         }
@@ -109,11 +111,11 @@ void NobleApi::checkAuth(uint8_t client, const char *response)
   const size_t responseLength = strlen(response);
   if (responseLength % BLOCK_SIZE == 0)
   {
-    std::string stringIV = challenges->at(client);
-    if (stringIV.length() > 0)
+    std::map<uint32_t, std::string>::iterator it = challenges->find(client);
+    if (it != challenges->end())
     {
       uint8_t iv[BLOCK_SIZE];
-      sec->fromHex(stringIV.c_str(), stringIV.length(), iv);
+      sec->fromHex(it->second.c_str(), it->second.length(), iv);
 
       uint8_t encryptedResponse[responseLength / 2];
       size_t encryptedResponseLength = sec->fromHex(response, responseLength, encryptedResponse);
@@ -152,12 +154,12 @@ void NobleApi::sendJsonMessage(uint8_t client, JsonDocument &command)
 
 void NobleApi::sendAuthMessage(uint8_t client)
 {
-  std::string stringIV = challenges->at(client);
-  if (stringIV.length() > 0)
+  std::map<uint32_t, std::string>::iterator it = challenges->find(client);
+  if (it != challenges->end())
   {
     StaticJsonDocument<128> command;
     command["type"] = "auth";
-    command["challenge"] = stringIV;
+    command["challenge"] = it->second;
     sendJsonMessage(client, command);
     command.clear();
   }

src/noble_api.cpp

@@ -10,12 +10,14 @@
 #include <WebSocketsServer.h>
 #include <ArduinoJson.h>
 #include <map>
+#include "config.h"
 #include "security.h"
+#include "ble_api.h"
 
 class NobleApi {
   public:
-    static void init(Security *security);
-    static void onWsEvent(uint8_t client, WStype_t type, uint8_t * payload, size_t length);
+    static void init();
+    static void loop();
   private:
     static Security *sec;
     static WebSocketsServer *ws;
@@ -25,6 +27,7 @@ class NobleApi {
     static void sendJsonMessage(uint8_t client, JsonDocument &command);
     static void sendAuthMessage(uint8_t client);
     static void sendState(uint8_t client);
+    static void onWsEvent(uint8_t client, WStype_t type, uint8_t * payload, size_t length);
 };
 
 #endif