Merge branch 'main' of https://github.com/boyonglin/google-maps-extension

Author: boyonglin

Package/dist/popup.js

@@ -150,9 +150,6 @@ document.addEventListener("DOMContentLoaded", () => {
   initializePopup();
 });
 
-// Track dwell time based on tab visibility
-// When user switches to another tab, end the current page tracking
-// When user comes back, restart tracking for the same page
 document.addEventListener("visibilitychange", () => {
   if (window.Analytics) {
     window.Analytics.handleVisibilityChange(document.visibilityState === "visible");
@@ -174,7 +171,6 @@ function popupLayout() {
   showPage("history");
   checkTextOverflow();
 
-  // Track initial page view when popup opens
   if (window.Analytics) {
     window.Analytics.trackPageView("history");
   }
@@ -203,11 +199,41 @@ function checkTextOverflow() {
   }
 }
 
-async function getWarmState() {
+async function getWarmState(retries = 3, delay = 200) {
   return new Promise((resolve) => {
-    chrome.runtime.sendMessage({ action: "getWarmState" }, (state) => {
-      resolve(state ?? {});
-    });
+    if (!chrome.runtime?.id) {
+      resolve({});
+      return;
+    }
+
+    const maxDelay = 3000;
+    const backoffDelay = Math.min(delay * 2, maxDelay);
+
+    const timeout = setTimeout(() => {
+      if (retries > 0) {
+        resolve(getWarmState(retries - 1, backoffDelay));
+      } else {
+        resolve({});
+      }
+    }, delay);
+
+    try {
+      chrome.runtime.sendMessage({ action: "getWarmState" }, (state) => {
+        clearTimeout(timeout);
+        if (chrome.runtime.lastError) {
+          if (retries > 0) {
+            resolve(getWarmState(retries - 1, backoffDelay));
+          } else {
+            resolve({});
+          }
+        } else {
+          resolve(state ?? {});
+        }
+      });
+    } catch (e) {
+      clearTimeout(timeout);
+      resolve({});
+    }
   });
 }
 

Package/dist/utils/analytics.module.js

@@ -11,6 +11,7 @@ const Analytics = {
   // Page view tracking state
   _currentPage: null,
   _pageStartTime: null,
+  _lastPage: null,
 
   // Get or create anonymous Client ID
   getOrCreateClientId() {
@@ -147,9 +148,6 @@ const Analytics = {
     }
   },
 
-  // Store last page for resuming
-  _lastPage: null,
-
   // Track keyboard shortcut usage (service worker only)
   trackShortcut(shortcutName) {
     this.trackEvent("shortcut_used", {

tests/analytics.module.test.js

@@ -272,13 +272,13 @@ describe("analytics.module.js - Analytics ES Module", () => {
     });
 
     test("should include page_name in params", async () => {
-      Analytics.trackPageView("favorites");
+      Analytics.trackPageView("favorite");
 
       await flushPromises();
 
       const requestBody = JSON.parse(mockFetch.mock.calls[0][1].body);
 
-      expect(requestBody.events[0].params.page_name).toBe("favorites");
+      expect(requestBody.events[0].params.page_name).toBe("favorite");
     });
 
     test("should set _currentPage and _pageStartTime when tracking a page", () => {
@@ -301,10 +301,10 @@ describe("analytics.module.js - Analytics ES Module", () => {
       Analytics._pageStartTime = Date.now() - 5000; // 5 seconds ago
 
       // Switch to another page
-      Analytics.trackPageView("favorites");
+      Analytics.trackPageView("favorite");
       await flushPromises();
 
-      // Should have sent page_dwell for "history" and page_view for "favorites"
+      // Should have sent page_dwell for "history" and page_view for "favorite"
       expect(mockFetch).toHaveBeenCalledTimes(2);
 
       const dwellCall = JSON.parse(mockFetch.mock.calls[0][1].body);
@@ -386,10 +386,10 @@ describe("analytics.module.js - Analytics ES Module", () => {
     });
 
     test("should store lastPage when tab becomes hidden", () => {
-      Analytics.trackPageView("favorites");
+      Analytics.trackPageView("favorite");
       Analytics.handleVisibilityChange(false);
 
-      expect(Analytics._lastPage).toBe("favorites");
+      expect(Analytics._lastPage).toBe("favorite");
       expect(Analytics._currentPage).toBeNull();
     });
 

tests/popup.test.js

@@ -332,6 +332,72 @@ describe("popup.js", () => {
 
       expect(result).toEqual({});
     });
+
+    test("getWarmState returns empty object when extension context is invalid", async () => {
+      const originalId = chrome.runtime.id;
+      delete chrome.runtime.id;
+
+      const result = await popup.getWarmState();
+
+      expect(result).toEqual({});
+      chrome.runtime.id = originalId;
+    });
+
+    test("getWarmState retries on chrome.runtime.lastError", async () => {
+      let callCount = 0;
+      chrome.runtime.sendMessage.mockImplementation((message, callback) => {
+        if (message.action === "getWarmState") {
+          callCount++;
+          if (callCount < 3) {
+            // Simulate async behavior with setTimeout to allow retry to work
+            setTimeout(() => {
+              Object.defineProperty(chrome.runtime, "lastError", {
+                value: { message: "Service worker not responding" },
+                configurable: true,
+              });
+              callback(null);
+              Object.defineProperty(chrome.runtime, "lastError", {
+                value: null,
+                configurable: true,
+              });
+            }, 0);
+          } else {
+            setTimeout(() => {
+              callback({ searchHistoryList: ["success"] });
+            }, 0);
+          }
+        }
+        return true;
+      });
+
+      const result = await popup.getWarmState();
+
+      expect(result).toEqual({ searchHistoryList: ["success"] });
+      expect(callCount).toBe(3);
+    });
+
+    test("getWarmState returns empty object after all retries exhausted", async () => {
+      chrome.runtime.sendMessage.mockImplementation((message, callback) => {
+        if (message.action === "getWarmState") {
+          setTimeout(() => {
+            Object.defineProperty(chrome.runtime, "lastError", {
+              value: { message: "Service worker not responding" },
+              configurable: true,
+            });
+            callback(null);
+            Object.defineProperty(chrome.runtime, "lastError", {
+              value: null,
+              configurable: true,
+            });
+          }, 0);
+        }
+        return true;
+      });
+
+      const result = await popup.getWarmState(0); // 0 retries = single attempt only
+
+      expect(result).toEqual({});
+    });
   });
 
   describe("fetchData", () => {

tests/setup.js

@@ -33,6 +33,7 @@ global.TextDecoder = TextDecoder;
 // Mock Chrome API
 global.chrome = {
   runtime: {
+    id: "mock-extension-id",
     sendMessage: jest.fn(),
     onMessage: {
       addListener: jest.fn(),