Merge pull request #1993 from jeddai/add-try-catch-around-local-session-storage

Author: jeddai

CHANGELOG.md

@@ -1,5 +1,7 @@
 # Unreleased changes
 
+* [#1993](https://github.com/mozilla/glean.js/pull/1993): Add try-catch around uses of sessionStorage and localStorage in core.
+
 [Full changelog](https://github.com/mozilla/glean.js/compare/v5.0.4...main)
 
 # v5.0.4 (2025-04-02)

glean/src/core/glean.ts

@@ -47,16 +47,20 @@ const setDebugOptionInSessionStorage = (
 ) => {
   const key = `Glean.${option.toString()}`;
 
-  switch (option) {
-  case DebugOption.DebugTag:
-    sessionStorage.setItem(key, value as string);
-    break;
-  case DebugOption.LogPings:
-    sessionStorage.setItem(key, (value as boolean).toString());
-    break;
-  case DebugOption.SourceTags:
-    sessionStorage.setItem(key, (value as string[]).join(","));
-    break;
+  try {
+    switch (option) {
+    case DebugOption.DebugTag:
+      sessionStorage.setItem(key, value as string);
+      break;
+    case DebugOption.LogPings:
+      sessionStorage.setItem(key, (value as boolean).toString());
+      break;
+    case DebugOption.SourceTags:
+      sessionStorage.setItem(key, (value as string[]).join(","));
+      break;
+    }
+  } catch (e) {
+    console.warn(e);
   }
 };
 
@@ -69,7 +73,12 @@ const setDebugOptionInSessionStorage = (
 const getDebugOptionFromSessionStorage = (
   option: DebugOptionValue
 ): string | undefined => {
-  return sessionStorage.getItem(`Glean.${option.toString()}`) || undefined;
+  try {
+    return sessionStorage.getItem(`Glean.${option.toString()}`) || undefined;
+  } catch (e) {
+    console.warn(e);
+    return undefined;
+  }
 };
 
 namespace Glean {

glean/src/core/internal_metrics.ts

@@ -209,8 +209,12 @@ export class CoreMetrics {
       this.generateNewSession();
     }
 
-    // Update the last-active timestamp in LocalStorage to the current time.
-    localStorage.setItem("glean_session_last_active", Date.now().toString());
+    try {
+      // Update the last-active timestamp in LocalStorage to the current time.
+      localStorage.setItem("glean_session_last_active", Date.now().toString());
+    } catch (e) {
+      console.warn(e);
+    }
   }
 
   /**

glean/src/core/sessions.ts

@@ -9,7 +9,12 @@
  * @returns {boolean} If the current session is inactive.
  */
 export function isSessionInactive(sessionLengthInMinutes = 30): boolean {
-  const lastActive = localStorage.getItem("glean_session_last_active");
+  let lastActive: string | null = null;
+  try {
+    lastActive = localStorage.getItem("glean_session_last_active");
+  } catch (e) {
+    console.warn(e);
+  }
   const lastActiveDate = new Date(Number(lastActive));
 
   // Subtract the session length from the current date.