Use await in chrome.storage.local.get.

Call open cookie database only once.
GoogleChromeLabs · May 9, 2024 · f6ca935 · f6ca935
1 parent 1471df0
commit f6ca935
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 58 deletions.
diff --git a/packages/extension/src/contentScript/index.ts b/packages/extension/src/contentScript/index.ts
@@ -41,7 +41,6 @@ import { TOOLTIP_CLASS } from './constants';
 import {
   DEVTOOLS_SET_JAVASCSCRIPT_COOKIE,
   GET_JS_COOKIES,
-  SERVICE_WORKER_PORT_NAME,
   TABID_STORAGE,
   WEBPAGE_PORT_NAME,
 } from '../constants';
@@ -63,11 +62,6 @@ class WebpageContentScript {
    */
   port: chrome.runtime.Port | null = null;
 
-  /**
-   * Serviceeworker Connection port
-   */
-  serviceWorkerPort: chrome.runtime.Port | null = null;
-
   /**
    * TabId of the current Tab
    */
@@ -158,13 +152,6 @@ class WebpageContentScript {
 
       if (message?.payload?.type === TABID_STORAGE) {
         this.tabId = message.payload.tabId;
-        chrome.runtime.sendMessage({
-          setInPage: true,
-          type: 'PING',
-          payload: {
-            tabId: this.tabId,
-          },
-        });
       }
 
       if (message?.payload?.type === GET_JS_COOKIES) {
@@ -182,13 +169,6 @@ class WebpageContentScript {
         port.onMessage.addListener(this.onMessage);
         port.onDisconnect.addListener(this.onDisconnect);
       }
-      if (port.name.startsWith(SERVICE_WORKER_PORT_NAME)) {
-        this.serviceWorkerPort = port;
-        this.serviceWorkerPort.onMessage.addListener(noop);
-        this.serviceWorkerPort.onDisconnect.addListener(() => {
-          this.serviceWorkerPort = null;
-        });
-      }
     });
   }
 
@@ -204,6 +184,7 @@ class WebpageContentScript {
         tabUrl: window.location.href,
         tabId,
         documentCookies: jsCookies,
+        cookieDB: this.cookieDB ?? {},
       });
     } catch (error) {
       //Fail silently. No logging because sometimes cookieStore.getAll fails to run in some context.
@@ -319,8 +300,6 @@ class WebpageContentScript {
         setInPage: false,
       });
     }
-    this.serviceWorkerPort?.disconnect();
-    this.serviceWorkerPort = null;
   }
 
   /**

diff --git a/packages/extension/src/serviceWorker/index.ts b/packages/extension/src/serviceWorker/index.ts
@@ -37,7 +37,6 @@ import {
   INITIAL_SYNC,
   POPUP_CLOSE,
   POPUP_OPEN,
-  SERVICE_WORKER_PORT_NAME,
   SERVICE_WORKER_RELOAD_MESSAGE,
   SERVICE_WORKER_TABS_RELOAD_COMMAND,
   SET_TAB_TO_READ,
@@ -165,6 +164,10 @@ chrome.webRequest.onBeforeSendHeaders.addListener(
  * @see https://developer.chrome.com/docs/extensions/reference/api/runtime#event-onStartup
  */
 chrome.runtime.onStartup.addListener(async () => {
+  setInterval(async () => {
+    await chrome.storage.session.get();
+  }, 20000);
+
   const storage = await chrome.storage.sync.get();
 
   if (!syncCookieStore) {
@@ -293,6 +296,10 @@ chrome.runtime.onInstalled.addListener(async (details) => {
   syncCookieStore = new SynchnorousCookieStore();
   syncCookieStore?.clear();
 
+  setInterval(async () => {
+    await chrome.storage.session.get();
+  }, 20000);
+
   if (details.reason === 'install') {
     await chrome.storage.sync.clear();
     await chrome.storage.sync.set({
@@ -606,38 +613,6 @@ chrome.runtime.onMessage.addListener(async (request) => {
 
   const incomingMessageTabId = request.payload.tabId;
 
-  if ('PING' === request?.type) {
-    if (syncCookieStore && syncCookieStore?.tabs[incomingMessageTabId]) {
-      if (!syncCookieStore?.tabs[incomingMessageTabId]?.portRef) {
-        syncCookieStore.tabs[incomingMessageTabId].portRef =
-          chrome.tabs.connect(Number(incomingMessageTabId), {
-            name: `${SERVICE_WORKER_PORT_NAME}-${incomingMessageTabId}`,
-          });
-      }
-
-      if (syncCookieStore?.tabs[incomingMessageTabId]?.portRef) {
-        setInterval(() => {
-          syncCookieStore?.tabs[incomingMessageTabId]?.portRef?.postMessage({
-            status: 'ping',
-          });
-        }, 10000);
-      }
-
-      syncCookieStore?.tabs[
-        incomingMessageTabId
-      ]?.portRef.onDisconnect.addListener(() => {
-        if (
-          syncCookieStore &&
-          syncCookieStore?.tabs[incomingMessageTabId]?.portRef
-        ) {
-          syncCookieStore.tabs[incomingMessageTabId].portRef = null;
-        }
-
-        clearInterval(10000);
-      });
-    }
-  }
-
   if (DEVTOOLS_OPEN === incomingMessageType) {
     const dataToSend: { [key: string]: string | boolean } = {};
     dataToSend['tabMode'] = tabMode;

diff --git a/packages/extension/src/utils/processAndStoreDocumentCookies.ts b/packages/extension/src/utils/processAndStoreDocumentCookies.ts
@@ -20,30 +20,31 @@ import {
   isFirstParty,
   findAnalyticsMatch,
   type CookieData,
+  type CookieDatabase,
 } from '@ps-analysis-tool/common';
 import { type Cookie as ParsedCookie } from 'simple-cookie';
 
 /**
  * Internal dependencies.
  */
 import { createCookieObject } from '../serviceWorker/createCookieObject';
-import { fetchDictionary } from './fetchCookieDictionary';
+
 import { GET_JS_COOKIES } from '../constants';
 
 interface ProcessAndStoreDucmentCookies {
   tabUrl: string;
   tabId: string;
   documentCookies: ParsedCookie[];
+  cookieDB: CookieDatabase;
 }
 
 const processAndStoreDocumentCookies = async ({
   tabUrl,
   tabId,
   documentCookies,
+  cookieDB,
 }: ProcessAndStoreDucmentCookies) => {
   try {
-    const cookieDB = await fetchDictionary();
-
     const parsedCookieData: CookieData[] = documentCookies.map(
       (singleCookie: ParsedCookie) => {
         let parsedCookie = {