Merge pull request #442 from andywang425:dev

7.0.7
close #441 close #439

CHANGELOG.md

@@ -1,5 +1,11 @@
 # 更新日志
 
+## [7.0.7] - 2023-8-11
+
+## 新增
+
+- 领取年度大会员权益功能
+
 ## [7.0.6] - 2023-8-6
 
 ## 新增

package.json

@@ -1,7 +1,7 @@
 {
   "name": "bilibili-live-tasks-helper",
   "private": true,
-  "version": "7.0.6",
+  "version": "7.0.7",
   "type": "module",
   "scripts": {
     "dev": "vite",

src/components/OtherTasks.vue

@@ -36,6 +36,13 @@ const status = moduleStore.moduleStatus.DailyTasks.OtherTasks
         <TaskStatus :status="status.coinToSilver" />
       </el-space>
     </el-row>
+    <el-row>
+      <el-space wrap>
+        <el-switch v-model="config.getYearVipPrivilege.enabled" active-text="领取年度大会员权益" />
+        <Info id="DailyTasks.OtherTasks.getYearVipPrivilege" />
+        <TaskStatus :status="status.getYearVipPrivilege" />
+      </el-space>
+    </el-row>
     <el-divider />
     <!-- 说明 -->
   </div>

src/library/bili-api/api.d.ts

@@ -105,6 +105,10 @@ interface IbapiMethods {
       ga?: number
     ) => Promise<Main.CoinAdd>
     videoRelation: (aid: string, bvid?: string) => Promise<Main.VideoRelation>
+    vip: {
+      myPrivilege: () => Promise<Main.Vip.MyPrivilege>
+      receivePrivilege: (type: number, platform?: string) => Promise<Main.Vip.ReceivePrivilege>
+    }
   }
   vc: {
     myGroups: (build?: numeber, mobi_app?: string) => Promise<Vc.MyGroups>

src/library/bili-api/data.d.ts

@@ -1427,6 +1427,25 @@ declare namespace MainData {
       coin: number
     }
   }
+
+  namespace Vip {
+    namespace MyPrivilege {
+      interface Data {
+        list: List[]
+        is_short_vip: boolean
+        is_freight_open: boolean
+      }
+
+      interface List {
+        type: number
+        state: number
+        expire_time: number
+        vip_type: number
+        next_receive_days: number
+        period_end_unix: number
+      }
+    }
+  }
 }
 
 declare namespace VcData {

src/library/bili-api/index.ts

@@ -268,6 +268,40 @@ const BAPI: IbapiMethods = {
         aid,
         bvid
       })
+    },
+    vip: {
+      myPrivilege: () => {
+        const bili_jct = (useBiliStore().cookies as IbiliCookies).bili_jct as string
+        return request.main.get(
+          '/x/vip/privilege/my',
+          {
+            csrf: bili_jct
+          },
+          {
+            headers: {
+              Referer: 'https://account.bilibili.com/account/big/myPackage',
+              Origin: 'https://account.bilibili.com/account/big/myPackage'
+            }
+          }
+        )
+      },
+      receivePrivilege: (type, platform = 'web') => {
+        const bili_jct = (useBiliStore().cookies as IbiliCookies).bili_jct as string
+        return request.main.post(
+          '/x/vip/privilege/receive',
+          {
+            type,
+            platform,
+            csrf: bili_jct
+          },
+          {
+            headers: {
+              Referer: 'https://account.bilibili.com/account/big/myPackage',
+              Origin: 'https://account.bilibili.com/account/big/myPackage'
+            }
+          }
+        )
+      }
     }
   },
   vc: {

src/library/bili-api/response.d.ts

@@ -141,6 +141,21 @@ declare namespace Main {
     ttl: number
     data: MainData.VideoRelation.Data
   }
+
+  namespace Vip {
+    interface MyPrivilege {
+      code: number
+      message: string
+      ttl: number
+      data: MainData.Vip.MyPrivilege.Data
+    }
+
+    interface ReceivePrivilege {
+      code: number
+      message: string
+      ttl: number
+    }
+  }
 }
 
 declare namespace Vc {

src/library/help-info/index.ts

@@ -147,6 +147,25 @@ const help_info: IhelpInfo = {
           h('div', '把硬币兑换为银瓜子。'),
           h('div', '具体兑换规则请点击直播间页面的“立即充值→银瓜子商店”查看。')
         ])
+      },
+      getYearVipPrivilege: {
+        title: '领取年度大会员权益',
+        message: h('p', [
+          h('div', '自动领取年度大会员权益。'),
+          h('div', [
+            h('span', '具体权益请前往'),
+            h(
+              'a',
+              {
+                href: 'https://account.bilibili.com/account/big/myPackage',
+                rel: 'noreferrer',
+                target: '_blank'
+              },
+              '卡券包'
+            ),
+            h('span', '查看。')
+          ])
+        ])
       }
     }
   },

src/library/storage/defaultValue.ts

@@ -93,6 +93,10 @@ const defaultValues: IdefaultValues = {
           enabled: false,
           num: 1,
           _lastCompleteTime: 0
+        },
+        getYearVipPrivilege: {
+          enabled: false,
+          _nextReceiveTime: 0
         }
       }
     },

src/modules/dailyTasks/otherTasks/coinToSilver.ts → src/modules/dailyTasks/otherTasks/coinToSilverTask.ts

@@ -3,7 +3,7 @@ import { isTimestampToday, delayToNextMoment, tsm, isNowIn } from '../../../libr
 import BAPI from '../../../library/bili-api'
 import { Istatus } from '../../../types/moduleStatus'
 
-class CoinToSilver extends BaseModule {
+class CoinToSilverTask extends BaseModule {
   config = this.moduleStore.moduleConfig.DailyTasks.OtherTasks.coinToSilver
 
   set status(s: Istatus) {
@@ -50,4 +50,4 @@ class CoinToSilver extends BaseModule {
   }
 }
 
-export default CoinToSilver
+export default CoinToSilverTask

src/modules/dailyTasks/otherTasks/getYearVipPrivilegeTask.ts

@@ -0,0 +1,114 @@
+import BaseModule from '../../BaseModule'
+import { delayToNextMoment, ts } from '../../../library/luxon'
+import BAPI from '../../../library/bili-api'
+import { Istatus } from '../../../types/moduleStatus'
+import { useBiliStore } from '../../../stores/useBiliStore'
+import { MainData } from '../../../library/bili-api/data'
+import { DateTime } from 'luxon'
+
+class GetYearVipPrivilegeTask extends BaseModule {
+  config = this.moduleStore.moduleConfig.DailyTasks.OtherTasks.getYearVipPrivilege
+
+  set status(s: Istatus) {
+    this.moduleStore.moduleStatus.DailyTasks.OtherTasks.getYearVipPrivilege = s
+  }
+
+  /**
+   * 获取会员权益
+   * @returns 会员权益列表
+   */
+  private async myPrivilege(): Promise<MainData.Vip.MyPrivilege.List[] | undefined> {
+    try {
+      const response = await BAPI.main.vip.myPrivilege()
+      this.logger.log(`BAPI.main.vip.myPrivilege response`, response)
+      if (response.code === 0) {
+        return response.data.list
+      } else {
+        this.logger.error(`获取年度大会员权益信息失败`, response.message)
+        this.status = 'error'
+      }
+    } catch (error) {
+      this.logger.error(`获取年度大会员权益信息出错`, error)
+      this.status = 'error'
+    }
+  }
+
+  /**
+   * 领取权益
+   * @param type 权益种类
+   */
+  private async receivePrivilege(type: number) {
+    try {
+      const response = await BAPI.main.vip.receivePrivilege(type)
+      this.logger.log(`BAPI.main.vip.receivePrivilege(${type}) response`, response)
+      if (response.code === 0) {
+        this.logger.log(`领取年度大会员权益（type = ${type}）成功`)
+      } else {
+        this.logger.error(`领取年度大会员权益（type = ${type}）失败`, response.message)
+      }
+    } catch (error) {
+      this.logger.error(`领取年度大会员权益（type = ${type}）出错`, error)
+    }
+  }
+
+  /**
+   * 判断当前账号是否是年度大会员
+   */
+  private isYearVip(): boolean {
+    const biliStore = useBiliStore()
+    const userInfo = biliStore.userInfo
+    if (userInfo && userInfo.vip.status === 1 && userInfo.vip.type === 2) {
+      return true
+    } else {
+      this.logger.log('当前账号不是年度大会员，不领取权益')
+      return false
+    }
+  }
+
+  public async run() {
+    this.logger.log('领取年度大会员权益模块开始运行')
+    if (this.config.enabled) {
+      if (this.isYearVip()) {
+        if (ts() >= this.config._nextReceiveTime) {
+          // 当前时间已经超过了上次记录的下次领取时间，领取权益
+          this.status = 'running'
+          const list = await this.myPrivilege()
+          if (list) {
+            for (const i of list) {
+              if (i.vip_type === 2) {
+                if (i.state === 0) {
+                  await this.receivePrivilege(i.type)
+                } else {
+                  this.logger.log(`该权益（type = ${i.type}）已经领取过了`)
+                }
+              } else {
+                this.logger.warn('发现不属于年度大会员的权益', i)
+              }
+            }
+            this.status = 'done'
+            this.config._nextReceiveTime = Math.max(...list.map((i) => i.period_end_unix))
+            // 此时刚领完，距离下次领取还有一个月，不用计划下次运行
+          }
+        } else {
+          // 否则等待下次运行或什么都不做
+          const diff = this.config._nextReceiveTime - ts()
+          if (diff < 86400) {
+            this.logger.log(
+              '领取年度大会员权益模块下次运行时间:',
+              DateTime.fromSeconds(this.config._nextReceiveTime).toString()
+            )
+            setTimeout(() => this.run(), diff)
+          } else {
+            this.logger.log('距离下次领取年度大会员权益的时间超过一天，不计划下次运行')
+          }
+        }
+      }
+    } else {
+      const diff = delayToNextMoment(0, 0)
+      setTimeout(() => this.run(), diff.ms)
+      this.logger.log('领取年度大会员权益模块下次运行时间:', diff.str)
+    }
+  }
+}
+
+export default GetYearVipPrivilegeTask

src/modules/dailyTasks/otherTasks/index.ts

@@ -1,3 +1,4 @@
 export { default as DailyTask_OtherTask_GroupSignTask } from './groupSignTask'
-export { default as DailyTask_OtherTask_SilverToCoin } from './silverToCoin'
-export { default as DailyTask_OtherTask_CoinToSilver } from './coinToSilver'
+export { default as DailyTask_OtherTask_SilverToCoinTask } from './silverToCoinTask'
+export { default as DailyTask_OtherTask_CoinToSilverTask } from './coinToSilverTask'
+export { default as DailyTask_OtherTask_GetYearVipPrivilegeTask } from './getYearVipPrivilegeTask'

src/modules/dailyTasks/otherTasks/silverToCoin.ts → src/modules/dailyTasks/otherTasks/silverToCoinTask.ts

@@ -3,7 +3,7 @@ import { isTimestampToday, delayToNextMoment, tsm, isNowIn } from '../../../libr
 import BAPI from '../../../library/bili-api'
 import { Istatus } from '../../../types/moduleStatus'
 
-class SilverToCoin extends BaseModule {
+class SilverToCoinTask extends BaseModule {
   config = this.moduleStore.moduleConfig.DailyTasks.OtherTasks.silverToCoin
 
   set status(s: Istatus) {
@@ -55,4 +55,4 @@ class SilverToCoin extends BaseModule {
   }
 }
 
-export default SilverToCoin
+export default SilverToCoinTask

src/modules/default/biliInfo.ts

@@ -154,7 +154,7 @@ class BiliInfo extends DefaultBaseModule {
         this.logger.log('BAPI.live.fansMedalPanel(1) response', firstPageResponse)
         if (firstPageResponse.code === 0) {
           total_page = firstPageResponse.data.page_info.total_page
-          // 第一页的 list 缺少当前佩戴和最卷获得BAPI.main.share的勋章，需通过 special_list 获取
+          // 第一页的 list 缺少当前佩戴和最近获得的勋章，需通过 special_list 获取
           fansMetalList.push(...firstPageResponse.data.special_list, ...firstPageResponse.data.list)
         } else {
           this.logger.error('获取粉丝勋章列表第1页失败', firstPageResponse.message)

src/stores/useModuleStore.ts

@@ -34,7 +34,8 @@ const defaultModuleStatus: ImoduleStatus = {
     OtherTasks: {
       groupSign: '',
       silverToCoin: '',
-      coinToSilver: ''
+      coinToSilver: '',
+      getYearVipPrivilege: ''
     }
   }
 }

src/types/helpInfo.d.ts

@@ -27,6 +27,7 @@ interface IhelpInfo {
       groupSign: IhelpInfoItem
       silverToCoin: IhelpInfoItem
       coinToSilver: IhelpInfoItem
+      getYearVipPrivilege: IhelpInfoItem
     }
   }
   EnhanceExperience: {

src/types/moduleStatus.d.ts

@@ -21,6 +21,7 @@ interface ImoduleStatus {
       groupSign: Istatus
       silverToCoin: Istatus
       coinToSilver: Istatus
+      getYearVipPrivilege: Istatus
     }
   }
 }

src/types/storage.d.ts

@@ -64,6 +64,10 @@ interface ImoduleConfig {
         num: number
         _lastCompleteTime: number
       }
+      getYearVipPrivilege: {
+        enabled: boolean
+        _nextReceiveTime: number
+      }
     }
   }
   EnhanceExperience: {