Merge pull request #70 from log-z/dev 修复 GitHub 阻止中文语言浏览器请求问题 fk-gh

修复 GitHub 阻止中文语言浏览器请求问题 fk-gh

Author: log-z

src/components/nav-favorites/nav-favorite-item.vue

@@ -69,9 +69,9 @@ export default {
 <script setup>
 import { computed, onMounted, reactive, watch } from 'vue'
 import $_ from 'lodash'
-import axios from 'axios'
 import { useConfigStore } from '@/stores/config'
 import { httpAbsPath } from '@/utils/common'
+import { imgApi, ghCli, isGithubUrl } from '@/utils/request'
 
 const configStore = useConfigStore()
 
@@ -81,36 +81,85 @@ const state = reactive({
   isActive: false,
   iconB64: null,
   iconB64OnDark: null,
+  iconBlobUrl: null,
+  iconBlobUrlOnDark: null,
 })
 
 // 图标URL
+// 图标URL默认值
+const DEFAULT_ICON_URL = '#'
 // 图标URL（常规）
 const iconUrl = computed(() => {
-  const path = props.website.icon;
-  if ($_.isEmpty(path)) {
-    return '#'
+  const path = state.iconBlobUrl || props.website.icon;
+  if ($_.isEmpty(path) || path === DEFAULT_ICON_URL) {
+    return DEFAULT_ICON_URL
+  }
+  if (path.startsWith('blob:')) {
+    return path
   }
   
   const baseUrl = configStore.baseUrl
   const prefix = configStore.config.favorites.iconPrefix
-  return httpAbsPath(path, baseUrl + prefix)
+  const url = httpAbsPath(path, baseUrl + prefix)
+  return fetchIconUrl(url, false)
 })
 // 图标URL（暗色模式）
 const iconUrlOnDark = computed(() => {
-  let path = props.website.iconOnDark;
-  if ($_.isEmpty(path)) {
+  let path = state.iconBlobUrlOnDark || props.website.iconOnDark;
+  if ($_.isEmpty(path) || path === DEFAULT_ICON_URL) {
     // 降级到正常图标
-    path = props.website.icon;
+    path = state.iconBlobUrl || props.website.icon;
     if ($_.isEmpty(path)) {
-      return '#'
+      return DEFAULT_ICON_URL
     }
   }
+  if (path.startsWith('blob:')) {
+    return path
+  }
 
   const baseUrl = configStore.baseUrl
   const prefix = configStore.config.favorites.iconPrefix
-  return httpAbsPath(path, baseUrl + prefix)
+  const url = httpAbsPath(path, baseUrl + prefix)
+  return fetchIconUrl(url, true)
 })
 
+// 对某些站点特殊处理图标URL
+const ghIconCache = {}
+function fetchIconUrl(url, onDark) {
+
+  // 特殊处理 GitHub URL
+  // 避免 GitHub 阻止使用中文语言的浏览器请求
+  // 先通过 XHR 请求图标，然后转换为 BlobUrl 进行展示
+  if (isGithubUrl(url) && checkNotBase64(url)) {
+    const cacheUrl = ghIconCache[url]
+    if (cacheUrl) {
+      return cacheUrl
+    }
+
+    ghCli.get(url)
+      .then(resp => {
+        const blob = new Blob([resp.data], { type: resp.headers['content-type'] })
+        const blobUrl = URL.createObjectURL(blob)
+        ghIconCache[url] = blobUrl
+        if (onDark) {
+          state.iconBlobUrlOnDark = blobUrl
+        } else {
+          state.iconBlobUrl = blobUrl
+        }
+      })
+      .catch(() => {
+        if (onDark) {
+          state.iconBlobUrlOnDark = DEFAULT_ICON_URL
+        } else {
+          state.iconBlobUrl = DEFAULT_ICON_URL
+        }
+      })
+    return DEFAULT_ICON_URL
+  }
+
+  return url
+}
+
 // 图标Base64探测
 // 检查图标是否为Base64扩展名的文件
 const BASE64_FILE_EXTENSION = '.base64'
@@ -124,7 +173,7 @@ const refreshIconB64 = (url) => {
     state.iconB64 = null
     return
   }
-  axios.get(url)
+  imgApi(url)
     .then(resp => {
       state.iconB64 = resp.data
     })
@@ -135,7 +184,7 @@ const refreshIconB64OnDark = (url) => {
     state.iconB64OnDark = null
     return
   }
-  axios.get(url)
+  imgApi(url)
     .then(resp => {
       state.iconB64OnDark = resp.data
     })

src/utils/config/source.js

@@ -5,7 +5,8 @@ import YAML from 'yaml'
 const request = axios.create({
   headers: {
     get: {
-      'Accept': 'text/plain'
+      'Accept': 'text/plain',
+      'Accept-Language': '',  // 避免 GitHub 阻止使用中文语言的浏览器请求
     }
   },
   transformResponse: httpTransformResponse,

src/utils/request/index.js

@@ -0,0 +1,31 @@
+import axios from 'axios'
+
+// 通用客户端
+export const commCli = axios.create()
+
+// GitHub 客户端
+// 避免 GitHub 阻止使用中文语言的浏览器请求
+export const ghCli = axios.create({
+  headers: {
+    common: {
+      'Accept-Language': '',
+    }
+  }
+})
+
+// 检查是否是 GitHub URL
+const ghUrlPrefix = [
+  'http://raw.githubusercontent.com/',
+  'https://raw.githubusercontent.com/',
+  'http://gist.githubusercontent.com/',
+  'https://gist.githubusercontent.com/',
+]
+export function isGithubUrl(url) {
+  return typeof url === "string" &&
+    ghUrlPrefix.find(prefix => url.startsWith(prefix)) !== undefined
+}
+
+// 图片请求API
+export function imgApi(url) {
+  return isGithubUrl(url) ? ghCli.get(url) : commCli.get(url)
+}