fix: send correct message on plugin execution using content script (#116

) * fix: send correct message on plugin execution using content script * fix: get plugins filter logic and run plugin message timing on content script
tlsnotary · Nov 8, 2024 · ed3e797 · ed3e797
1 parent 3989505
commit ed3e797
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 5 deletions.
diff --git a/src/entries/Background/db.ts b/src/entries/Background/db.ts
@@ -234,10 +234,16 @@ export async function getPlugins(): Promise<
       ret.push({
         ...config,
         hash,
-        metadata: metadata || {
-          filePath: '',
-          origin: '',
-        },
+        metadata: metadata
+          ? {
+              ...metadata,
+              hash,
+            }
+          : {
+              filePath: '',
+              origin: '',
+              hash,
+            },
       });
     }
   }

diff --git a/src/pages/GetPluginsApproval/index.tsx b/src/pages/GetPluginsApproval/index.tsx
@@ -58,7 +58,7 @@ export function GetPluginsApproval(): ReactElement {
       });
       setResult(res);
     })();
-  }, [url, filterMetadata]);
+  }, [url, JSON.stringify(filterMetadata)]);
 
   return (
     <BaseApproval

diff --git a/src/pages/RunPluginApproval/index.tsx b/src/pages/RunPluginApproval/index.tsx
@@ -11,6 +11,8 @@ import {
   getPluginMetadataByHash,
 } from '../../entries/Background/db';
 import { runPlugin } from '../../utils/rpc';
+import { SidePanelActionTypes } from '../../entries/SidePanel/types';
+import { deferredPromise } from '../../utils/promise';
 
 export function RunPluginApproval(): ReactElement {
   const [params] = useSearchParams();
@@ -38,9 +40,29 @@ export function RunPluginApproval(): ReactElement {
 
       await browser.storage.local.set({ plugin_hash: hash });
 
+      const { promise, resolve } = deferredPromise();
+
+      const listener = async (request: any) => {
+        if (request.type === SidePanelActionTypes.panel_opened) {
+          browser.runtime.onMessage.removeListener(listener);
+          resolve();
+        }
+      };
+
+      browser.runtime.onMessage.addListener(listener);
+
       // @ts-ignore
       if (chrome.sidePanel) await chrome.sidePanel.open({ tabId: tab.id });
 
+      await promise;
+
+      browser.runtime.sendMessage({
+        type: SidePanelActionTypes.execute_plugin_request,
+        data: {
+          pluginHash: hash,
+        },
+      });
+
       browser.runtime.sendMessage({
         type: BackgroundActiontype.run_plugin_response,
         data: true,