Merge pull request #229 from yuque/refactor/showmessage

fix: 修复剪藏语雀文档丢失问题
yuque · Dec 22, 2023 · 8c6ddd9 · 8c6ddd9
2 parents 9d7bf8d + e356ced
commit 8c6ddd9
Show file tree

Hide file tree

Showing 20 changed files with 430 additions and 547 deletions.
diff --git a/src/background/actionListener/tab.ts b/src/background/actionListener/tab.ts
@@ -1,36 +1,52 @@
 import { OperateTabEnum, IOperateTabData } from '@/isomorphic/background/tab';
-import Chrome from '@/background/core/chromeExtension';
-import { ContentScriptEvents } from '@/isomorphic/event/contentScript';
+import chromeExtension from '@/background/core/chromeExtension';
 import { RequestMessage } from './index';
 
 export async function createTabActionListener(
   request: RequestMessage<IOperateTabData>,
   callback: (params: any) => void,
   sender: chrome.runtime.MessageSender,
 ) {
-  const { type, url } = request.data;
+  const { type, url, data } = request.data;
+  const currentTab = await chromeExtension.tabs.getCurrentTab(sender.tab);
   switch (type) {
     case OperateTabEnum.screenShot: {
-      const tabs = await Chrome.tabs.query({ lastFocusedWindow: true });
-      const res = await Chrome.tabs.captureVisibleTab(tabs[0].windowId as number);
+      const res = await chromeExtension.tabs.captureVisibleTab(currentTab.windowId as number);
       callback(res);
       break;
     }
     case OperateTabEnum.getCurrent: {
-      const tab = await Chrome.tabs.query({ lastFocusedWindow: true, active: true });
-      callback(tab?.[0]);
+      callback(currentTab);
       break;
     }
     case OperateTabEnum.create: {
-      Chrome.tabs.create({ url });
+      chromeExtension.tabs.create({ url });
       callback(true);
       break;
     }
     case OperateTabEnum.getDocument: {
-      const res = await Chrome.sendMessageToCurrentTab({
-        action: ContentScriptEvents.GetDocument,
+      const result = await chromeExtension.scripting.executeScript({
+        target: { tabId: currentTab.id as number },
+        func: () => {
+          return {
+            url: window.location.href,
+            html: document.documentElement.outerHTML,
+            title: document.title,
+          };
+        },
       });
-      callback(res);
+      callback(result[0].result);
+      break;
+    }
+    case OperateTabEnum.showMessage: {
+      chromeExtension.scripting.executeScript({
+        target: { tabId: currentTab.id as number },
+        args: [{ config: data }],
+        func: args => {
+          return window._yuque_ext_app.showMessage(args.config);
+        },
+      });
+      callback(true);
       break;
     }
     default: {

diff --git a/src/components/SuperSideBar/impl/ClipAssistant/index.tsx b/src/components/SuperSideBar/impl/ClipAssistant/index.tsx
@@ -26,10 +26,6 @@ import {
   ClipAssistantMessageKey,
   ClipAssistantMessageActions,
 } from '@/isomorphic/event/clipAssistant';
-import {
-  ContentScriptMessageActions,
-  ContentScriptMessageKey,
-} from '@/isomorphic/event/contentScript';
 import Env from '@/isomorphic/env';
 import { IClipConfig } from '@/isomorphic/constant/clip';
 import LarkIcon from '@/components/LarkIcon';
@@ -83,18 +79,11 @@ function ClipContent() {
       link: { text: string; href: string },
     ) => {
       if (Env.isRunningHostPage) {
-        window.parent.postMessage(
-          {
-            key: ContentScriptMessageKey,
-            action: ContentScriptMessageActions.ShowMessage,
-            data: {
-              text,
-              type: 'success',
-              link,
-            },
-          },
-          '*',
-        );
+        backgroundBridge.tab.showMessage({
+          text,
+          type: 'success',
+          link,
+        });
         return;
       }
       message.success(

diff --git a/src/core/bridge/background/index.ts b/src/core/bridge/background/index.ts
@@ -1,4 +1,3 @@
-import Chrome from '@/core/chrome';
 import { MapT, OneArgFunctionT } from '@/common/declare';
 import { createStorageBridge } from './stroge';
 import { createUserBridge } from './user';
@@ -20,21 +19,15 @@ export interface IBridgeError {
 
 type IBridgeCallback = (res: any) => void;
 
-export type ICallBridgeImpl = (
-  bridgeName: string,
-  params?: IBridgeParams,
-  callback?: IBridgeCallback,
-) => void;
-
-export function callBackgroundBridge(
-  bridgeName: string,
-  data?: MapT<any>,
-  callback?: OneArgFunctionT<any>,
-) {
-  callback = callback || function() {
-    // ignore
-  };
-  Chrome.runtime.sendMessage(
+export type ICallBridgeImpl = (bridgeName: string, params?: IBridgeParams, callback?: IBridgeCallback) => void;
+
+export function callBackgroundBridge(bridgeName: string, data?: MapT<any>, callback?: OneArgFunctionT<any>) {
+  callback =
+    callback ||
+    function () {
+      // ignore
+    };
+  chrome.runtime.sendMessage(
     {
       action: bridgeName,
       data,

diff --git a/src/core/bridge/background/tab.ts b/src/core/bridge/background/tab.ts
@@ -7,35 +7,23 @@ export function createTabBridge(impl: ICallBridgeImpl) {
     tab: {
       async screenShot() {
         return new Promise(resolve => {
-          impl(
-            BackgroundEvents.OperateTab,
-            { type: OperateTabEnum.screenShot },
-            res => {
-              resolve(res);
-            },
-          );
+          impl(BackgroundEvents.OperateTab, { type: OperateTabEnum.screenShot }, res => {
+            resolve(res);
+          });
         });
       },
       async getCurrent(): Promise<chrome.tabs.Tab | undefined> {
         return new Promise(resolve => {
-          impl(
-            BackgroundEvents.OperateTab,
-            { type: OperateTabEnum.getCurrent },
-            res => {
-              resolve(res);
-            },
-          );
+          impl(BackgroundEvents.OperateTab, { type: OperateTabEnum.getCurrent }, res => {
+            resolve(res);
+          });
         });
       },
       async create(url: string) {
         return new Promise(resolve => {
-          impl(
-            BackgroundEvents.OperateTab,
-            { type: OperateTabEnum.create, url },
-            res => {
-              resolve(res);
-            },
-          );
+          impl(BackgroundEvents.OperateTab, { type: OperateTabEnum.create, url }, res => {
+            resolve(res);
+          });
         });
       },
       async getDocument(): Promise<{
@@ -44,13 +32,23 @@ export function createTabBridge(impl: ICallBridgeImpl) {
         title: string;
       }> {
         return new Promise(resolve => {
-          impl(
-            BackgroundEvents.OperateTab,
-            { type: OperateTabEnum.getDocument },
-            res => {
-              resolve(res);
-            },
-          );
+          impl(BackgroundEvents.OperateTab, { type: OperateTabEnum.getDocument }, res => {
+            resolve(res);
+          });
+        });
+      },
+      async showMessage(data: {
+        type: 'error' | 'success';
+        text: string;
+        link?: {
+          text: string;
+          href: string;
+        };
+      }) {
+        return new Promise(resolve => {
+          impl(BackgroundEvents.OperateTab, { type: OperateTabEnum.showMessage, data }, res => {
+            resolve(res);
+          });
         });
       },
     },

diff --git a/src/core/chrome.ts b/src/core/chrome.ts
diff --git a/src/core/parseDom/index.ts b/src/core/parseDom/index.ts
@@ -13,12 +13,12 @@ class ParseDom {
   }
 
   async parseDom(domArray: Element[]) {
-    const result: Array<string> = [];
+    let result: Array<string> = [];
     for (const dom of domArray) {
       if (this.isYuqueContent(dom)) {
         try {
           const htmlArray = await this.parsePageYuqueContent(dom);
-          result.push(htmlArray[0]);
+          result = result.concat(htmlArray);
           continue;
         } catch (error) {
           //

diff --git a/src/hooks/useCheckVersion.ts b/src/hooks/useCheckVersion.ts
@@ -1,5 +1,4 @@
 import { useState, useEffect } from 'react';
-import Chrome from '@/core/chrome';
 
 async function fetchAndParseXML(updateUrl: string): Promise<string | null> {
   const response = await fetch(
@@ -16,9 +15,7 @@ async function fetchAndParseXML(updateUrl: string): Promise<string | null> {
   const root = xml.documentElement;
 
   // @ts-ignore
-  const version = root
-    .getElementsByTagName('updatecheck')[0]
-    ?.getAttribute?.('version');
+  const version = root.getElementsByTagName('updatecheck')[0]?.getAttribute?.('version');
   return version;
 }
 
@@ -36,7 +33,7 @@ export function useCheckVersion(): string | null {
   };
 
   useEffect(() => {
-    const manifest = Chrome.runtime.getManifest();
+    const manifest = chrome.runtime.getManifest();
     if (process.env.NODE_ENV !== 'production') {
       console.log('update_url: %s', manifest?.update_url);
     }

diff --git a/src/isomorphic/background/tab.ts b/src/isomorphic/background/tab.ts
@@ -3,9 +3,11 @@ export enum OperateTabEnum {
   getCurrent = 'getCurrent',
   create = 'create',
   getDocument = 'getDocument',
+  showMessage = 'showMessage',
 }
 
 export interface IOperateTabData {
   type: OperateTabEnum;
   url?: string;
+  data?: any;
 }
diff --git a/src/isomorphic/event/contentScript.ts b/src/isomorphic/event/contentScript.ts
@@ -3,20 +3,4 @@ export enum ContentScriptEvents {
   LevitateConfigChange = 'contentScript/levitateConfigChange',
   ForceUpgradeVersion = 'contentScript/forceUpgradeVersion',
   LoginOut = 'contentScript/LoginOut',
-  GetDocument = 'contentScript/getDocument',
-}
-
-export const ContentScriptMessageKey = 'ContentScriptMessageKey';
-
-export enum ContentScriptMessageActions {
-  ShowMessage = 'showMessage',
-}
-
-export interface IShowMessageData {
-  type: 'error' | 'success';
-  text: string;
-  link?: {
-    text: string;
-    href: string;
-  };
 }
diff --git a/src/pages/inject/AreaSelector/app.tsx b/src/pages/inject/AreaSelector/app.tsx
@@ -80,7 +80,6 @@ function App(props: IAppProps) {
       const target = e.composedPath()?.[0] as Element;
       e.stopImmediatePropagation();
       e.preventDefault();
-      console.log(target, target.closest('.select-confirm'));
       if (target.closest('.select-confirm')) {
         onSave();
       } else if (target?.closest('.select-inner')) {

diff --git a/src/pages/inject/WordMark/Editor/index.tsx b/src/pages/inject/WordMark/Editor/index.tsx
@@ -5,7 +5,6 @@ import React, {
   useImperativeHandle,
   useRef,
 } from 'react';
-import Chrome from '@/core/chrome';
 import {
   EDITOR_IFRAME_CONTAINER_ID,
   EditorMessageType,
@@ -172,7 +171,7 @@ export default forwardRef<IEditorRef, {}>((props, ref) => {
 
   return (
     <iframe
-      src={Chrome.runtime.getURL('editor.html')}
+      src={chrome.runtime.getURL('editor.html')}
       ref={iframeRef}
       id={EDITOR_IFRAME_CONTAINER_ID}
       style={{ display: 'none' }}