Network,Https and sanitizeInput

Author: bayeggex

src/AIChatbot.cpp

@@ -8,21 +8,34 @@ void AIChatbot::begin(long baudRate) {
 }
 
 bool AIChatbot::connectWiFi(const char* ssid, const char* password, unsigned long timeoutMs) {
+    Serial.printf("Connecting to WiFi: %s\n", ssid);
     WiFi.begin(ssid, password);
-    unsigned long startAttemptTime = millis();
 
+    unsigned long startAttemptTime = millis();
     while (WiFi.status() != WL_CONNECTED && millis() - startAttemptTime < timeoutMs) {
-        delay(1000);
-        Serial.println("Connecting to WiFi...");
+        delay(500);
+        Serial.print(".");
     }
 
     if (WiFi.status() == WL_CONNECTED) {
-        Serial.println("Connected to WiFi");
+        Serial.println("\nWiFi Connected!");
+        Serial.printf("IP Address: %s\n", WiFi.localIP().toString().c_str());
         return true;
     } else {
-        Serial.println("Failed to connect to WiFi");
+        Serial.println("\nWiFi Connection Failed.");
+        return false;
+    }
+}
+
+bool AIChatbot::validateKeys() {
+    if (selectedAI == "chatgpt" && chatGPTApiKey.isEmpty()) {
+        Serial.println("Error: ChatGPT API key is not set.");
+        return false;
+    } else if (selectedAI == "huggingface" && huggingFaceApiKey.isEmpty()) {
+        Serial.println("Error: Hugging Face API key is not set.");
         return false;
     }
+    return true;
 }
 
 void AIChatbot::update() {
@@ -46,6 +59,15 @@ void AIChatbot::setKey(const String& key, const String& aiName) {
 void AIChatbot::selectAI(const String& aiName, const String& aiVersion) {
     selectedAI = aiName;
     selectedAIVersion = (aiVersion != "null" && aiVersion != "none") ? aiVersion : "gpt-3.5-turbo";
+
+    if (selectedAI == "chatgpt" && (selectedAIVersion != "gpt-3.5-turbo" && selectedAIVersion != "gpt-4")) {
+        Serial.println("Warning: Unsupported ChatGPT version. Defaulting to gpt-3.5-turbo.");
+        selectedAIVersion = "gpt-3.5-turbo";
+    }
+    if (selectedAI == "huggingface" && selectedAIVersion.isEmpty()) {
+        Serial.println("Warning: Hugging Face version not set. Defaulting to the google/flan-t5-small.");
+        selectedAIVersion = "google/flan-t5-small";
+    }
 }
 
 String AIChatbot::getResponse(const String& message) {
@@ -58,6 +80,24 @@ String AIChatbot::getResponse(const String& message) {
     }
 }
 
+String AIChatbot::sanitizeInput(const String& input) {
+    String sanitized = input;
+    sanitized.replace("\\", "\\\\");
+    sanitized.replace("\"", "\\\"");
+    sanitized.replace("\n", "\\n");
+    sanitized.replace("\r", "\\r");
+
+    for (int i = 0; i < sanitized.length(); i++) {
+        if (sanitized[i] < 32) { // ASCII 32
+            sanitized.remove(i, 1);
+            i--;
+        }
+    }
+
+    return sanitized;
+}
+
+
 String AIChatbot::sendToChatGPT(const String& message) {
     if (chatGPTApiKey.isEmpty()) {
         return "ChatGPT API key not set.";
@@ -74,30 +114,34 @@ String AIChatbot::sendToHuggingFace(const String& message) {
         return "Hugging Face API key not set.";
     }
 
+    String sanitizedMessage = sanitizeInput(message);
     String url = "https://api-inference.huggingface.co/models/" + selectedAIVersion;
-    String payload = "{\"inputs\": \"" + message + "\"}";
+    String payload = "{\"inputs\": \"" + sanitizedMessage + "\"}";
 
     return makeHttpRequest(url, payload, huggingFaceApiKey);
 }
 
+
 String AIChatbot::makeHttpRequest(const String& url, const String& payload, const String& apiKey) {
     HTTPClient http;
-    
-    #ifdef ESP32
     WiFiClientSecure client;
     client.setInsecure();
-    http.begin(client, url);  
-    #elif defined(ESP8266)
-    WiFiClientSecure client;
-    client.setInsecure(); 
     http.begin(client, url);
-    #endif
 
     http.addHeader("Content-Type", "application/json");
     http.addHeader("Authorization", "Bearer " + apiKey);
 
     int httpResponseCode = http.POST(payload);
-    String response = httpResponseCode > 0 ? http.getString() : "Error on sending POST: " + String(httpResponseCode);
+    String response = "";
+
+    if (httpResponseCode > 0) {
+        response = http.getString();
+        Serial.printf("HTTP Response code: %d\nResponse body: %s\n", httpResponseCode, response.c_str());
+    } else {
+        response = "HTTP POST failed: " + String(http.errorToString(httpResponseCode).c_str());
+        Serial.println(response);
+        Serial.printf("Payload: %s\n", payload.c_str());
+    }
 
     http.end();
     return response;

src/AIChatbot.h

@@ -3,23 +3,28 @@
 
 #include <Arduino.h>
 
-#ifdef ESP32
+#if defined(ESP32)
 #include <WiFi.h>
 #include <WiFiClientSecure.h>
 #include <HTTPClient.h>
+#define PLATFORM_NAME "ESP32"
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <ESP8266HTTPClient.h>
+#define PLATFORM_NAME "ESP8266"
 #endif
 
+
 class AIChatbot {
 public:
     AIChatbot();
-    void begin(long baudRate);
     bool connectWiFi(const char* ssid, const char* password, unsigned long timeoutMs = 10000);
+    bool validateKeys();
+    void begin(long baudRate);
     void update();
     void setKey(const String& key, const String& aiName);
     void selectAI(const String& aiName, const String& aiVersion = "gpt-3.5-turbo");
+    String sanitizeInput(const String& input);
     String getResponse(const String& message);
 
 private: