From 3db342c410873caac5941a9f58171c6580d43d23 Mon Sep 17 00:00:00 2001
From: Searchstars <searchstars@163.com>
Date: Sun, 10 Nov 2024 16:33:49 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84biliclient&=E5=BD=BB=E5=BA=95?=
 =?UTF-8?q?=E7=A7=BB=E9=99=A4interconnect=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  12 +-
 src/app.ux                                    |   2 +-
 src/bilibiliclient.ts                         | 626 ------------------
 src/bilibiliclient/account/accountData.ts     |   7 +
 src/bilibiliclient/account/login.ts           | 122 ++++
 src/bilibiliclient/api/request.ts             | 127 ++++
 src/bilibiliclient/article/article.ts         |   9 +
 src/bilibiliclient/client.ts                  |  68 ++
 src/bilibiliclient/comment/comment.ts         |  47 ++
 src/bilibiliclient/folder/favfolder.ts        |  24 +
 src/bilibiliclient/folder/history.ts          |   8 +
 src/bilibiliclient/message/message.ts         |  61 ++
 src/bilibiliclient/search/search.ts           |  48 ++
 src/bilibiliclient/user/user.ts               |  16 +
 src/bilibiliclient/utils/utils.ts             |  15 +
 src/bilibiliclient/video/action.ts            |  41 ++
 src/bilibiliclient/video/video.ts             |  58 ++
 src/manifest.json                             |   3 -
 .../interconnecthelper/interconnecthelper.ux  |  35 -
 src/pages/splash/splash.ux                    |  15 +-
 src/settings.ts                               |   4 -
 21 files changed, 663 insertions(+), 685 deletions(-)
 delete mode 100644 src/bilibiliclient.ts
 create mode 100644 src/bilibiliclient/account/accountData.ts
 create mode 100644 src/bilibiliclient/account/login.ts
 create mode 100644 src/bilibiliclient/api/request.ts
 create mode 100644 src/bilibiliclient/article/article.ts
 create mode 100644 src/bilibiliclient/client.ts
 create mode 100644 src/bilibiliclient/comment/comment.ts
 create mode 100644 src/bilibiliclient/folder/favfolder.ts
 create mode 100644 src/bilibiliclient/folder/history.ts
 create mode 100644 src/bilibiliclient/message/message.ts
 create mode 100644 src/bilibiliclient/search/search.ts
 create mode 100644 src/bilibiliclient/user/user.ts
 create mode 100644 src/bilibiliclient/utils/utils.ts
 create mode 100644 src/bilibiliclient/video/action.ts
 create mode 100644 src/bilibiliclient/video/video.ts
 delete mode 100644 src/pages/interconnecthelper/interconnecthelper.ux

diff --git a/README.md b/README.md
index eed4e73..2ad1cd0 100644
--- a/README.md
+++ b/README.md
@@ -2,13 +2,15 @@
 在Vela嵌入式设备上基于QuickApp实现的第三方B站客户端
 
 ## 子项目 / 分支:
-1. 澎湃哔哩“米粒版”：[https://github.com/OnDriveLine/HyperBilibili_Band9](https://github.com/OnDriveLine/HyperBilibili_Band9)
-    - 专为 `小米手环 9` 等胶囊屏设备移植的澎湃哔哩客户端
-    - 目前为v2.3版本的分支，并砍掉了一些功能
-    - 默认启用interconnect联网
+1. 澎湃哔哩“米环版”：[https://github.com/OnDriveLine/HyperBilibili_Band](https://github.com/OnDriveLine/HyperBilibili_Band)
+    - 专为 `小米手环9`（band9分支） `小米手环9 Pro`（MB9P分支） 等设备移植的澎湃哔哩客户端
+    - MB9P分支基于v2.4版本修改，具有完整的功能并引入了部分v2.5版本的特性
+    - band9分支基于v2.3版本修改，砍掉了绝大多数功能
+    - band9分支默认启用interconnect联网，MB9P使用fetch
+
 
 ## 使用
-对于普通用户而非开发者，你只需要下载本应用的release版本（RPK文件）然后安装到你的设备上就行了。目前，我只会在米坛社区上发布release版本，如果你想获得经过测试的稳定版本，请前往[米坛社区发布页](https://www.bandbbs.cn/threads/12443/)获取。如果你想紧跟代码提交的步伐，在手表上运行本项目最新且未经测试的不稳定开发版代码，请从本仓库的actions中直接下载实时构建的rpk
+对于普通用户而非开发者，你只需要下载本应用的release版本（RPK文件）然后安装到你的设备上就行了。目前，官方版本只会在官网发布，如果你想获得经过测试的稳定版本，请前往[官网](https://hyperbili.astralsight.space)获取。如果你想紧跟代码提交的步伐，在手表上运行本项目最新且未经测试的不稳定开发版代码，请从本仓库的actions中直接下载实时构建的rpk
 
 ## 搭建开发环境
 
diff --git a/src/app.ux b/src/app.ux
index aae9342..0442169 100644
--- a/src/app.ux
+++ b/src/app.ux
@@ -1,6 +1,6 @@
 <script>
 import * as animengine from "./animengine"
-import { BilibiliClient }  from "./bilibiliclient"
+import { BilibiliClient }  from "./bilibiliclient/client"
 import * as tools from "./tools"
 import * as articletools from "./articletools"
 import * as funnytips from "./funnytips"
diff --git a/src/bilibiliclient.ts b/src/bilibiliclient.ts
deleted file mode 100644
index 83c1e8d..0000000
--- a/src/bilibiliclient.ts
+++ /dev/null
@@ -1,626 +0,0 @@
-import { fetch, storage, crypto, prompt } from './tsimports';
-import * as eula from './eula'
-
-// Wbi签名混淆表
-const mixinKeyEncTab = [
-    46, 47, 18, 2, 53, 8, 23, 32, 15, 50, 10, 31, 58, 3, 45, 35, 27, 43, 5, 49,
-    33, 9, 42, 19, 29, 28, 14, 39, 12, 38, 41, 13, 37, 48, 7, 16, 24, 55, 40,
-    61, 26, 17, 0, 1, 60, 51, 30, 4, 22, 25, 54, 21, 56, 59, 6, 63, 57, 62, 11,
-    36, 20, 34, 44, 52
-];
-
-// 对imgKey和subKey进行混淆编码
-const getMixinKey = (orig: string) =>
-    mixinKeyEncTab.map(n => orig[n]).join("").slice(0, 32);
-
-// 账号数据接口
-interface AccountData {
-    sessData: string;
-    biliJct: string;
-    dedeUserID: string;
-    sid: string;
-}
-
-class BilibiliClient {
-    // 版本号
-    public version: string = "2.4";
-
-    // Fetch API
-    // 会根据是否启用interconnect模式做出改变
-    // 具体请看constructor
-    public fetch: any;
-
-    // Interconnect 再封装 Message API
-    public interconnecter: any;
-    // 是否启用interconnect联网方式
-    private interconnect_mode: boolean;
-
-    // 扫码登录用的二维码Key
-    private qrCodeKey: string | null = null;
-
-    // B站Cookies
-    private sessData: string | null = null;
-    private biliJct: string | null = null;
-    private dedeUserID: string | null = null;
-    private sid: string | null = null;
-
-    // B站账号信息（非AccountData）
-    private accountInfo: any | null = null;
-
-    // 风控Cookies（不存储，构建biliclient时更新）
-    private buvid3: string | null = null;
-    private buvid4: string | null = null;
-
-    // 私信DeviceId，每次登录刷新
-    // From https://github.com/andywang425/BLTH/
-    private dm_deviceid = "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (function (name) {
-        let randomInt = 16 * Math.random() | 0;
-        return ("x" === name ? randomInt : 3 & randomInt | 8).toString(16).toUpperCase()
-    }));
-
-    constructor() {
-        this.updateBUVID();
-        this.fetch = fetch;
-    }
-
-    // 获取请求头，用于模拟正常浏览器环境，降低风控概率
-    getHeaders(): Record<string, string> {
-        return {
-            'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/jxl,image/webp,image/png,image/svg+xml,*/*;q=0.8',
-            'Accept-Encoding': '',
-            'Accept-Language': 'zh-CN,zh;q=0.8',
-            'Cookie': this.getCookieString(),
-            'Referer': 'https://www.bilibili.com',
-            'Origin': 'https://www.bilibili.com',
-            'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:129.0) Gecko/20100101 Firefox/129.0'
-        };
-    }
-
-    // 构建Cookie字符串
-    private getCookieString(): string {
-        var cookies = `buvid3=${this.buvid3}; buvid4=${this.buvid4}; `;
-        if (this.sessData) {
-            cookies += `SESSDATA=${this.sessData}; bili_jct=${this.biliJct}; DedeUserID=${this.dedeUserID}; sid=${this.sid}; `
-        }
-        return cookies;
-    }
-
-    // Wbi签名
-    private encWbi(params: Record<string, any>, img_key: string, sub_key: string): string {
-        const mixin_key = getMixinKey(img_key + sub_key);
-        const curr_time = Math.floor(Date.now() / 1000);
-
-        params.wts = curr_time; // 添加时间戳字段
-        const query = Object.keys(params)
-            .sort()
-            .map(key => `${encodeURIComponent(key)}=${encodeURIComponent(params[key].toString().replace(/[!'()*]/g, ""))}`)
-            .join("&");
-
-        const wbi_sign = crypto.hashDigest({ data: query + mixin_key, algo: "MD5" });
-        console.log("wbi_sign: " + wbi_sign);
-
-        return `${query}&w_rid=${wbi_sign}`;
-    }
-
-    // 发送GET请求
-    private async getRequest(url: string, responseType: string = "json"): Promise<any> {
-        console.log("getRequest: " + url);
-        try {
-            const response = await this.fetch.fetch({
-                url,
-                responseType: responseType,
-                header: this.getHeaders()
-            });
-            return response.data;
-        } catch (error) {
-            console.error(`GET请求失败，错误码 = ${error.code}`);
-            throw error;
-        }
-    }
-
-    // 发送带Wbi签名的GET请求
-    private async getRequestWbi(url: string, params: any): Promise<any> {
-        const img_key = this.accountInfo.wbi_img.img_url.split('/').pop().split('.')[0];
-        const sub_key = this.accountInfo.wbi_img.sub_url.split('/').pop().split('.')[0];
-        const signedParams = this.encWbi(params, img_key, sub_key);
-        return this.getRequest(`${url}?${signedParams}`);
-    }
-
-    // 发送POST请求
-    private async postRequest(url: string, data: string, content_type: string, custom_headers: any = null): Promise<any> {
-        console.log(`postRequest: ${url}, body: ${data}, contentType: ${content_type}`);
-        let headers = { ...this.getHeaders(), "Content-Type": content_type }
-        if (custom_headers) {
-            headers = custom_headers
-        }
-        try {
-            const response = await this.fetch.fetch({
-                url,
-                responseType: 'json',
-                method: 'POST',
-                data,
-                header: headers
-            });
-            return response.data;
-        } catch (error) {
-            console.error(`POST请求失败，错误码 = ${error.code}`);
-            throw error;
-        }
-    }
-
-    // 发送带Wbi签名的POST请求
-    private async postRequestWbi(url: string, wbiParams: any, data: string, content_type: string, custom_headers: any = null): Promise<any> {
-        const img_key = this.accountInfo.wbi_img.img_url.split('/').pop().split('.')[0];
-        const sub_key = this.accountInfo.wbi_img.sub_url.split('/').pop().split('.')[0];
-        const signedParams = this.encWbi(wbiParams, img_key, sub_key);
-        return this.postRequest(`${url}?${signedParams}`, data, content_type, custom_headers);
-    }
-
-    // 检查澎湃哔哩是否存在更新
-    async checkHyperbilibiliUpdates(): Promise<any> {
-        const latestVerGet = await this.fetch.fetch({
-            url: "https://gitee.com/search__stars/hb_ota_info/raw/master/current_ver",
-            header: this.getHeaders()
-        });
-        console.log(latestVerGet.data);
-        const latestVer = latestVerGet.data.data;
-        if (latestVer != this.version) {
-            return {
-                update: true,
-                msg: `检查到更新v${latestVer}，请前往hyperbili.astralsight.space下载更新`
-            };
-        }
-        return { update: false, msg: "" };
-    }
-
-    getEulaShowContent(): any {
-        // 使用硬编码的EULA文本
-        // 因为部分地区可能无法访问境外加速CDN
-        const response = {
-            data: eula.eula
-        };
-
-        return response.data;
-    }
-
-    // 获取二维码信息
-    async loginQR(): Promise<{ url: string, qrcode_key: string }> {
-        console.log("请求登录二维码");
-        const response = await this.getRequest('https://passport.bilibili.com/x/passport-login/web/qrcode/generate');
-        if (response && response.data) {
-            this.qrCodeKey = response.data.data.qrcode_key;
-            if (this.interconnect_mode) {
-                await this.interconnecter.sendMessage(JSON.stringify({
-                    msgtype: "SHOWQR",
-                    message: response.data.data.url
-                }))
-            }
-            return { url: response.data.data.url, qrcode_key: response.data.data.qrcode_key };
-        } else {
-            throw new Error('获取二维码失败');
-        }
-    }
-
-    // 更新账号信息
-    async updateAccountInfo(): Promise<boolean> {
-        const accountInfoResponse = await this.getRequest("https://api.bilibili.com/x/web-interface/nav");
-        this.accountInfo = accountInfoResponse.data.data;
-        return !!this.accountInfo;
-    }
-
-    // 刷新BUVID
-    async updateBUVID() {
-        const response = await this.getRequest("https://api.bilibili.com/x/frontend/finger/spi");
-        this.buvid3 = response.data.data.b_3;
-        this.buvid4 = response.data.data.b_4;
-    }
-
-    // 登录函数，使用本地存储的账号数据或通过二维码登录
-    async login(send_req: boolean, interval: NodeJS.Timeout | null = null): Promise<{ success: boolean, message: string }> {
-        const accountData = await this.getStoredAccountData();
-        if (accountData) {
-            this.sessData = accountData.sessData;
-            this.biliJct = accountData.biliJct;
-            this.dedeUserID = accountData.dedeUserID;
-            this.sid = accountData.sid;
-            console.log('使用存储的账号数据登录成功');
-            await this.updateAccountInfo();
-            await this.updateBUVID();
-            return { success: true, message: "登录成功" };
-        } else if (send_req) {
-            const response = await this.getRequest(`https://passport.bilibili.com/x/passport-login/web/qrcode/poll?qrcode_key=${this.qrCodeKey}`);
-            if (response && response.data && response.data.data.code === 0) {
-                if (interval) clearInterval(interval);
-
-                this.extractCookiesFromResponse(response.headers['Set-Cookie']);
-                await this.storeAccountData();
-                console.log('使用二维码登录并存储账号数据成功');
-                await this.updateAccountInfo();
-                await this.updateBUVID();
-                return { success: true, message: "登录成功" };
-            } else {
-                return { success: false, message: "等待用户操作..." };
-            }
-        }
-    }
-
-    // 从响应头中提取Cookies
-    private extractCookiesFromResponse(setCookieHeaders: string | string[]) {
-        if (typeof setCookieHeaders === 'string') {
-            setCookieHeaders = setCookieHeaders.split(', ');
-        }
-
-        setCookieHeaders.forEach(cookie => {
-            if (cookie.includes('SESSDATA')) this.sessData = this.parseCookie(cookie, 'SESSDATA');
-            else if (cookie.includes('bili_jct')) this.biliJct = this.parseCookie(cookie, 'bili_jct');
-            else if (cookie.includes('DedeUserID') && !cookie.includes('DedeUserID__ckMd5')) this.dedeUserID = this.parseCookie(cookie, 'DedeUserID');
-            else if (cookie.includes('sid')) this.sid = this.parseCookie(cookie, 'sid');
-        });
-    }
-
-    // 获取首页视频推荐
-    async getMainPageRecommendVideos(fresh_type: number, pagesize: number): Promise<any> {
-        const url = `https://api.bilibili.com/x/web-interface/index/top/rcmd?fresh_type=${fresh_type}&ps=${pagesize}&version=1`;
-        const response = await this.getRequest(url);
-        return response.data.data.item;
-    }
-
-    // 根据视频BV号获取视频详情信息
-    async getVideoInfoByBVID(bvid: string): Promise<any> {
-        const url = `https://api.bilibili.com/x/web-interface/view?bvid=${bvid}`;
-        const response = await this.getRequest(url);
-        return response.data.data;
-    }
-
-    // 获取用户创建的所有收藏夹信息
-    async getUserFavouriteFolders(mid: string, type: number = 0, rid: string = null): Promise<any> {
-        let url = `https://api.bilibili.com/x/v3/fav/folder/created/list-all?up_mid=${mid}&type=${type}`;
-        if (rid) url += `&rid=${rid}`;
-        const response = await this.getRequest(url);
-        return response.data.data;
-    }
-
-    // 获取目标收藏夹元数据
-    async getFavouriteFolderMetadata(mlid: string): Promise<any> {
-        const url = `https://api.bilibili.com/x/v3/fav/folder/info?media_id=${mlid}`;
-        const response = await this.getRequest(url);
-        return response.data.data;
-    }
-
-    // 获取目标收藏夹内容
-    async getFavouriteFolderContent(mlid: string, pn: number, ps: number = 10, keyword: string = null): Promise<any> {
-        let url = `https://api.bilibili.com/x/v3/fav/resource/list?media_id=${mlid}&ps=${ps}&pn=${pn}`;
-        if (keyword) url += `&keyword=${keyword}`;
-        const response = await this.getRequest(url);
-        return response.data.data;
-    }
-
-    // 判断视频是否被点赞
-    async isVideoLikedByBVID(bvid: string): Promise<boolean> {
-        const url = `https://api.bilibili.com/x/web-interface/archive/has/like?bvid=${bvid}`;
-        const response = await this.getRequest(url);
-        return response.data.data;
-    }
-
-    // 判断视频是否被投币
-    async isVideoCoinedByBVID(bvid: string): Promise<boolean> {
-        const url = `https://api.bilibili.com/x/web-interface/archive/coins?bvid=${bvid}`;
-        const response = await this.getRequest(url);
-        return response.data.data.multiply;
-    }
-
-    // 判断视频是否被收藏
-    async isVideoStaredByBVID(bvid: string): Promise<boolean> {
-        const url = `https://api.bilibili.com/x/v2/fav/video/favoured?aid=${bvid}`;
-        const response = await this.getRequest(url);
-        return response.data.data.favoured;
-    }
-
-    // 获取评论区内容
-    async getReplies(type: string, oid: string, pn: number = 1, ps: number = 10, sort: number = 1) {
-        const url = `https://api.bilibili.com/x/v2/reply?type=${type}&oid=${oid}&pn=${pn}&ps=${ps}&sort=${sort}`;
-        const response = await this.getRequest(url);
-        return response.data.data;
-    }
-
-    // 获取二级评论区内容
-    async getSecReplies(type: string, oid: string, root: string, pn: number = 1, ps: number = 10) {
-        const url = `https://api.bilibili.com/x/v2/reply/reply?type=${type}&oid=${oid}&pn=${pn}&ps=${ps}&root=${root}`;
-        const response = await this.getRequest(url);
-        return response.data.data;
-    }
-
-    // 点赞评论
-    async LikeReply(type: string, oid: string, rpid: string, action: number) {
-        const url = "https://api.bilibili.com/x/v2/reply/action";
-        const body = `type=${type}&oid=${oid}&rpid=${rpid}&action=${action}&csrf=${this.biliJct}`;
-        const response = await this.postRequest(url, body, "application/x-www-form-urlencoded");
-        return response.data;
-    }
-
-    // 发送评论
-    async GiveReply(type: string, oid: string, message: string) {
-        const url = "https://api.bilibili.com/x/v2/reply/add";
-        const body = `type=${type}&oid=${oid}&message=${message}&plat=1&csrf=${this.biliJct}`;
-        const response = await this.postRequest(url, body, "application/x-www-form-urlencoded");
-        return response.data;
-    }
-
-    // 回复评论（发送二级评论）
-    async GiveSecReply(type: string, oid: string, parent: string, message: string) {
-        const url = "https://api.bilibili.com/x/v2/reply/add";
-        const body = `type=${type}&oid=${oid}&parent=${parent}&message=${message}&plat=1&csrf=${this.biliJct}`;
-        const response = await this.postRequest(url, body, "application/x-www-form-urlencoded");
-        return response.data;
-    }
-
-    // 回复二级评论（对话树）
-    async GiveTreeReply(type: string, oid: string, parent: string, root: string, message: string) {
-        const url = "https://api.bilibili.com/x/v2/reply/add";
-        const body = `type=${type}&oid=${oid}&parent=${parent}&root=${root}&message=${message}&plat=1&csrf=${this.biliJct}`;
-        const response = await this.postRequest(url, body, "application/x-www-form-urlencoded");
-        return response.data;
-    }
-
-    // 获取视频AI摘要
-    async getVideoAISummaryByBVID(bvid: string, cid: string, up_mid: string) {
-        const url = "https://api.bilibili.com/x/web-interface/view/conclusion/get";
-        const response = await this.getRequestWbi(url, { bvid, cid, up_mid });
-        return response.data.data.model_result.summary;
-    }
-
-    // 收藏视频至默认收藏夹
-    async starVideoToDefaultFavFolderByBVID(bvid: string): Promise<any> {
-        let defaultFolderID = 0;
-        const folders = await this.getUserFavouriteFolders(this.accountInfo.mid);
-        folders.list.forEach(folder => {
-            if (folder.title === "默认收藏夹") {
-                defaultFolderID = folder.id;
-            }
-        });
-        if (!defaultFolderID) return false;
-
-        try {
-            const videoInfo = await this.getVideoInfoByBVID(bvid);
-            const aid = videoInfo.aid;
-            const url = `https://api.bilibili.com/x/v3/fav/resource/deal`;
-            const data = `rid=${aid}&csrf=${this.biliJct}&type=2&add_media_ids=${defaultFolderID}&del_media_ids=`;
-            const response = await this.postRequest(url, data, "application/x-www-form-urlencoded");
-            return response.data.code;
-        } catch (error) {
-            console.error("Error starring video: ", error);
-            return false;
-        }
-    }
-
-    // 获取搜索热词
-    async getSearchHotwords(): Promise<any> {
-        const url = "https://s.search.bilibili.com/main/hotword";
-        const response = await this.getRequest(url);
-        return response.data.list;
-    }
-
-    // 获取历史记录
-    async getWatchHistory(pn: number, ps: number): Promise<any> {
-        const url = `https://api.bilibili.com/x/v2/history?pn=${pn}&ps=${ps}`;
-        const response = await this.getRequest(url);
-        return response.data.data;
-    }
-
-    // 点赞视频
-    async LikeVideo(bvid: string, like: number): Promise<any> {
-        const url = "https://api.bilibili.com/x/web-interface/archive/like";
-        const body = `bvid=${bvid}&like=${like}&csrf=${this.biliJct}`;
-        const response = await this.postRequest(url, body, "application/x-www-form-urlencoded");
-        return response.data;
-    }
-
-    // 投币视频
-    async CoinVideo(bvid: string, multiply: number): Promise<any> {
-        const url = "https://api.bilibili.com/x/web-interface/coin/add";
-        const body = `bvid=${bvid}&multiply=${multiply}&csrf=${this.biliJct}`;
-        const response = await this.postRequest(url, body, "application/x-www-form-urlencoded");
-        return response.data;
-    }
-
-    // 全站搜索（首页入口）（视频、用户）
-    async searchContents(keyword: string, vidcount: number = 20): Promise<any> {
-        const url = "https://api.bilibili.com/x/web-interface/wbi/search/all/v2";
-        const response = await this.getRequestWbi(url, { keyword });
-
-        let result = { users: [], videos: [], comprehensive_videos: [] };
-
-        response.data.data.result.forEach(result_array => {
-            switch (result_array.result_type) {
-                case "bili_user":
-                    result.users = result_array.data;
-                    break;
-                case "video":
-                    result_array.data.forEach(vid => {
-                        if (vid.bvid) {
-                            result.videos.push(vid)
-                        }
-                    });
-                    break;
-            }
-        });
-
-        result.comprehensive_videos = result.videos.slice(0, 5);
-        result.videos = result.videos.slice(0, vidcount)
-
-        return result;
-    }
-
-    // 全站搜索，但是按类型细分
-    /* SearchType可取：
-        视频：video
-        番剧：media_bangumi
-        影视：media_ft
-        直播间及主播：live
-        直播间：live_room
-        主播：live_user
-        专栏：article
-        话题：topic
-        用户：bili_user
-        相簿：photo
-    */
-    async searchContentWithType(keyword: string, search_type: string) {
-        console.log("[searchContentWithType] keyword=" + keyword + " type=" + search_type)
-        const url = "https://api.bilibili.com/x/web-interface/wbi/search/type"
-        const response = await this.getRequestWbi(url, {
-            keyword,
-            search_type
-        })
-
-        return response.data.data;
-    }
-
-    // 获取通知信息数量 （例如回复我的、at我的、点赞数量）
-    async getMessageNotifyFeed() {
-        const url = "https://api.vc.bilibili.com/x/im/web/msgfeed/unread";
-        const response = await this.getRequest(url);
-        return response.data.data;
-    }
-
-    // 获取私信Session列表
-    // 一次性最多拉取20个，可加end_ts做IFS（但没必要）
-    async getDMSessions(session_type: number, sort_rule: number) {
-        const url = "https://api.vc.bilibili.com/session_svr/v1/session_svr/get_sessions"
-        const response = await this.getRequestWbi(url, {
-            session_type,
-            sort_rule,
-            group_fold: 0,
-            unfollow_fold: 0,
-            mobi_app: "web"
-        })
-
-        return response.data.data
-    }
-
-    // 获取私信Session聊天记录
-    // 若要做IFS，则end_seqno应该为最顶上那条信息的序列号
-    // 接口有漏洞，自带防撤回
-    async getDMSessionMessage(session_type: number, talker_id: string, size: number = 10, end_seqno: string) {
-        const url = "https://api.vc.bilibili.com/svr_sync/v1/svr_sync/fetch_session_msgs"
-        var params = {
-            session_type,
-            talker_id,
-            size
-        };
-        if (end_seqno) {
-            params["end_seqno"] = end_seqno;
-        }
-        const response = await this.getRequestWbi(url, params);
-
-        return response.data.data
-    }
-
-    // 发送私信消息
-    async SendDMSessionMessage(receiver_id: string, msg_type: number, content: string) {
-        const url = "https://api.vc.bilibili.com/web_im/v1/web_im/send_msg";
-        const body = `msg[sender_uid]=${this.accountInfo.mid}&msg[receiver_id]=${receiver_id}&msg[receiver_type]=1&msg[msg_type]=${msg_type}&msg[dev_id]=${this.dm_deviceid}&msg[timestamp]=${Number.parseInt(((new Date()).getTime() / 1000).toString())}&msg[content]=${encodeURIComponent(`{"content": "${content}"}`)}&csrf=${this.biliJct}&csrf_token=${this.biliJct}&msg[msg_status]=0&msg[new_face_version]=0&from_firework=0&build=0&mobi_app=web`;
-
-        var headers = { ...this.getHeaders(), "Content-Type": "application/x-www-form-urlencoded" }
-        headers["Host"] = "api.vc.bilibili.com"
-        headers["Origin"] = "https://message.bilibili.com"
-        headers["Referer"] = "https://message.bilibili.com/"
-        headers["Content-Length"] = body.length
-
-        const response = await this.postRequestWbi(url, {
-            w_sender_uid: this.accountInfo.mid,
-            w_receiver_id: receiver_id,
-            w_dev_id: this.dm_deviceid
-        }, body, "application/x-www-form-urlencoded", headers);
-
-        return response.data
-    }
-
-    // 根据UID批量获取用户信息
-    async getMultiUserInfoByUID(uids: Array<String>) {
-        const url = "https://api.bilibili.com/x/polymer/pc-electron/v1/user/cards";
-        let param = "";
-        uids.forEach(uid => {
-            param += uid
-            if (uids.indexOf(uid) != uids.length - 1) {
-                param += ","
-            }
-        });
-        const response = await this.getRequest(`${url}?uids=${param}`)
-
-        return response.data.data
-    }
-
-    // 根据BVID与CID获取视频MP4流地址
-    // qn: 32=480p 64=720p
-    async getVideoMP4StreamByBVID(cid: string, bvid: string, qn: string = "32") {
-        const url = `https://api.bilibili.com/x/player/wbi/playurl`
-        const response = await this.getRequestWbi(url, {
-            cid,
-            bvid,
-            qn,
-            fnval: "1",
-            platform: "html5"
-        })
-
-        console.log(response)
-        return response.data.data
-    }
-
-    // 获取专栏网页HTML（需要过parser才能使用）
-    async getArticle(cvid: string): Promise<any> {
-        const url = `https://www.bilibili.com/read/${cvid}`;
-        const response = await this.getRequest(url, "text");
-
-        return response.data;
-    }
-
-    // 退出登录（删除本地存储的账号数据）
-    logOut() {
-        storage.delete({ key: "bilibili_account" });
-    }
-
-    // 辅助函数，用于解析cookie字符串
-    private parseCookie(cookie: string, name: string): string | null {
-        const match = cookie.match(new RegExp(`${name}=([^;]+)`));
-        return match ? match[1] : null;
-    }
-
-    // 获取本地存储的账号数据
-    private async getStoredAccountData(): Promise<AccountData | null> {
-        return new Promise((resolve) => {
-            storage.get({
-                key: 'bilibili_account',
-                success: (data: string) => {
-                    resolve(data ? JSON.parse(data) as AccountData : null);
-                },
-                fail: (data: any, code: number) => {
-                    console.log(`获取存储的账号数据失败，错误码 = ${code}`);
-                    resolve(null);
-                }
-            });
-        });
-    }
-
-    // 保存账号数据到本地存储
-    private async storeAccountData(): Promise<void> {
-        if (this.sessData && this.biliJct && this.dedeUserID && this.sid) {
-            const accountData: AccountData = { sessData: this.sessData, biliJct: this.biliJct, dedeUserID: this.dedeUserID, sid: this.sid };
-            return new Promise((resolve, reject) => {
-                storage.set({
-                    key: 'bilibili_account',
-                    value: JSON.stringify(accountData),
-                    success: () => {
-                        console.log('账号数据存储成功');
-                        resolve();
-                    },
-                    fail: (data: any, code: number) => {
-                        console.log(`存储账号数据失败，错误码 = ${code}`);
-                        reject();
-                    }
-                });
-            });
-        }
-    }
-}
-
-export { BilibiliClient };
\ No newline at end of file
diff --git a/src/bilibiliclient/account/accountData.ts b/src/bilibiliclient/account/accountData.ts
new file mode 100644
index 0000000..cef63bc
--- /dev/null
+++ b/src/bilibiliclient/account/accountData.ts
@@ -0,0 +1,7 @@
+// 账号数据接口
+export interface AccountData {
+    sessData: string;
+    biliJct: string;
+    dedeUserID: string;
+    sid: string;
+}
\ No newline at end of file
diff --git a/src/bilibiliclient/account/login.ts b/src/bilibiliclient/account/login.ts
new file mode 100644
index 0000000..af68431
--- /dev/null
+++ b/src/bilibiliclient/account/login.ts
@@ -0,0 +1,122 @@
+import { storage } from '../../tsimports';
+import { AccountData } from './accountData';
+
+// 登录相关的方法
+export const BilibiliClientLoginMethods = {
+    // 更新账号信息
+    async updateAccountInfo(this: any): Promise<boolean> {
+        const accountInfoResponse = await this.getRequest("https://api.bilibili.com/x/web-interface/nav");
+        this.accountInfo = accountInfoResponse.data.data;
+        return !!this.accountInfo;
+    },
+
+    // 刷新BUVID
+    async updateBUVID(this: any) {
+        const response = await this.getRequest("https://api.bilibili.com/x/frontend/finger/spi");
+        this.buvid3 = response.data.data.b_3;
+        this.buvid4 = response.data.data.b_4;
+    },
+
+    // 获取二维码信息
+    async loginQR(this: any): Promise<{ url: string, qrcode_key: string }> {
+        console.log("请求登录二维码");
+        const response = await this.getRequest('https://passport.bilibili.com/x/passport-login/web/qrcode/generate');
+        if (response && response.data) {
+            this.qrCodeKey = response.data.data.qrcode_key;
+            return { url: response.data.data.url, qrcode_key: response.data.data.qrcode_key };
+        } else {
+            throw new Error('获取二维码失败');
+        }
+    },
+
+    // 登录函数，使用本地存储的账号数据或通过二维码登录
+    async login(this: any, send_req: boolean, interval: NodeJS.Timeout | null = null): Promise<{ success: boolean, message: string }> {
+        const accountData = await this.getStoredAccountData();
+        if (accountData) {
+            this.sessData = accountData.sessData;
+            this.biliJct = accountData.biliJct;
+            this.dedeUserID = accountData.dedeUserID;
+            this.sid = accountData.sid;
+            console.log('使用存储的账号数据登录成功');
+            await this.updateAccountInfo();
+            await this.updateBUVID();
+            return { success: true, message: "登录成功" };
+        } else if (send_req) {
+            const response = await this.getRequest(`https://passport.bilibili.com/x/passport-login/web/qrcode/poll?qrcode_key=${this.qrCodeKey}`);
+            if (response && response.data && response.data.data.code === 0) {
+                if (interval) clearInterval(interval);
+
+                this.extractCookiesFromResponse(response.headers['Set-Cookie']);
+                await this.storeAccountData();
+                console.log('使用二维码登录并存储账号数据成功');
+                await this.updateAccountInfo();
+                await this.updateBUVID();
+                return { success: true, message: "登录成功" };
+            } else {
+                return { success: false, message: "等待用户操作..." };
+            }
+        }
+    },
+
+    // 退出登录（删除本地存储的账号数据）
+    logOut(this: any) {
+        storage.delete({ key: "bilibili_account" });
+    },
+
+    // 从响应头中提取Cookies
+    extractCookiesFromResponse(this: any, setCookieHeaders: string | string[]) {
+        if (typeof setCookieHeaders === 'string') {
+            setCookieHeaders = setCookieHeaders.split(', ');
+        }
+
+        setCookieHeaders.forEach(cookie => {
+            if (cookie.includes('SESSDATA')) this.sessData = this.parseCookie(cookie, 'SESSDATA');
+            else if (cookie.includes('bili_jct')) this.biliJct = this.parseCookie(cookie, 'bili_jct');
+            else if (cookie.includes('DedeUserID') && !cookie.includes('DedeUserID__ckMd5')) this.dedeUserID = this.parseCookie(cookie, 'DedeUserID');
+            else if (cookie.includes('sid')) this.sid = this.parseCookie(cookie, 'sid');
+        });
+    },
+
+    // 辅助函数，用于解析cookie字符串
+    parseCookie(this: any, cookie: string, name: string): string | null {
+        const match = cookie.match(new RegExp(`${name}=([^;]+)`));
+        return match ? match[1] : null;
+    },
+
+    // 获取本地存储的账号数据
+    async getStoredAccountData(this: any): Promise<AccountData | null> {
+        return new Promise((resolve) => {
+            storage.get({
+                key: 'bilibili_account',
+                success: (data: string) => {
+                    resolve(data ? JSON.parse(data) as AccountData : null);
+                },
+                fail: (data: any, code: number) => {
+                    console.log(`获取存储的账号数据失败，错误码 = ${code}`);
+                    resolve(null);
+                }
+            });
+        });
+    },
+
+    // 保存账号数据到本地存储
+    async storeAccountData(this: any): Promise<void> {
+        if (this.sessData && this.biliJct && this.dedeUserID && this.sid) {
+            const accountData: AccountData = { sessData: this.sessData, biliJct: this.biliJct, dedeUserID: this.dedeUserID, sid: this.sid };
+            return new Promise((resolve, reject) => {
+                storage.set({
+                    key: 'bilibili_account',
+                    value: JSON.stringify(accountData),
+                    success: () => {
+                        console.log('账号数据存储成功');
+                        resolve();
+                    },
+                    fail: (data: any, code: number) => {
+                        console.log(`存储账号数据失败，错误码 = ${code}`);
+                        reject();
+                    }
+                });
+            });
+        }
+    }
+};
\ No newline at end of file
diff --git a/src/bilibiliclient/api/request.ts b/src/bilibiliclient/api/request.ts
new file mode 100644
index 0000000..fc6a60d
--- /dev/null
+++ b/src/bilibiliclient/api/request.ts
@@ -0,0 +1,127 @@
+import { crypto } from '../../tsimports';
+import { getMixinKey } from '../utils/utils';
+import * as eula from '../../eula'
+
+// API请求相关的方法
+export const BilibiliClientAPIRequestMethods = {
+
+    // 获取请求头，用于模拟正常浏览器环境，降低风控概率
+    getHeaders(this: any): Record<string, string> {
+        return {
+            'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/jxl,image/webp,image/png,image/svg+xml,*/*;q=0.8',
+            'Accept-Encoding': '',
+            'Accept-Language': 'zh-CN,zh;q=0.8',
+            'Cookie': this.getCookieString(),
+            'Referer': 'https://www.bilibili.com',
+            'Origin': 'https://www.bilibili.com',
+            'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:129.0) Gecko/20100101 Firefox/129.0'
+        };
+    },
+
+    // 构建Cookie字符串
+    getCookieString(this: any): string {
+        let cookies = `buvid3=${this.buvid3}; buvid4=${this.buvid4}; `;
+        if (this.sessData) {
+            cookies += `SESSDATA=${this.sessData}; bili_jct=${this.biliJct}; DedeUserID=${this.dedeUserID}; sid=${this.sid}; `;
+        }
+        return cookies;
+    },
+
+    // Wbi签名
+    encWbi(this: any, params: Record<string, any>, img_key: string, sub_key: string): string {
+        const mixin_key = getMixinKey(img_key + sub_key);
+        const curr_time = Math.floor(Date.now() / 1000);
+
+        params.wts = curr_time; // 添加时间戳字段
+        const query = Object.keys(params)
+            .sort()
+            .map(key => `${encodeURIComponent(key)}=${encodeURIComponent(params[key].toString().replace(/[!'()*]/g, ""))}`)
+            .join("&");
+
+        const wbi_sign = crypto.hashDigest({ data: query + mixin_key, algo: "MD5" });
+        console.log("wbi_sign: " + wbi_sign);
+
+        return `${query}&w_rid=${wbi_sign}`;
+    },
+
+    // 发送GET请求
+    async getRequest(this: any, url: string, responseType: string = "json"): Promise<any> {
+        console.log("getRequest: " + url);
+        try {
+            const response = await this.fetch.fetch({
+                url,
+                responseType: responseType,
+                header: this.getHeaders()
+            });
+            return response.data;
+        } catch (error) {
+            console.error(`GET请求失败，错误码 = ${error.code}`);
+            throw error;
+        }
+    },
+
+    // 发送带Wbi签名的GET请求
+    async getRequestWbi(this: any, url: string, params: any): Promise<any> {
+        const img_key = this.accountInfo.wbi_img.img_url.split('/').pop().split('.')[0];
+        const sub_key = this.accountInfo.wbi_img.sub_url.split('/').pop().split('.')[0];
+        const signedParams = this.encWbi(params, img_key, sub_key);
+        return this.getRequest(`${url}?${signedParams}`);
+    },
+
+    // 发送POST请求
+    async postRequest(this: any, url: string, data: string, content_type: string, custom_headers: any = null): Promise<any> {
+        console.log(`postRequest: ${url}, body: ${data}, contentType: ${content_type}`);
+        let headers = { ...this.getHeaders(), "Content-Type": content_type }
+        if (custom_headers) {
+            headers = custom_headers
+        }
+        try {
+            const response = await this.fetch.fetch({
+                url,
+                responseType: 'json',
+                method: 'POST',
+                data,
+                header: headers
+            });
+            return response.data;
+        } catch (error) {
+            console.error(`POST请求失败，错误码 = ${error.code}`);
+            throw error;
+        }
+    },
+
+    // 发送带Wbi签名的POST请求
+    async postRequestWbi(this: any, url: string, wbiParams: any, data: string, content_type: string, custom_headers: any = null): Promise<any> {
+        const img_key = this.accountInfo.wbi_img.img_url.split('/').pop().split('.')[0];
+        const sub_key = this.accountInfo.wbi_img.sub_url.split('/').pop().split('.')[0];
+        const signedParams = this.encWbi(wbiParams, img_key, sub_key);
+        return this.postRequest(`${url}?${signedParams}`, data, content_type, custom_headers);
+    },
+
+    // 检查澎湃哔哩是否存在更新
+    async checkHyperbilibiliUpdates(this: any): Promise<any> {
+        const latestVerGet = await this.fetch.fetch({
+            url: "https://gitee.com/search__stars/hb_ota_info/raw/master/current_ver",
+            header: this.getHeaders()
+        });
+        console.log(latestVerGet.data);
+        const latestVer = latestVerGet.data.data;
+        if (latestVer != this.version) {
+            return {
+                update: true,
+                msg: `检查到更新v${latestVer}，请前往hyperbili.astralsight.space下载更新`
+            };
+        }
+        return { update: false, msg: "" };
+    },
+
+    getEulaShowContent(this: any): any {
+        // 使用硬编码的EULA文本
+        // 因为部分地区可能无法访问境外加速CDN
+        const response = {
+            data: eula.eula
+        };
+
+        return response.data;
+    },
+};
\ No newline at end of file
diff --git a/src/bilibiliclient/article/article.ts b/src/bilibiliclient/article/article.ts
new file mode 100644
index 0000000..aeb5f86
--- /dev/null
+++ b/src/bilibiliclient/article/article.ts
@@ -0,0 +1,9 @@
+export const BilibiliClientArticleMethods = {
+    // 获取专栏网页HTML（需要过parser才能使用）
+    async getArticle(this: any, cvid: string): Promise<any> {
+        const url = `https://www.bilibili.com/read/${cvid}`;
+        const response = await this.getRequest(url, "text");
+
+        return response.data;
+    }
+}
\ No newline at end of file
diff --git a/src/bilibiliclient/client.ts b/src/bilibiliclient/client.ts
new file mode 100644
index 0000000..0aee60f
--- /dev/null
+++ b/src/bilibiliclient/client.ts
@@ -0,0 +1,68 @@
+import { fetch } from '../tsimports';
+
+import { BilibiliClientLoginMethods } from './account/login';
+import { BilibiliClientVideoMethods } from './video/video';
+import { BilibiliClientVideoActionMethods } from './video/action';
+import { BilibiliClientArticleMethods } from './article/article';
+import { BilibiliClientFavFolderMethods } from './folder/favfolder';
+import { BilibiliClientHistoryMethods } from './folder/history';
+import { BilibiliClientUserMethods } from './user/user';
+import { BilibiliClientCommentMethods } from './comment/comment';
+import { BilibiliClientMessageMethods } from './message/message';
+import { BilibiliClientSearchMethods } from './search/search';
+import { BilibiliClientAPIRequestMethods } from './api/request';
+
+class BilibiliClient {
+    // 版本号
+    public version: string = "2.5";
+
+    // Fetch API
+    // 在class内存储一个来适配不同实现
+    public fetch: any;
+
+    // 扫码登录用的二维码Key（临时存储）
+    private qrCodeKey: string | null = null;
+
+    // B站Cookies
+    public sessData: string | null = null;
+    public biliJct: string | null = null;
+    public dedeUserID: string | null = null;
+    public sid: string | null = null;
+
+    // B站账号信息（非AccountData）
+    public accountInfo: any | null = null;
+
+    // 风控Cookies（不存储，构建biliclient时更新）
+    private buvid3: string | null = null;
+    private buvid4: string | null = null;
+
+    // 私信DeviceId，每次登录刷新
+    // From https://github.com/andywang425/BLTH/
+    private dm_deviceid = "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function (name) {
+        let randomInt = 16 * Math.random() | 0;
+        return ("x" === name ? randomInt : 3 & randomInt | 8).toString(16).toUpperCase()
+    });
+
+    constructor() {
+        //@ts-ignore
+        this.updateBUVID();
+        this.fetch = fetch;
+    }
+}
+
+// 将其他模块的方法添加到BilibiliClient的prototype上
+Object.assign(BilibiliClient.prototype, 
+    BilibiliClientLoginMethods,
+    BilibiliClientAPIRequestMethods,
+    BilibiliClientVideoMethods,
+    BilibiliClientVideoActionMethods,
+    BilibiliClientArticleMethods,
+    BilibiliClientFavFolderMethods,
+    BilibiliClientHistoryMethods,
+    BilibiliClientUserMethods,
+    BilibiliClientCommentMethods,
+    BilibiliClientMessageMethods,
+    BilibiliClientSearchMethods,
+);
+
+export { BilibiliClient };
\ No newline at end of file
diff --git a/src/bilibiliclient/comment/comment.ts b/src/bilibiliclient/comment/comment.ts
new file mode 100644
index 0000000..148ce7f
--- /dev/null
+++ b/src/bilibiliclient/comment/comment.ts
@@ -0,0 +1,47 @@
+export const BilibiliClientCommentMethods = {
+    // 获取评论区内容
+    async getReplies(this: any, type: string, oid: string, pn: number = 1, ps: number = 10, sort: number = 1) {
+        const url = `https://api.bilibili.com/x/v2/reply?type=${type}&oid=${oid}&pn=${pn}&ps=${ps}&sort=${sort}`;
+        const response = await this.getRequest(url);
+        return response.data.data;
+    },
+
+    // 获取二级评论区内容
+    async getSecReplies(this: any, type: string, oid: string, root: string, pn: number = 1, ps: number = 10) {
+        const url = `https://api.bilibili.com/x/v2/reply/reply?type=${type}&oid=${oid}&pn=${pn}&ps=${ps}&root=${root}`;
+        const response = await this.getRequest(url);
+        return response.data.data;
+    },
+
+    // 点赞评论
+    async LikeReply(this: any, type: string, oid: string, rpid: string, action: number) {
+        const url = "https://api.bilibili.com/x/v2/reply/action";
+        const body = `type=${type}&oid=${oid}&rpid=${rpid}&action=${action}&csrf=${this.biliJct}`;
+        const response = await this.postRequest(url, body, "application/x-www-form-urlencoded");
+        return response.data;
+    },
+
+    // 发送评论
+    async GiveReply(this: any, type: string, oid: string, message: string) {
+        const url = "https://api.bilibili.com/x/v2/reply/add";
+        const body = `type=${type}&oid=${oid}&message=${message}&plat=1&csrf=${this.biliJct}`;
+        const response = await this.postRequest(url, body, "application/x-www-form-urlencoded");
+        return response.data;
+    },
+
+    // 回复评论（发送二级评论）
+    async GiveSecReply(this: any, type: string, oid: string, parent: string, message: string) {
+        const url = "https://api.bilibili.com/x/v2/reply/add";
+        const body = `type=${type}&oid=${oid}&parent=${parent}&message=${message}&plat=1&csrf=${this.biliJct}`;
+        const response = await this.postRequest(url, body, "application/x-www-form-urlencoded");
+        return response.data;
+    },
+
+    // 回复二级评论（对话树）
+    async GiveTreeReply(this: any, type: string, oid: string, parent: string, root: string, message: string) {
+        const url = "https://api.bilibili.com/x/v2/reply/add";
+        const body = `type=${type}&oid=${oid}&parent=${parent}&root=${root}&message=${message}&plat=1&csrf=${this.biliJct}`;
+        const response = await this.postRequest(url, body, "application/x-www-form-urlencoded");
+        return response.data;
+    },
+};
\ No newline at end of file
diff --git a/src/bilibiliclient/folder/favfolder.ts b/src/bilibiliclient/folder/favfolder.ts
new file mode 100644
index 0000000..ef1a7b2
--- /dev/null
+++ b/src/bilibiliclient/folder/favfolder.ts
@@ -0,0 +1,24 @@
+export const BilibiliClientFavFolderMethods = {
+    // 获取用户创建的所有收藏夹信息
+    async getUserFavouriteFolders(this: any, mid: string, type: number = 0, rid: string = null): Promise<any> {
+        let url = `https://api.bilibili.com/x/v3/fav/folder/created/list-all?up_mid=${mid}&type=${type}`;
+        if (rid) url += `&rid=${rid}`;
+        const response = await this.getRequest(url);
+        return response.data.data;
+    },
+
+    // 获取目标收藏夹元数据
+    async getFavouriteFolderMetadata(this: any, mlid: string): Promise<any> {
+        const url = `https://api.bilibili.com/x/v3/fav/folder/info?media_id=${mlid}`;
+        const response = await this.getRequest(url);
+        return response.data.data;
+    },
+
+    // 获取目标收藏夹内容
+    async getFavouriteFolderContent(this: any, mlid: string, pn: number, ps: number = 10, keyword: string = null): Promise<any> {
+        let url = `https://api.bilibili.com/x/v3/fav/resource/list?media_id=${mlid}&ps=${ps}&pn=${pn}`;
+        if (keyword) url += `&keyword=${keyword}`;
+        const response = await this.getRequest(url);
+        return response.data.data;
+    }
+}
\ No newline at end of file
diff --git a/src/bilibiliclient/folder/history.ts b/src/bilibiliclient/folder/history.ts
new file mode 100644
index 0000000..218a141
--- /dev/null
+++ b/src/bilibiliclient/folder/history.ts
@@ -0,0 +1,8 @@
+export const BilibiliClientHistoryMethods = {
+    // 获取历史记录
+    async getWatchHistory(this: any, pn: number, ps: number): Promise<any> {
+        const url = `https://api.bilibili.com/x/v2/history?pn=${pn}&ps=${ps}`;
+        const response = await this.getRequest(url);
+        return response.data.data;
+    }
+}
\ No newline at end of file
diff --git a/src/bilibiliclient/message/message.ts b/src/bilibiliclient/message/message.ts
new file mode 100644
index 0000000..0c58106
--- /dev/null
+++ b/src/bilibiliclient/message/message.ts
@@ -0,0 +1,61 @@
+export const BilibiliClientMessageMethods = {
+    // 获取通知信息数量 （例如回复我的、at我的、点赞数量）
+    async getMessageNotifyFeed(this: any) {
+        const url = "https://api.vc.bilibili.com/x/im/web/msgfeed/unread";
+        const response = await this.getRequest(url);
+        return response.data.data;
+    },
+
+    // 获取私信Session列表
+    // 一次性最多拉取20个，可加end_ts做IFS（但没必要）
+    async getDMSessions(this: any, session_type: number, sort_rule: number) {
+        const url = "https://api.vc.bilibili.com/session_svr/v1/session_svr/get_sessions"
+        const response = await this.getRequestWbi(url, {
+            session_type,
+            sort_rule,
+            group_fold: 0,
+            unfollow_fold: 0,
+            mobi_app: "web"
+        })
+
+        return response.data.data
+    },
+
+    // 获取私信Session聊天记录
+    // 若要做IFS，则end_seqno应该为最顶上那条信息的序列号
+    // 接口有漏洞，自带防撤回
+    async getDMSessionMessage(this: any, session_type: number, talker_id: string, size: number = 10, end_seqno: string) {
+        const url = "https://api.vc.bilibili.com/svr_sync/v1/svr_sync/fetch_session_msgs"
+        var params = {
+            session_type,
+            talker_id,
+            size
+        };
+        if (end_seqno) {
+            params["end_seqno"] = end_seqno;
+        }
+        const response = await this.getRequestWbi(url, params);
+
+        return response.data.data
+    },
+
+    // 发送私信消息
+    async SendDMSessionMessage(this: any, receiver_id: string, msg_type: number, content: string) {
+        const url = "https://api.vc.bilibili.com/web_im/v1/web_im/send_msg";
+        const body = `msg[sender_uid]=${this.accountInfo.mid}&msg[receiver_id]=${receiver_id}&msg[receiver_type]=1&msg[msg_type]=${msg_type}&msg[dev_id]=${this.dm_deviceid}&msg[timestamp]=${Number.parseInt(((new Date()).getTime() / 1000).toString())}&msg[content]=${encodeURIComponent(JSON.stringify({"content": `${content}`}))}&csrf=${this.biliJct}&csrf_token=${this.biliJct}&msg[msg_status]=0&msg[new_face_version]=0&from_firework=0&build=0&mobi_app=web`;
+
+        var headers = { ...this.getHeaders(), "Content-Type": "application/x-www-form-urlencoded" }
+        headers["Host"] = "api.vc.bilibili.com"
+        headers["Origin"] = "https://message.bilibili.com"
+        headers["Referer"] = "https://message.bilibili.com/"
+        headers["Content-Length"] = body.length.toString()
+
+        const response = await this.postRequestWbi(url, {
+            w_sender_uid: this.accountInfo.mid,
+            w_receiver_id: receiver_id,
+            w_dev_id: this.dm_deviceid
+        }, body, "application/x-www-form-urlencoded", headers);
+
+        return response.data
+    },
+};
\ No newline at end of file
diff --git a/src/bilibiliclient/search/search.ts b/src/bilibiliclient/search/search.ts
new file mode 100644
index 0000000..9f692be
--- /dev/null
+++ b/src/bilibiliclient/search/search.ts
@@ -0,0 +1,48 @@
+export const BilibiliClientSearchMethods = {
+    // 获取搜索热词
+    async getSearchHotwords(this: any): Promise<any> {
+        const url = "https://s.search.bilibili.com/main/hotword";
+        const response = await this.getRequest(url);
+        return response.data.list;
+    },
+
+    // 全站搜索（首页入口）（视频、用户）
+    async searchContents(this: any, keyword: string, vidcount: number = 20): Promise<any> {
+        const url = "https://api.bilibili.com/x/web-interface/wbi/search/all/v2";
+        const response = await this.getRequestWbi(url, { keyword });
+
+        let result = { users: [], videos: [], comprehensive_videos: [] };
+
+        response.data.data.result.forEach((result_array: any) => {
+            switch (result_array.result_type) {
+                case "bili_user":
+                    result.users = result_array.data;
+                    break;
+                case "video":
+                    result_array.data.forEach((vid: any) => {
+                        if (vid.bvid) {
+                            result.videos.push(vid)
+                        }
+                    });
+                    break;
+            }
+        });
+
+        result.comprehensive_videos = result.videos.slice(0, 5);
+        result.videos = result.videos.slice(0, vidcount)
+
+        return result;
+    },
+
+    // 全站搜索，但是按类型细分
+    async searchContentWithType(this: any, keyword: string, search_type: string) {
+        console.log("[searchContentWithType] keyword=" + keyword + " type=" + search_type)
+        const url = "https://api.bilibili.com/x/web-interface/wbi/search/type"
+        const response = await this.getRequestWbi(url, {
+            keyword,
+            search_type
+        })
+
+        return response.data.data;
+    },
+};
diff --git a/src/bilibiliclient/user/user.ts b/src/bilibiliclient/user/user.ts
new file mode 100644
index 0000000..a72a3fb
--- /dev/null
+++ b/src/bilibiliclient/user/user.ts
@@ -0,0 +1,16 @@
+export const BilibiliClientUserMethods = {
+    // 根据UID批量获取用户信息
+    async getMultiUserInfoByUID(this: any, uids: Array<String>) {
+        const url = "https://api.bilibili.com/x/polymer/pc-electron/v1/user/cards";
+        let param = "";
+        uids.forEach(uid => {
+            param += uid
+            if (uids.indexOf(uid) != uids.length - 1) {
+                param += ","
+            }
+        });
+        const response = await this.getRequest(`${url}?uids=${param}`)
+
+        return response.data.data
+    }
+}
\ No newline at end of file
diff --git a/src/bilibiliclient/utils/utils.ts b/src/bilibiliclient/utils/utils.ts
new file mode 100644
index 0000000..6d401cc
--- /dev/null
+++ b/src/bilibiliclient/utils/utils.ts
@@ -0,0 +1,15 @@
+// Wbi签名混淆表
+export const mixinKeyEncTab = [
+    46, 47, 18, 2, 53, 8, 23, 32, 15, 50, 10, 31,
+    58, 3, 45, 35, 27, 43, 5, 49,
+    33, 9, 42, 19, 29, 28, 14, 39,
+    12, 38, 41, 13, 37, 48, 7, 16,
+    24, 55, 40, 61, 26, 17, 0, 1,
+    60, 51, 30, 4, 22, 25, 54, 21,
+    56, 59, 6, 63, 57, 62, 11, 36,
+    20, 34, 44, 52
+];
+
+// 对imgKey和subKey进行混淆编码
+export const getMixinKey = (orig: string) =>
+    mixinKeyEncTab.map(n => orig[n]).join("").slice(0, 32);
\ No newline at end of file
diff --git a/src/bilibiliclient/video/action.ts b/src/bilibiliclient/video/action.ts
new file mode 100644
index 0000000..2397a68
--- /dev/null
+++ b/src/bilibiliclient/video/action.ts
@@ -0,0 +1,41 @@
+export const BilibiliClientVideoActionMethods = {
+    // 点赞视频
+    async LikeVideo(this: any, bvid: string, like: number): Promise<any> {
+        const url = "https://api.bilibili.com/x/web-interface/archive/like";
+        const body = `bvid=${bvid}&like=${like}&csrf=${this.biliJct}`;
+        const response = await this.postRequest(url, body, "application/x-www-form-urlencoded");
+        return response.data;
+    },
+
+    // 投币视频
+    async CoinVideo(this: any, bvid: string, multiply: number): Promise<any> {
+        const url = "https://api.bilibili.com/x/web-interface/coin/add";
+        const body = `bvid=${bvid}&multiply=${multiply}&csrf=${this.biliJct}`;
+        const response = await this.postRequest(url, body, "application/x-www-form-urlencoded");
+        return response.data;
+    },
+
+    // 收藏视频至默认收藏夹
+    async starVideoToDefaultFavFolderByBVID(this: any, bvid: string): Promise<any> {
+        let defaultFolderID = 0;
+        const folders = await this.getUserFavouriteFolders(this.accountInfo.mid);
+        folders.list.forEach((folder: any) => {
+            if (folder.title === "默认收藏夹") {
+                defaultFolderID = folder.id;
+            }
+        });
+        if (!defaultFolderID) return false;
+
+        try {
+            const videoInfo = await this.getVideoInfoByBVID(bvid);
+            const aid = videoInfo.aid;
+            const url = `https://api.bilibili.com/x/v3/fav/resource/deal`;
+            const data = `rid=${aid}&csrf=${this.biliJct}&type=2&add_media_ids=${defaultFolderID}&del_media_ids=`;
+            const response = await this.postRequest(url, data, "application/x-www-form-urlencoded");
+            return response.data.code;
+        } catch (error) {
+            console.error("Error starring video: ", error);
+            return false;
+        }
+    },
+}
\ No newline at end of file
diff --git a/src/bilibiliclient/video/video.ts b/src/bilibiliclient/video/video.ts
new file mode 100644
index 0000000..46247c2
--- /dev/null
+++ b/src/bilibiliclient/video/video.ts
@@ -0,0 +1,58 @@
+export const BilibiliClientVideoMethods = {
+    // 获取首页视频推荐
+    async getMainPageRecommendVideos(this: any, fresh_type: number, pagesize: number): Promise<any> {
+        const url = `https://api.bilibili.com/x/web-interface/index/top/rcmd?fresh_type=${fresh_type}&ps=${pagesize}&version=1`;
+        const response = await this.getRequest(url);
+        return response.data.data.item;
+    },
+
+    // 根据视频BV号获取视频详情信息
+    async getVideoInfoByBVID(this: any, bvid: string): Promise<any> {
+        const url = `https://api.bilibili.com/x/web-interface/view?bvid=${bvid}`;
+        const response = await this.getRequest(url);
+        return response.data.data;
+    },
+
+    // 判断视频是否被点赞
+    async isVideoLikedByBVID(this: any, bvid: string): Promise<boolean> {
+        const url = `https://api.bilibili.com/x/web-interface/archive/has/like?bvid=${bvid}`;
+        const response = await this.getRequest(url);
+        return response.data.data;
+    },
+
+    // 判断视频是否被投币
+    async isVideoCoinedByBVID(this: any, bvid: string): Promise<boolean> {
+        const url = `https://api.bilibili.com/x/web-interface/archive/coins?bvid=${bvid}`;
+        const response = await this.getRequest(url);
+        return response.data.data.multiply;
+    },
+
+    // 判断视频是否被收藏
+    async isVideoStaredByBVID(this: any, bvid: string): Promise<boolean> {
+        const url = `https://api.bilibili.com/x/v2/fav/video/favoured?aid=${bvid}`;
+        const response = await this.getRequest(url);
+        return response.data.data.favoured;
+    },
+
+    // 获取视频AI摘要
+    async getVideoAISummaryByBVID(this: any, bvid: string, cid: string, up_mid: string) {
+        const url = "https://api.bilibili.com/x/web-interface/view/conclusion/get";
+        const response = await this.getRequestWbi(url, { bvid, cid, up_mid });
+        return response.data.data.model_result.summary;
+    },
+
+    // 获取根据BVID与CID获取视频MP4流地址
+    async getVideoMP4StreamByBVID(this: any, cid: string, bvid: string, qn: string = "32") {
+        const url = `https://api.bilibili.com/x/player/wbi/playurl`;
+        const response = await this.getRequestWbi(url, {
+            cid,
+            bvid,
+            qn,
+            fnval: "1",
+            platform: "html5"
+        });
+
+        console.log(response);
+        return response.data.data;
+    },
+};
\ No newline at end of file
diff --git a/src/manifest.json b/src/manifest.json
index 9d0a75d..ac65324 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -98,9 +98,6 @@
             "pages/donation": {
                 "component": "donation"
             },
-            "pages/interconnecthelper": {
-                "component": "interconnecthelper"
-            },
             "pages/articleshow": {
                 "component": "articleshow"
             },
diff --git a/src/pages/interconnecthelper/interconnecthelper.ux b/src/pages/interconnecthelper/interconnecthelper.ux
deleted file mode 100644
index 37df03e..0000000
--- a/src/pages/interconnecthelper/interconnecthelper.ux
+++ /dev/null
@@ -1,35 +0,0 @@
-<template>
-  <div class="page">
-    <text>等待连接手机</text>
-  </div>
-</template>
-
-<script>
-export default {
-    private: {
-        checktimer: null
-    },
-    onInit(){
-        this.checktimer = setInterval(() => {
-            if(this.$app.$def.interconnecter.CONNECTION_OPEN){
-                this.$app.$def.jumpcheck.Jump()
-            }
-        }, 1000)
-    },
-    onDestroy(){
-        clearInterval(this.checktimer)
-    }
-}
-</script>
-
-<style>
-.page {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  height: 100%;
-  position: absolute;
-  width: 100%;
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/splash/splash.ux b/src/pages/splash/splash.ux
index 9c42bc2..45f7b69 100644
--- a/src/pages/splash/splash.ux
+++ b/src/pages/splash/splash.ux
@@ -47,21 +47,14 @@ export default {
     setTimeout(() => {
       this.anims.splash_out.start()
       setTimeout(async() => {
-        if((await this.$app.$def.jumpcheck.NetworkCheck()) || this.$app.$def.settings.SETTINGS.enableInterconnectMode){
-          if(this.$app.$def.settings.SETTINGS.enableInterconnectMode){
+        if((await this.$app.$def.jumpcheck.NetworkCheck())){
+          if(!this.$app.$def.settings.SETTINGS.agreedAllAgreements){
             router.replace({
-              uri: "pages/interconnecthelper"
+              uri: "pages/eularead"
             })
           }
           else{
-            if(!this.$app.$def.settings.SETTINGS.agreedAllAgreements){
-              router.replace({
-                uri: "pages/eularead"
-              })
-            }
-            else{
-              this.$app.$def.jumpcheck.Jump()
-            }
+            this.$app.$def.jumpcheck.Jump()
           }
         }
         else{
diff --git a/src/settings.ts b/src/settings.ts
index d5d29fc..1d10d65 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -5,7 +5,6 @@ interface SettingsInterface {
   home_vid_count: number;
   article_split_dom_count: number;
   enableFullAnimation: boolean;
-  enableInterconnectMode: boolean;
 
   // 下面的设置项将不在设置页面中展示
   agreedAllAgreements: boolean;
@@ -18,9 +17,6 @@ export let SETTINGS: SettingsInterface = {
   // 专栏articleshow的每页dom节点裁切数量（单页最大dom数）
   article_split_dom_count: 9999,
   enableFullAnimation: false,
-  // 是否启用interconnect联网模式，需要安卓APP能力支持
-  // 低人一等环9专用
-  enableInterconnectMode: false,
 
   agreedAllAgreements: false // 是否已同意所有协议（用户协议 隐私协议 etc.）
 };