Merge branch 'dev' of https://github.com/MengNianxiaoyao/BewlyBewly i…

…nto dev
MengNianxiaoyao · Apr 29, 2024 · 00a8e14 · 00a8e14
2 parents 87a00b7 + beff7d0
commit 00a8e14
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 35 deletions.
diff --git a/assets/rules.json b/assets/rules.json
@@ -48,30 +48,5 @@
       "resourceTypes": ["xmlhttprequest"],
       "requestMethods": ["post"]
     }
-  },
-  {
-    "id": 3,
-    "priority": 2,
-    "action": {
-      "type": "modifyHeaders",
-      "requestHeaders": [
-        {
-          "header": "origin",
-          "operation": "set",
-          "value": "https://t.bilibili.com"
-        },
-        {
-          "header": "referer",
-          "operation": "set",
-          "value": "https://t.bilibili.com"
-        }
-      ]
-    },
-    "condition": {
-      "domainType": "thirdParty",
-      "urlFilter": "||api.bilibili.com",
-      "resourceTypes": ["xmlhttprequest"],
-      "initiatorDomains": ["t.bilibili.com"]
-    }
   }
 ]
diff --git a/src/background/index.ts b/src/background/index.ts
@@ -1,12 +1,33 @@
 import browser from 'webextension-polyfill'
-
-// import { onMessage, sendMessage } from 'webext-bridge'
 import { setupAllMsgLstnrs } from './messageListeners'
 
 browser.runtime.onInstalled.addListener((): void => {
   // eslint-disable-next-line no-console
   console.log('Extension installed')
 })
 
+// eslint-disable-next-line node/prefer-global/process
+if (process.env.FIREFOX) {
+  browser.webRequest.onBeforeSendHeaders.addListener(
+    (details) => {
+      const requestHeaders: browser.WebRequest.HttpHeaders = []
+      if (details.documentUrl) {
+        const url = new URL(details.documentUrl)
+        details.requestHeaders = details.requestHeaders || []
+        for (let i = 0; i < details.requestHeaders.length; i++) {
+          if (details.requestHeaders[i].name.toLowerCase() === 'origin' || details.requestHeaders[i].name.toLowerCase() === 'referer')
+            requestHeaders.push({ name: details.requestHeaders[i].name, value: url.origin })
+          else
+            requestHeaders.push(details.requestHeaders[i])
+        }
+
+        return { ...details, requestHeaders }
+      }
+    },
+    { urls: ['<all_urls>'] },
+    ['blocking', 'requestHeaders'],
+  )
+}
+
 // Setup all message listeners
 setupAllMsgLstnrs()
diff --git a/src/contentScripts/views/Home/Home.vue b/src/contentScripts/views/Home/Home.vue
@@ -10,6 +10,7 @@ import { useMainStore } from '~/stores/mainStore'
 
 const mainStore = useMainStore()
 const { handleBackToTop, scrollbarRef } = useBewlyApp()
+const { getBewlyImage } = useBewlyImage()
 
 const activatedPage = ref<HomeSubPage>(HomeSubPage.ForYou)
 const pages = {
@@ -144,7 +145,7 @@ function toggleTabContentLoading(loading: boolean) {
           pos="absolute left-0 top-0" w-full h-inherit bg="cover center" z-1
           pointer-events-none
           :style="{
-            backgroundImage: `url(${settings.searchPageWallpaper})`,
+            backgroundImage: `url(${getBewlyImage(settings.searchPageWallpaper)})`,
             backgroundAttachment: settings.searchPageModeWallpaperFixed ? 'fixed' : 'unset',
           }"
         />

diff --git a/src/manifest.ts b/src/manifest.ts
@@ -35,6 +35,9 @@ export async function getManifest() {
       'storage',
       'scripting',
       'declarativeNetRequest',
+      ...isFirefox
+        ? ['webRequest', 'webRequestBlocking']
+        : [],
     ],
     host_permissions: [
       '*://*.bilibili.com/*',
@@ -67,13 +70,19 @@ export async function getManifest() {
             ? `script-src 'self' http://localhost:${port}; object-src 'self' http://localhost:${port}`
             : 'script-src \'self\'; object-src \'self\'',
         },
-    declarative_net_request: {
-      rule_resources: [{
-        id: 'ruleset_1',
-        enabled: true,
-        path: 'assets/rules.json',
-      }],
-    },
+    ...isFirefox
+      ? {}
+      : {
+          declarative_net_request: {
+            rule_resources: [
+              {
+                id: 'ruleset_1',
+                enabled: true,
+                path: 'assets/rules.json',
+              },
+            ],
+          },
+        },
   }
 
   if (isDev)

diff --git a/tsup.config.ts b/tsup.config.ts
@@ -15,6 +15,7 @@ export default defineConfig(() => ({
   define: {
     '__DEV__': JSON.stringify(isDev),
     'process.env.NODE_ENV': JSON.stringify(isDev ? 'development' : 'production'),
+    'process.env.FIREFOX': isFirefox ? 'true' : 'false',
   },
   platform: 'browser',
   minifyWhitespace: !isDev,