Don't fail if can't get last weather

BlythMeister · Oct 15, 2024 · ca4aac3 · ca4aac3
1 parent a743e76
commit ca4aac3
Showing 1 changed file with 23 additions and 15 deletions.
diff --git a/src/366x366/companion/index.js b/src/366x366/companion/index.js
@@ -158,19 +158,23 @@ function sendWeather(unit) {
     unitKey = "fahrenheit";
   }
 
-  localStorage.setItem("lastWeatherUnit", unit);
+  localStorage.setItem("lastWeatherUnit", unitKey);
 
-  let lastWeatherJson = localStorage.getItem("lastWeather");
-  if(lastWeatherJson != null) {
-    let lastWeather = JSON.parse(lastWeatherJson)
-    console.log(`lastWeather: ${lastWeatherJson}`)
-    let lastWeatherAge = new Date() - new Date(lastWeather.date);
-
-    if (lastWeather.condition >= 0 && lastWeather.unit == unitKey && lastWeatherAge < 600000) {
-      console.warn(`Weather requested again within 10 minutes (${lastWeatherAge}ms), returning old weather`);
-      msgq.send("weather", lastWeather, true);
-      return;
+  try { 
+    let lastWeatherJson = localStorage.getItem("lastWeather");
+    if(lastWeatherJson != null) {
+      let lastWeather = JSON.parse(lastWeatherJson)
+      console.log(`lastWeather: ${lastWeatherJson}`)
+      let lastWeatherAge = new Date() - new Date(lastWeather.date);
+
+      if (lastWeather.condition >= 0 && lastWeather.unit == unitKey && lastWeatherAge < 600000) {
+        console.warn(`Weather requested again within 10 minutes (${lastWeatherAge}ms), returning old weather`);
+        msgq.send("weather", lastWeather, true);
+        return;
+      }
     }
+  } catch (e) {
+    console.error(e);
   }
 
   console.log("Trying to get weather as last weather no good");
@@ -223,9 +227,13 @@ function sendWeather(unit) {
 }
 
 function locationChange() {
-  let lastWeatherUnit = localStorage.getItem("lastWeatherUnit");
-  if (lastWeatherUnit != null) {
-    localStorage.setItem("lastWeather", null);
-    sendWeather(lastWeatherUnit);
+  try {
+    let lastWeatherUnit = localStorage.getItem("lastWeatherUnit");
+    if (lastWeatherUnit != null) {
+      localStorage.setItem("lastWeather", null);
+      sendWeather(lastWeatherUnit);
+    }
+  } catch (e) {
+    console.error(e);
   }
 }