feedback

Author: djanhjo

src/utilities/local-storage.js

@@ -1,3 +1,5 @@
+import { log } from "./log";
+
 const maxExpiryDays = 365;
 
 const isPersistingSessionLocalStoreName = "gist.web.isPersistingSession";
@@ -52,25 +54,33 @@ function getStorage() {
 function checkKeyForExpiry(key) {
     if (!key) return null;
 
-    const itemStr = getStorage().getItem(key);
-    if (!itemStr) return null;
+    try {
+        const itemStr = getStorage().getItem(key);
+        if (!itemStr) return null;
 
-    const item = JSON.parse(itemStr);
-    const now = new Date();
-    const expiryTime = new Date(item.expiry);
-    
-    // Retroactive bugfix: remove old cache entries with long expiry times
-    const isBroadcastOrUserKey = (key.startsWith("gist.web.message.broadcasts") && !key.endsWith("shouldShow") && !key.endsWith("numberOfTimesShown")) || (key.startsWith("gist.web.message.user") && !key.endsWith("seen"));
-    const sixtyMinutesFromNow = new Date(now.getTime() + 61 * 60 * 1000);
-    if (isBroadcastOrUserKey && expiryTime.getTime() > sixtyMinutesFromNow.getTime()) {
-        clearKeyFromLocalStore(key);
-        return null;
+        const item = JSON.parse(itemStr);
+        if (!item.expiry) return item.value;
+
+        const now = new Date();
+        const expiryTime = new Date(item.expiry);
+        
+        // remove old cache entries with long expiry times
+        const isBroadcastOrUserKey = (key.startsWith("gist.web.message.broadcasts") && !key.endsWith("shouldShow") && !key.endsWith("numberOfTimesShown")) || (key.startsWith("gist.web.message.user") && !key.endsWith("seen"));
+        const sixtyMinutesFromNow = new Date(now.getTime() + 61 * 60 * 1000);
+        if (isBroadcastOrUserKey && expiryTime.getTime() > sixtyMinutesFromNow.getTime()) {
+            clearKeyFromLocalStore(key);
+            return null;
+        }
+        
+        if (now.getTime() > expiryTime.getTime()) {
+            clearKeyFromLocalStore(key);
+            return null;
+        }
+
+        return item.value;
+    } catch (e) {
+        log(`Error checking key ${key} for expiry: ${e}`);
     }
 
-    if (now.getTime() > expiryTime.getTime()) {
-        clearKeyFromLocalStore(key);
-        return null;
-    }
-
-    return item.value;
+    return null;
 }