Merge pull request #2 from Kotmin/dualMode

Dual mode: Getting quotes from Internet without serving Internet Access to end-users

Author: Kotmin

ViInvaders.ino

@@ -1,39 +1,73 @@
 #include <ESPAsyncWebServer.h>
 #include <AsyncTCP.h>
-
-
+#include <HTTPClient.h>
 #include <WiFi.h>
 #include <SPIFFS.h>
-
 #include <ArduinoJson.h>
 
+// External network (Internet)
+const char* ssid_sta = "NetworkName";
+const char* password_sta = "SecretPassword";
 
+// Local AP (for players)
 const char* ssid = "ViInvaders";
 const char* password = "editorwar";
 
-AsyncWebServer server(80);
+// static AP ip conf
+IPAddress apIP(192, 168, 4, 1);
+IPAddress apNetmask(255, 255, 255, 0);
+IPAddress apGateway(192, 168, 4, 1);
 
-AsyncWebSocket ws("/ws");  // websocket endpoint
+// WebServer WebSocket
+AsyncWebServer server(80);
+AsyncWebSocket ws("/ws");
 
-// joystick pinout
+// joystick pinout config
 #define JOY1_X 34
 #define JOY1_SW 25
 #define JOY2_X 35
 #define JOY2_SW 26
 
+// quotes
+const char* quoteCachePath = "/quote.json";
+const char* quoteAPI = "https://api.quotable.io/quotes/random?limit=20&maxLength=120&tags=technology|motivational|famous-quotes";
+
+
 void notifyClients() {
   StaticJsonDocument<128> doc;
-
   doc["j1x"] = analogRead(JOY1_X);
   doc["j1f"] = digitalRead(JOY1_SW) == LOW;
   doc["j2x"] = analogRead(JOY2_X);
   doc["j2f"] = digitalRead(JOY2_SW) == LOW;
-
   String msg;
   serializeJson(doc, msg);
   ws.textAll(msg);
 }
 
+// Get and cache quotes
+void fetchAndCacheQuotes() {
+  HTTPClient http;
+  http.begin(quoteAPI);
+  int httpCode = http.GET();
+
+  if (httpCode == 200) {
+    String payload = http.getString();
+    File file = SPIFFS.open(quoteCachePath, FILE_WRITE);
+    if (file) {
+      file.print(payload);
+      file.close();
+      Serial.println("[Quote] 20 quotes cached.");
+    } else {
+      Serial.println("[Quote] Cannot write to file.");
+    }
+  } else {
+    Serial.printf("[Quote] HTTP error: %d\n", httpCode);
+  }
+
+  http.end();
+}
+
+// WebSocket handle (for joystick communication)
 void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client,
                AwsEventType type, void *arg, uint8_t *data, size_t len) {
   switch (type) {
@@ -47,41 +81,71 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client,
       Serial.printf("[WS] Error on client %u\n", client->id());
       break;
     case WS_EVT_DATA:
-      // Optional: handle incoming client messages here
-      break;
-    default:
       break;
   }
 }
 
-
 void setup() {
   Serial.begin(115200);
   pinMode(JOY1_SW, INPUT_PULLUP);
   pinMode(JOY2_SW, INPUT_PULLUP);
 
   // Start SPIFFS
-  if(!SPIFFS.begin(true)){
-    Serial.println("Błąd SPIFFS");
+  if (!SPIFFS.begin(true)) {
+    Serial.println("[SPIFFS] Mount failed");
     return;
   }
 
-  //  Access Point Mode
+  // try to connect with external network
+  WiFi.mode(WIFI_STA);
+  WiFi.begin(ssid_sta, password_sta);
+  Serial.print("[WiFi] Connecting to WAN");
+
+  for (int i = 0; i < 20 && WiFi.status() != WL_CONNECTED; ++i) {
+    delay(300);
+    Serial.print(".");
+  }
+
+  if (WiFi.status() == WL_CONNECTED) {
+    Serial.println("\n[WiFi] Connected to WAN:");
+    Serial.println(WiFi.localIP());
+    fetchAndCacheQuotes();
+  } else {
+    Serial.println("\n[WiFi] Failed to connect to Internet.");
+  }
+
+  // Local AP
+  WiFi.disconnect(true);
+  delay(500);
+  WiFi.mode(WIFI_AP);
+  WiFi.softAPConfig(apIP, apGateway, apNetmask);
   WiFi.softAP(ssid, password);
-  Serial.println("Access Point uruchomiony");
+
+  Serial.println("[AP] Access Point started");
+  Serial.print("[AP] IP: ");
   Serial.println(WiFi.softAPIP());
 
   // File serve
   server.serveStatic("/", SPIFFS, "/");
-  server.on("/", HTTP_GET, [](AsyncWebServerRequest *request){
+  server.on("/", HTTP_GET, [](AsyncWebServerRequest *request) {
     request->send(SPIFFS, "/index.html", "text/html");
   });
 
-  // ws.onEvent([](AsyncWebSocket *server, AsyncWebSocketClient *client,
-  //               AwsEventType type, void *arg, uint8_t *data, size_t len) {
-  //   // optional: handle messages from clients
-  // });
-  
+  // Endpoint: quotes
+  server.on("/quote", HTTP_GET, [](AsyncWebServerRequest *request) {
+    if (SPIFFS.exists(quoteCachePath)) {
+      request->send(SPIFFS, quoteCachePath, "application/json");
+    } else {
+      StaticJsonDocument<192> doc;
+      doc["content"] = "No internet. Stay sharp, Commander!";
+      doc["author"] = "ESP32";
+      String out;
+      serializeJson(doc, out);
+      request->send(200, "application/json", out);
+    }
+  });
+
+
   ws.onEvent(onWsEvent);
   server.addHandler(&ws);
 
@@ -94,5 +158,6 @@ void loop() {
     notifyClients();
     lastSend = millis();
   }
-  ws.cleanupClients(); // rm unactive clients
+
+  ws.cleanupClients();
 }

data/game.js

@@ -26,7 +26,7 @@ const fallbackQuotes = [
   { text: "Code is like humor. When you have to explain it, it’s bad.", author: "Cory House" },
   { text: "The best way to get a project done faster is to start sooner.", author: "Jim Highsmith" }
 ];
-
+/*
 async function getMotivationalQuote() {
   try {
     const res = await fetch("https://api.quotable.io/random?maxLength=120&tags=technology|motivational|famous-quotes");
@@ -40,7 +40,52 @@ async function getMotivationalQuote() {
   }
 }
 
+*/
+
+async function getMotivationalQuote() {
+  // 1. Try use device connection
+  try {
+    const online = await fetch("https://api.quotable.io/random?maxLength=120&tags=technology|motivational|famous-quotes");
+    if (online.ok) {
+      const data = await online.json();
+      quoteText = data.content || fallbackQuotes[0].text;
+      quoteAuthor = data.author || fallbackQuotes[0].author;
+      return;
+    }
+  } catch (_) {}
+
+  // 2. else ESP conn
+  try {
+    const local = await fetch("/quote");
+    if (local.ok) {
+      const data = await local.json();
+
+      // case 1: single quote object
+      if (data.content && data.author) {
+        quoteText = data.content;
+        quoteAuthor = data.author;
+        return;
+      }
+
+      // case 2: array of quote objects
+      if (Array.isArray(data) && data.length > 0) {
+        const random = data[Math.floor(Math.random() * data.length)];
+        if (random.content && random.author) {
+          quoteText = random.content;
+          quoteAuthor = random.author;
+          return;
+        }
+      }
+    }
+  } catch (err) {
+    console.warn("[Quote] Local ESP fetch failed:", err);
+  }
 
+  // 3. else local code
+  const fallback = fallbackQuotes[Math.floor(Math.random() * fallbackQuotes.length)];
+  quoteText = fallback.text;
+  quoteAuthor = fallback.author;
+}
 
 
 function resizeCanvas() {
@@ -473,6 +518,7 @@ canvas.addEventListener("touchstart", (e) => {
 
 function setupWebSocket() {
   ws = new WebSocket("ws://" + location.hostname + "/ws");
+  // ws = new WebSocket("ws://192.168.4.1/ws");
 
   ws.onmessage = (event) => {
     const data = JSON.parse(event.data);

data/game.js.bak

@@ -26,7 +26,7 @@ const fallbackQuotes = [
   { text: "Code is like humor. When you have to explain it, it’s bad.", author: "Cory House" },
   { text: "The best way to get a project done faster is to start sooner.", author: "Jim Highsmith" }
 ];
-
+/*
 async function getMotivationalQuote() {
   try {
     const res = await fetch("https://api.quotable.io/random?maxLength=120&tags=technology|motivational|famous-quotes");
@@ -40,7 +40,36 @@ async function getMotivationalQuote() {
   }
 }
 
+*/
+
+async function getMotivationalQuote() {
+  // 1. Try use device connection
+  try {
+    const online = await fetch("https://api.quotable.io/random?maxLength=120&tags=technology|motivational|famous-quotes");
+    if (online.ok) {
+      const data = await online.json();
+      quoteText = data.content || fallbackQuotes[0].text;
+      quoteAuthor = data.author || fallbackQuotes[0].author;
+      return;
+    }
+  } catch (_) {}
 
+  // 2. else ESP conn
+  try {
+    const local = await fetch("/quote");
+    if (local.ok) {
+      const data = await local.json();
+      quoteText = data.content || fallbackQuotes[0].text;
+      quoteAuthor = data.author || fallbackQuotes[0].author;
+      return;
+    }
+  } catch (_) {}
+
+  // 3. else local code
+  const fallback = fallbackQuotes[Math.floor(Math.random() * fallbackQuotes.length)];
+  quoteText = fallback.text;
+  quoteAuthor = fallback.author;
+}
 
 
 function resizeCanvas() {
@@ -343,20 +372,9 @@ function draw() {
     ctx.font = "20px sans-serif";
     ctx.fillText(`Score P1: ${player1.score} | P2: ${player2.score}`, canvas.width / 2 - 110, canvas.height / 2 + 20);
 
-	getMotivationalQuote();
-	
     ctx.fillText("Press shoot or move to restart", canvas.width / 2 - 150, canvas.height / 2 + 50);
 
 
-	ctx.font = "18px sans-serif";
-    const quoteWidth = ctx.measureText(`"${quoteText}"`).width;
-    ctx.fillText(`"${quoteText}"`, (canvas.width - quoteWidth) / 2, canvas.height / 2 + 40);
-
-    ctx.font = "16px sans-serif";
-    const authorWidth = ctx.measureText(`— ${quoteAuthor}`).width;
-    ctx.fillText(`— ${quoteAuthor}`, (canvas.width - authorWidth) / 2, canvas.height / 2 + 65);
-	
-	
     requestAnimationFrame(draw);
     return;
   }
@@ -483,7 +501,8 @@ canvas.addEventListener("touchstart", (e) => {
 
 
 function setupWebSocket() {
-  ws = new WebSocket("ws://" + location.hostname + "/ws");
+  // ws = new WebSocket("ws://" + location.hostname + "/ws");
+  ws = new WebSocket("ws://192.168.4.1/ws");
 
   ws.onmessage = (event) => {
     const data = JSON.parse(event.data);