fix: 上传图片加一次补偿请求 (#239)

yuque · Apr 8, 2024 · ceb2c0b · ceb2c0b
1 parent 475bc63
commit ceb2c0b
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 0 deletions.
diff --git a/src/background/actionListener/clip.ts b/src/background/actionListener/clip.ts
@@ -58,6 +58,25 @@ export async function createClipActionListener(
       );
       break;
     }
+    case OperateClipEnum.getImage: {
+      try {
+        const url = (request.data as any).url;
+        const response = await fetch(url);
+        if (response.status !== 200) {
+          throw new Error('Error fetching image');
+        }
+        const blob = await response.blob(); // 将响应体转换为 Blob
+        const reader = new FileReader();
+        reader.readAsDataURL(blob); // 读取 Blob 数据并编码为 Base64
+        reader.onloadend = () => {
+          callback(reader.result);
+        };
+      } catch (error) {
+        //
+        callback('');
+      }
+      break;
+    }
     default: {
       break;
     }

diff --git a/src/core/bridge/background/clip.ts b/src/core/bridge/background/clip.ts
@@ -41,6 +41,14 @@ export function createClipBridge(impl: ICallBridgeImpl) {
           );
         });
       },
+
+      async getImage(url: string): Promise<string> {
+        return new Promise(resolve => {
+          impl(BackgroundEvents.OperateClip, { type: OperateClipEnum.getImage, url }, (res: string) => {
+            resolve(res);
+          });
+        });
+      },
     },
   };
 }
diff --git a/src/core/parseDom/plugin/image.ts b/src/core/parseDom/plugin/image.ts
@@ -1,3 +1,4 @@
+import { backgroundBridge } from '@/core/bridge/background';
 import { BasePlugin } from './base';
 
 export class ImageParsePlugin extends BasePlugin {
@@ -26,6 +27,15 @@ export class ImageParsePlugin extends BasePlugin {
             resolve(true);
           };
         } catch (e: any) {
+          // 补充一次图片请求，避免被拦截
+          try {
+            const base64 = await backgroundBridge.clip.getImage(image.src);
+            if (base64) {
+              image.src = base64;
+            }
+          } catch (error) {
+            //
+          }
           resolve(true);
         }
       });

diff --git a/src/isomorphic/background/clip.ts b/src/isomorphic/background/clip.ts
@@ -2,6 +2,7 @@ export enum OperateClipEnum {
   selectArea = 'selectArea',
   screenOcr = 'screenOcr',
   clipPage = 'clipPage',
+  getImage = 'getImage',
 }
 
 export interface IOperateClipData {