Dev (#9)

* Fix total bandwidth counters * bump version * Merge build changes from main (#8) * Update build.yaml * Update build.yaml * Update build.yaml - Bump release action
stonegray · Oct 14, 2023 · 081c950 · 081c950
1 parent ef592bf
commit 081c950
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
   },
   "name": "speedtest2ha",
   "description": "Speedtest results in Home Assistant via MQTT.",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

diff --git a/src/backendSpeedtest.mjs b/src/backendSpeedtest.mjs
@@ -125,7 +125,7 @@ export async function speedtest(server, exclude, useSingleMode) {
     // Temporary hack until I decide where to put this logic:
     result.download = ~~(result.download / 1e4) / 1e2;
     result.upload = ~~(result.upload / 1e4) / 1e2;
-    result.bytes_recieved = ~~(result.bytes_recieved / 1e4) / 1e2;
+    result.bytes_received = ~~(result.bytes_received / 1e4) / 1e2;
     result.bytes_sent = ~~(result.bytes_sent / 1e4) / 1e2;
 
     // Else we should be fine:

diff --git a/src/fields.mjs b/src/fields.mjs
@@ -72,7 +72,7 @@ export const entities = [
             unique_id: uidPrefix + "uploadtotal",
             enabled_by_default: true
         },
-        backendKey: "upstream"
+        backendKey: "uploadtotal"
     },
     {
         component: "sensor",
@@ -86,7 +86,7 @@ export const entities = [
             unique_id: uidPrefix + "downloadtotal",
             enabled_by_default: true
         },
-        backendKey: "downstream"
+        backendKey: "downloadtotal"
     },
     {
         component: "binary_sensor",

diff --git a/src/mqtt.mjs b/src/mqtt.mjs
@@ -55,10 +55,11 @@ export async function sendFields(data, allowsingle) {
 
 		if (data[en.name] == undefined) continue;
 
-		if (!allowsingle) console.log("Processing sensor", en.name, data[en.name], mqttPath + "/" + en.name);
+		if (!allowsingle) console.log("Processing sensor", en.name, data[en.name], mqttPath + "/" + en.name + " - Sending");
 
         if (!!data[en.name]) {
             await client.publish(mqttPath + "/" + en.name, "" + data[en.name]);
+		if (!allowsingle) console.log("Processing sensor", en.name, data[en.name], mqttPath + "/" + en.name + " - OK");
         } else {
             //console.warn("Backend did not provide the following key, skipping:", en.name);
         }
@@ -69,9 +70,9 @@ export async function sendFields(data, allowsingle) {
 
 export async function connect(){
 
-	console.log(process.env.MQTT_HOST ?? 'mqtt://localhost', options);
+	console.log("Connecting to MQTT server: " + process.env.MQTT_HOST ?? 'mqtt://localhost', options);
+
 	client = mqtt.connect(process.env.MQTT_HOST ?? 'mqtt://localhost', options)
-	console.log(process.env.MQTT_HOST ?? 'mqtt://localhost', options);
 
 	return new Promise((resolveFunc) => {
 		client.on('connect', async function () {

diff --git a/src/speedtest.mjs b/src/speedtest.mjs
@@ -14,7 +14,7 @@ const counters = {
 
 let attempt = 1;
 const t = setInterval(()=>{
-	console.log("Waiting for connection...");
+	console.log("Connecting taking longer than expected...");
 
 	if (attempt++ == 6){
 		console.error("Failed to connect to MQTT after 60 seconds, exiting");
@@ -23,7 +23,6 @@ const t = setInterval(()=>{
 	}
 }, 10000);
 
-console.log("Connecting to MQTT... ");
 await connect();
 
 console.log("Connect OK...");
@@ -53,15 +52,22 @@ async function runTest() {
 
     // Calculate totals:
     if (results.bytes_sent > 1) counters.uploadtotal += results.bytes_sent;
-    if (results.bytes_recieved > 1) counters.downnstream += results.bytes_recieved;
+    if (results.bytes_received > 1) counters.downloadtotal += results.bytes_received;
     counters.total = counters.uploadtotal + counters.downloadtotal;
+
+	results.downloadtotal = counters.downloadtotal;
+	results.uploadtotal = counters.uploadtotal;
 
     sendFields(results);
 
 }
 
-if (!process.env.NO_TEST_ON_STARTUP)
-    await runTest();
+if (!process.env.NO_TEST_ON_STARTUP){
+	await runTest();
+	console.log( "Initial test finished, waiting for next scheduled test");
+} else {
+	console.log( "Skipping initial test, waiting for next scheduled test");
+}
 
 cron.schedule(process.env.CRON ?? '* */1 * * *', async () => {
     await runTest();