fix: 将首页推荐接口改为最新的wbi接口 #524

Author: keleus

src/background/messageListeners/api/video.ts

@@ -2,17 +2,18 @@ import type { APIMAP } from '../../utils'
 import { AHS } from '../../utils'
 
 const API_VIDEO = {
+  // https://socialsisteryi.github.io/bilibili-API-collect/docs/video/recommend.html#%E8%8E%B7%E5%8F%96%E9%A6%96%E9%A1%B5%E8%A7%86%E9%A2%91%E6%8E%A8%E8%8D%90%E5%88%97%E8%A1%A8-web%E7%AB%AF
   getRecommendVideos: {
-    url: 'https://api.bilibili.com/x/web-interface/index/top/feed/rcmd',
+    url: 'https://api.bilibili.com/x/web-interface/wbi/index/top/feed/rcmd',
     _fetch: {
       method: 'get',
     },
     params: {
-      fresh_idx: 0,
-      feed_version: 'V2',
-      fresh_type: 4,
-      ps: 30,
-      plat: 1,
+      fresh_type: 4, // 相关性控制
+      feed_version: 'V8', // Feed版本
+      homepage_ver: 1, // 首页版本
+      ps: 12, // 单页记录数，默认12，最大30（调用时可覆盖）
+      fresh_idx: 1, // 翻页号，从1开始（调用时会动态传入）
     },
     afterHandle: AHS.J_D,
   },

src/contentScripts/views/Home/components/ForYou.vue

@@ -236,15 +236,15 @@ function transformWebVideo(item: VideoItem): VideoCardDisplayData {
     title: decodeHtmlEntities(item.title),
     cover: item.pic,
     author: {
-      name: decodeHtmlEntities(item.owner.name),
-      authorFace: item.owner.face,
+      name: decodeHtmlEntities(item.owner?.name || ''),
+      authorFace: item.owner?.face || '',
       followed: !!item.is_followed,
-      mid: item.owner.mid,
+      mid: item.owner?.mid || 0,
     },
     tag: decodeHtmlEntities(item?.rcmd_reason?.content),
-    view: item.stat.view,
-    danmaku: item.stat.danmaku,
-    like: item.stat.like,
+    view: item.stat?.view || 0,
+    danmaku: item.stat?.danmaku || 0,
+    like: item.stat?.like,
     publishedTimestamp: item.pubdate,
     bvid: item.bvid,
     cid: item.cid,
@@ -520,20 +520,41 @@ async function getRecommendVideos() {
 
     const beforeLoadCount = videoList.value.filter(video => video.item).length
 
+    // 使用当前的 refreshIdx，只在成功时才递增
+    const currentRefreshIdx = refreshIdx.value
     const response: forYouResult = await api.video.getRecommendVideos({
-      fresh_idx: refreshIdx.value++,
+      fresh_idx: currentRefreshIdx,
       ps: PAGE_SIZE,
     })
 
+    if (!response) {
+      console.error('Failed to load web recommendations: Response is undefined')
+      noMoreContent.value = true
+      return
+    }
+
     if (!response.data) {
       noMoreContent.value = true
       return
     }
 
     if (response.code === 0) {
+      // 只在成功时递增 refreshIdx
+      refreshIdx.value++
+
       const resData = [] as VideoItem[]
 
       response.data.item.forEach((item: VideoItem) => {
+        // 过滤掉广告卡片
+        if (item.goto === 'ad')
+          return
+
+        // 过滤掉缺少必要字段的数据（owner 或 stat 为 null）
+        if (!item.owner || !item.stat) {
+          console.warn('[ForYou] Filtered out item with null owner or stat:', item.id, item.goto)
+          return
+        }
+
         if (!filterFunc.value || filterFunc.value(item))
           resData.push(item)
       })
@@ -591,12 +612,17 @@ async function getRecommendVideos() {
     else if (response.code === 62011) {
       needToLoginFirst.value = true
     }
+    else {
+      // 其他错误码也应该停止加载，避免无限重试
+      console.error('API returned error code:', response.code, response.message)
+      noMoreContent.value = true
+    }
   }
   finally {
     const filledItems = videoList.value.filter(video => video.item)
     videoList.value = filledItems
 
-    if (!needToLoginFirst.value) {
+    if (!needToLoginFirst.value && !noMoreContent.value) {
       await nextTick()
 
       const hasScrollbar = await haveScrollbar()
@@ -627,6 +653,13 @@ async function getAppRecommendVideos() {
     return
   }
 
+  // 检查是否有有效的 access token
+  if (!appAuthTokens.value.accessToken) {
+    console.warn('APP 推荐模式需要登录，access token 为空')
+    needToLoginFirst.value = true
+    return
+  }
+
   const batchesToLoad = APP_LOAD_BATCHES.value
   const beforeLoadCount = appVideoList.value.length
 
@@ -646,6 +679,11 @@ async function getAppRecommendVideos() {
         idx: lastIdx,
       })
 
+      if (!response) {
+        console.error('Failed to load batch', batch, 'Response is undefined')
+        break
+      }
+
       if (response.code === 0) {
         response.data.items.forEach((item: AppVideoItem) => {
           // Remove banner & ad cards

src/models/video/forYou.ts

@@ -1,4 +1,5 @@
 // https://app.quicktype.io/?l=ts
+// 更新以适配B站新的WBI推荐接口
 
 export interface forYouResult {
   code: number
@@ -10,9 +11,9 @@ export interface forYouResult {
 export interface Data {
   item: Item[]
   side_bar_column: any[]
-  business_card: null
-  floor_info: null
-  user_feature: null
+  business_card: null | any
+  floor_info: null | any
+  user_feature: null | any
   preload_expose_pct: number
   preload_floor_expose_pct: number
   mid: number
@@ -29,24 +30,27 @@ export interface Item {
   title: string
   duration: number
   pubdate: number
-  owner: Owner
-  stat: Stat
-  av_feature: null
+  owner: Owner | null // 广告卡片时可能为 null
+  stat: Stat | null // 广告卡片时可能为 null
+  av_feature: null | any
   is_followed: number
-  rcmd_reason: RcmdReason
+  rcmd_reason: RcmdReason | null // 可能为 null
   show_info: number
   track_id: string
   pos: number
-  room_info: null
-  ogv_info: null
-  business_info: null
+  room_info: null | any
+  ogv_info: null | any
+  business_info: null | any // 广告卡片时为对象
   is_stock: number
   enable_vt: number
   vt_display: string
+  dislike_switch?: number // 可选字段
+  dislike_switch_pc?: number // 可选字段
 }
 
 export enum Goto {
   AV = 'av',
+  AD = 'ad', // 广告卡片
 }
 
 export interface Owner {