http

Author: PsyChonek

ESP/src/main.cpp

@@ -26,7 +26,7 @@ String espID;
 void connectToWifi();
 void setUpTime();
 
-String getValuesJSON(float temperature, float humidity, int timestamp, String espID);
+String getValuesJSON(float temperature, float humidity, String espID);
 
 String readReading();
 
@@ -48,25 +48,42 @@ void setup()
   else
   {
     File file = SPIFFS.open("/espID.txt", "r");
-    if (!file)
-    {
-      Serial.println("Failed to open file for reading");
 
-      file = SPIFFS.open("/espID.txt", "w");
+    while (espID == "")
+    {
       if (!file)
       {
-        Serial.println("Failed to open file for writing");
+        Serial.println("Failed to open file for reading");
+
+        file = SPIFFS.open("/espID.txt", "w");
+        if (!file)
+        {
+          Serial.println("Failed to open file for writing");
+        }
+        else
+        {
+          espID = String(random(1000, 9999));
+          file.print(espID);
+        }
       }
-      else
-      {
-        espID = String(random(1000, 9999));
-        Serial.println("Esp ID: " + espID);
 
-        file.print(espID);     
+      espID = file.readString();
+      if (espID == "")
+      {
+        file.close();
+        file = SPIFFS.open("/espID.txt", "w");
+        if (!file)
+        {
+          Serial.println("Failed to open file for writing");
+        }
+        else
+        {
+          espID = String(random(1000, 9999));
+          file.print(espID);
+        }
       }
     }
 
-    espID = file.readString();
     Serial.println("Esp ID: " + espID);
 
     file.close();
@@ -112,7 +129,7 @@ void connectToWifi()
 
 String readReading()
 {
-  return getValuesJSON(dht.readTemperature(), dht.readHumidity(), time(&now), espID);
+  return getValuesJSON(dht.readTemperature(), dht.readHumidity(), espID);
 }
 
 void sendInfo()
@@ -122,7 +139,7 @@ void sendInfo()
 
   String values;
   serializeJson(status, values);
-  
+
   Serial.println("making POST request");
 
   String path = "/addSensor";
@@ -159,7 +176,7 @@ void sendReading(String value)
 }
 
 // Send values to web page
-String getValuesJSON(float temperature, float humidity, int timestamp = 0, String espID = "")
+String getValuesJSON(float temperature, float humidity, String espID = "")
 {
   if (isnan(temperature) || isnan(humidity))
   {
@@ -170,7 +187,6 @@ String getValuesJSON(float temperature, float humidity, int timestamp = 0, Strin
   // Return values in JSON
   reading["temperature"] = temperature;
   reading["humidity"] = humidity;
-  reading["timestamp"] = timestamp;
   reading["espID"] = espID;
 
   String values;
@@ -197,6 +213,7 @@ void setUpTime()
     wait_time++;
     if (wait_time > max_wait_time)
     {
+      Serial.println("");
       Serial.println("Failed to obtain time. Check your network connection.");
       break;
     }

services/api/server.js

@@ -25,6 +25,7 @@ await fastify.register(fastifySwagger, {
 			version: "0.1.0",
 		},
 	},
+	allowedHosts: ['http://vazypi.local:9051'],
 });
 
 await fastify.register(fastifySwaggerUI, {
@@ -108,6 +109,7 @@ fastify.post(
 		const newReading = { espID, temperature, humidity, timestamp: new Date(timestampNew) };
 		const result = await readings.insertOne(newReading);
 		reply.send(result);
+		return;
 	}
 );
 
@@ -169,9 +171,11 @@ fastify.get(
 			});
 
 			reply.send(result);
+			return;
 		} catch (error) {
 			console.error("Error querying MongoDB:", error);
 			reply.code(500).send({ error: "Failed to fetch readings." });
+			return;
 		}
 	}
 );
@@ -213,10 +217,12 @@ fastify.post(
 		const existingSensor = await sensors.findOne({ ip, espID });
 		if (existingSensor) {
 			reply.code(400).send({ error: "Sensor already exists." });
+			return;
 		}
 
 		const result = await sensors.insertOne(newSensor);
 		reply.send(result);
+		return;
 	}
 );
 
@@ -260,6 +266,7 @@ fastify.get(
 
 		console.log(result);
 		reply.send(result);
+		return;
 	}
 );
 
@@ -311,12 +318,15 @@ fastify.patch(
 
 			if (result.modifiedCount === 0) {
 				reply.code(404).send({ error: "Sensor not found or no changes made" });
+				return;
 			} else {
 				reply.send({ message: "Sensor updated successfully" });
+				return;
 			}
 		} catch (error) {
 			console.error("Error updating sensor:", error);
 			reply.code(500).send({ error: "Internal server error" });
+			return;
 		}
 	}
 );

services/docker-compose.yml

@@ -15,7 +15,7 @@ services:
         - action: rebuild
           path: ./web-nuxt
     environment:
-      - NUXT_PUBLIC_API_BASE_URL=https://api:3000
+      - NUXT_PUBLIC_API_BASE_URL=http://api:3000
   db:
     build: ./db
     container_name: climate-db