@floating-live/bilibili 0.16.0 → 0.16.2

package/utils/request.d.ts

@@ -1,32 +1,177 @@
-import { FpInfo } from "./fingerprint";
-import { RoomBaseInfo } from "../types";
-export declare function getCookie(headers: Headers): string;
-export declare function parseCookieString(str: string): Record<string, string>;
-/** 生成登录二维码 */
-export declare function qrcodeGenerate(options?: FetchOptions): Promise<{
-    url: any;
-    key: any;
-}>;
-/** 生成登录二维码 */
-export declare function requestFingerSpi(options?: FetchOptions): Promise<Record<"b_3" | "b_4", string>>;
-/** 检测登录二维码 */
-export declare function checkLoginQRcode(key: string, options?: FetchOptions): Promise<[number, string?]>;
-/** 获取并激活buvid的cookie */
-export declare function getActivatedBuvidCookie(fp: FpInfo | null | undefined, options: FetchOptions): Promise<Record<"buvid3" | "_uuid" | "buvid_fp" | "b_lsid", string>>;
-/** 获取指纹相关Cookies */
-export declare function getFingerprintCookie(fp: FpInfo, options: FetchOptions): {
-    _uuid: string;
-    buvid_fp: string;
-    b_lsid: string;
-};
-/** 激活buvid */
-export declare function requestExClimbWuzhi(payload: string, options: FetchOptions): void;
-export declare function getRoomBaseInfo(room_id: number, options?: FetchOptions): Promise<RoomBaseInfo | undefined>;
-export interface FetchOptions {
-    /** 自定义fetch函数(适用于请求中转等情况) */
-    fetch?: (input: string, init?: RequestInit) => Promise<Response>;
-    /** 用户代理字段 */
-    userAgent?: string;
-    /** cookie字段 */
-    cookie?: string;
+import { BilibiliApiClient } from "bilibili-live-danmaku";
+export interface DataXpassportQrcodeGenerate {
+    url: string;
+    qrcode_key: string;
 }
+export interface DataXpassportQrcodePoll {
+    url: string;
+    refresh_token: string;
+    /** 登录时间 */
+    timestamp: number;
+    /** 扫码状态
+     * > 0：扫码登录成功
+     * > 86038：二维码已失效
+     * > 86090：二维码已扫码未确认
+     * > 86101：未扫码
+     */
+    code: number;
+    /** 扫码状态信息 */
+    message: string;
+}
+export interface DataXapiNav {
+    isLogin: boolean;
+    email_verified: number;
+    face: string;
+    face_nft: number;
+    face_nft_type: number;
+    level_info: {
+        current_level: number;
+        current_min: number;
+        current_exp: number;
+        next_exp: string;
+    };
+    mid: number;
+    mobile_verified: number;
+    money: number;
+    moral: number;
+    official: {
+        role: number;
+        title: string;
+        desc: string;
+        type: number;
+    };
+    officialVerify: {
+        type: number;
+        desc: string;
+    };
+    pendant: {
+        pid: number;
+        name: string;
+        image: string;
+        expire: number;
+        image_enhance: string;
+        image_enhance_frame: string;
+        n_pid: number;
+    };
+    scores: number;
+    uname: string;
+    vipDueDate: number;
+    vipStatus: number;
+    vipType: number;
+    vip_pay_type: number;
+    vip_theme_type: number;
+    vip_label: {
+        path: string;
+        text: number;
+        label_theme: string;
+        text_color: string;
+        bg_style: number;
+        bg_color: string;
+        border_color: string;
+        use_img_label: boolean;
+        img_label_uri_hans: string;
+        img_label_uri_hant: string;
+        img_label_uri_hans_static: string;
+        img_label_uri_hant_static: string;
+        label_id: number;
+        label_goto: {
+            mobile: string;
+            pc_web: string;
+        };
+    };
+    vip_avatar_subscript: number;
+    vip_nickname_color: string;
+    vip: {
+        type: number;
+        status: number;
+        due_date: number;
+        vip_pay_type: number;
+        theme_type: number;
+        label: {
+            path: string;
+            text: string;
+            label_theme: string;
+            text_color: string;
+            bg_style: number;
+            bg_color: string;
+            border_color: string;
+            use_img_label: boolean;
+            img_label_uri_hans: string;
+            img_label_uri_hant: string;
+            img_label_uri_hans_static: string;
+            img_label_uri_hant_static: string;
+            label_id: number;
+            label_goto: {
+                mobile: string;
+                pc_web: string;
+            };
+        };
+        avatar_subscript: number;
+        nickname_color: string;
+        role: number;
+        avatar_subscript_url: string;
+        tv_vip_status: number;
+        tv_vip_pay_type: number;
+        tv_due_date: number;
+        avatar_icon: {
+            icon_type: number;
+            icon_resource: {};
+        };
+    };
+    wallet: {
+        mid: number;
+        bcoin_balance: number;
+        coupon_balance: number;
+        coupon_due_time: number;
+    };
+    has_shop: boolean;
+    shop_url: "";
+    answer_status: number;
+    is_senior_member: number;
+    wbi_img: {
+        img_url: string;
+        sub_url: string;
+    };
+    is_jury: boolean;
+    name_render: null;
+}
+export interface DataXpassportCookieInfo {
+    refresh: boolean;
+    timestamp: number;
+}
+export interface DataXpassportCookieRefresh {
+    status: number;
+    message: string;
+    refresh_token: string;
+}
+export declare class BilibiliApiClientEx extends BilibiliApiClient {
+    /** 生成登录二维码 */
+    xpassportQrcodeGenerate(): Promise<import("bilibili-live-danmaku").ResponseDataRoot<DataXpassportQrcodeGenerate>>;
+    /** 轮询登录二维码 */
+    xpassportQrcodePoll(params: {
+        qrcode_key: string;
+    }): Promise<import("bilibili-live-danmaku").ResponseDataRoot<DataXpassportQrcodePoll>>;
+    /** 获取当前登录信息 */
+    xapiNav(): Promise<import("bilibili-live-danmaku").ResponseDataRoot<DataXapiNav>>;
+    xpassportCookieInfo(): Promise<import("bilibili-live-danmaku").ResponseDataRoot<DataXpassportCookieInfo>>;
+    wwwCorrespond(correspondPath: string): Promise<Response>;
+    xpassportCookieRefresh(params: {
+        csrf: string;
+        refresh_csrf: string;
+        source?: string;
+        refresh_token: string;
+    }): Promise<import("bilibili-live-danmaku").ResponseDataRoot<DataXpassportCookieRefresh>>;
+    xpassportConfirmRefresh(params: {
+        csrf: string;
+        refresh_token: string;
+    }): Promise<import("bilibili-live-danmaku").ResponseDataRoot<unknown>>;
+    refreshCookie({ timestamp, refresh_token, }: {
+        timestamp: number;
+        refresh_token: string;
+    }): Promise<{
+        cookie: string;
+        refresh_token: string;
+    }>;
+}
+export declare function correspondRefreshCsrf(html: string): Promise<string>;
+export declare function fetchLiveRoomData(client: BilibiliApiClient, id: number): Promise<import("../index.js").BilibiliRoomData>;

package/utils/request.js

@@ -1,181 +1,96 @@
-import { Cookies, customFetch, requestBuvidCookie, } from "bilibili-live-danmaku";
-import { fpGet, generateFakeFpInfo, getExClimbWuzhiPayload, } from "./fingerprint";
-import { generateRandomPngBase64 } from "./randomImage";
-import { x64hash128 } from "./fp2";
-import { generateUuid } from "./uuid";
-import { generateLsid } from "./lsid";
-export function getCookie(headers) {
-    const cookies = [];
-    headers.forEach((val, key) => {
-        if (key == "set-cookie") {
-            const [c] = val.split(";");
-            cookies.push(c);
-        }
-    });
-    const cookie = cookies.join("; ");
-    return cookie;
-}
-export function parseCookieString(str) {
-    const cookie = {};
-    str.split(";").forEach((item) => {
-        if (!item) {
-            return;
-        }
-        const arr = item.split("=");
-        const key = arr[0]?.trim();
-        const val = arr[1]?.trim();
-        cookie[key] = val;
-    });
-    return cookie;
-}
-/** 生成登录二维码 */
-export async function qrcodeGenerate(options) {
-    const res = await customFetch(options, "https://passport.bilibili.com/x/passport-login/web/qrcode/generate").then((res) => res.json());
-    return {
-        url: res.data.url,
-        key: res.data.qrcode_key,
-    };
-}
-/** 生成登录二维码 */
-export async function requestFingerSpi(options) {
-    const res = await customFetch(options, "https://api.bilibili.com/x/frontend/finger/spi").then((res) => res.json());
-    return res.data;
-}
-/** 检测登录二维码 */
-export async function checkLoginQRcode(key, options) {
-    const res = await customFetch(options, `https://passport.bilibili.com/x/passport-login/web/qrcode/poll?qrcode_key=${key}`);
-    const { code, message } = (await res.json()).data;
-    if (code == 86101) {
-        // 未扫码
-        return [1];
+import { assertRequestOk, BilibiliApiClient, unwrapRequestData, } from "bilibili-live-danmaku";
+import { parseGetInfoByRoom, parseRoomBaseInfo } from "../parser.js";
+import { getCorrespondPath } from "./crypto.js";
+export class BilibiliApiClientEx extends BilibiliApiClient {
+    /** 生成登录二维码 */
+    async xpassportQrcodeGenerate() {
+        const res = await this.request("https://passport.bilibili.com/x/passport-login/web/qrcode/generate");
+        return unwrapRequestData(res);
     }
-    else if (code == 86090) {
-        // 等待确认
-        return [2];
+    /** 轮询登录二维码 */
+    async xpassportQrcodePoll(params) {
+        const url = new URL("https://passport.bilibili.com/x/passport-login/web/qrcode/poll");
+        url.searchParams.set("qrcode_key", params.qrcode_key);
+        const res = await this.request("https://passport.bilibili.com/x/passport-login/web/qrcode/generate");
+        const data = unwrapRequestData(res);
+        this.cookies.setFromHeaders(res.headers);
+        return data;
     }
-    else if (code == 0) {
-        const cookie = getCookie(res.headers);
-        return [0, cookie];
+    /** 获取当前登录信息 */
+    async xapiNav() {
+        const res = await this.request("https://api.bilibili.com/x/web-interface/nav");
+        return unwrapRequestData(res);
     }
-    else if (code == 86038) {
-        // 二维码失效
-        return [-1];
+    async xpassportCookieInfo() {
+        const res = await this.request("https://passport.bilibili.com/x/passport-login/web/cookie/info");
+        return unwrapRequestData(res);
     }
-    else {
-        // 其他错误
-        console.log(`${code} ${message}`);
-        throw message;
-    }
-}
-function wait(t) {
-    return new Promise((res, rej) => {
-        const to = setTimeout(() => {
-            res(undefined);
-            clearTimeout(t);
-        }, t);
-    });
-}
-/** 获取并激活buvid的cookie */
-export async function getActivatedBuvidCookie(fp, options) {
-    const cookies = new Cookies();
-    cookies.append(await requestBuvidCookie({
-        ...options,
-        cookie: cookies.toString(),
-    }));
-    const { b_4 } = await requestFingerSpi({
-        ...options,
-        cookie: cookies.toString(),
-    });
-    cookies.set("buvid4", b_4);
-    if (!fp) {
-        fp = generateFakeFpInfo({
-            canvas: generateRandomPngBase64(),
-            webgl: generateRandomPngBase64(),
-            userAgent: options.userAgent ||
-                "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/135.0.0.0 Safari/537.36 Edg/135.0.0.0",
-            platform: "Win32",
-        });
+    async wwwCorrespond(correspondPath) {
+        const res = await this.request(`https://www.bilibili.com/correspond/1/${correspondPath}`);
+        assertRequestOk(res);
+        return res;
     }
-    cookies.append(getFingerprintCookie(fp, {
-        ...options,
-        cookie: cookies.toString(),
-    }));
-    // await wait(2000);
-    const payload = getExClimbWuzhiPayload(fp, {
-        uuid: cookies.get("_uuid"),
-        timestamp: Date.now().toString(),
-        browser_resolution: fpGet(fp, "availableScreenResolution").join("x"),
-        abtest: `{"b_ut":null,"home_version":"V8","in_new_ab":true,"ab_version":{"for_ai_home_version":"V8","enable_web_push":"DISABLE","ad_style_version":"NEW","enable_feed_channel":"ENABLE","enable_ai_floor_api":"DISABLE"},"ab_split_num":{"for_ai_home_version":54,"enable_web_push":10,"ad_style_version":54,"enable_feed_channel":54,"enable_ai_floor_api":137},"uniq_page_id":"${Math.floor(Math.random() * 2000000000000)}","is_modern":true}`,
-    });
-    requestExClimbWuzhi(JSON.stringify(payload), {
-        ...options,
-        cookie: cookies.toString(),
-    });
-    const cookieRecord = {};
-    cookies.forEach((val, k) => {
-        cookieRecord[k] = val;
-    });
-    return cookieRecord;
-}
-/** 获取指纹相关Cookies */
-export function getFingerprintCookie(fp, options) {
-    const cookies = new Cookies(options.cookie);
-    let _uuid = cookies.get("_uuid");
-    let buvid_fp = cookies.get("buvid_fp");
-    let b_lsid = cookies.get("b_lsid");
-    if (!_uuid) {
-        _uuid = generateUuid();
-        cookies.set("_uuid", _uuid);
+    async xpassportCookieRefresh(params) {
+        const url = new URL("https://passport.bilibili.com/x/passport-login/web/cookie/refresh");
+        url.searchParams.set("csrf", params.csrf);
+        url.searchParams.set("refresh_csrf", params.refresh_csrf);
+        url.searchParams.set("source", params.source || "main_web");
+        url.searchParams.set("refresh_token", params.refresh_token);
+        const res = await this.request(url);
+        const data = unwrapRequestData(res);
+        this.cookies.setFromHeaders(res.headers);
+        return data;
     }
-    if (!buvid_fp) {
-        const fpString = fp
-            .map((e) => {
-            return e.value;
-        })
-            .join("");
-        buvid_fp = x64hash128(fpString, 31);
-        cookies.set("buvid_fp", buvid_fp);
+    async xpassportConfirmRefresh(params) {
+        const url = new URL("https://passport.bilibili.com/x/passport-login/web/confirm/refresh");
+        url.searchParams.set("csrf", params.csrf);
+        url.searchParams.set("refresh_token", params.refresh_token);
+        const res = await this.request(url);
+        return unwrapRequestData(res);
     }
-    if (!b_lsid) {
-        b_lsid = generateLsid();
-        cookies.set("b_lsid", b_lsid);
+    async refreshCookie({ timestamp, refresh_token, }) {
+        // 生成CorrespondPath
+        const correspondPath = await getCorrespondPath(timestamp);
+        // 获取refresh_csrf
+        const correspondRes = await this.wwwCorrespond(correspondPath);
+        const correspondHtmlText = await correspondRes.text();
+        const refresh_csrf = await correspondRefreshCsrf(correspondHtmlText);
+        // 刷新cookie
+        const { refresh_token: new_refresh_token } = (await this.xpassportCookieRefresh({
+            csrf: this.cookies.get("bili_jct"),
+            refresh_csrf,
+            refresh_token,
+        })).data;
+        // 确认更新
+        await this.xpassportConfirmRefresh({
+            csrf: this.cookies.get("bili_jct"),
+            refresh_token,
+        });
+        return { cookie: this.cookie, refresh_token: new_refresh_token };
     }
-    return {
-        _uuid,
-        buvid_fp,
-        b_lsid,
-    };
 }
-/** 激活buvid */
-export function requestExClimbWuzhi(payload, options) {
-    customFetch(options, "https://api.bilibili.com/x/internal/gaia-gateway/ExClimbWuzhi", {
-        method: "POST",
-        body: payload,
-        credentials: "include",
-        headers: {
-            Accept: "*/*",
-            "Accept-Encoding": "gzip, deflate, br, zstd",
-            "Accept-Language": "zh-CN,zh;q=0.9",
-            "Content-Type": "application/json;charset=UTF-8",
-            Origin: "https://www.bilibili.com",
-            priority: "u=1, i",
-            Referer: "https://www.bilibili.com/",
-            "Sec-Ch-Ua": `"Microsoft Edge";v="135", "Not-A.Brand";v="8", "Chromium";v="135"`,
-            "Sec-Ch-Mobile": "?0",
-            "Sec-Ch-Platform": `"Windows"`,
-            "Sec-Ch-Dest": "empty",
-            "Sec-Ch-Mode": "cors",
-            "Sec-Fetch-Site": "same-site",
-        },
-    }).then((res) => res.json());
+const correspondRefreshCsrfRegex = /\<div id="1-name"\>([0-9a-zA-Z]+)\<\/div\>/;
+export async function correspondRefreshCsrf(html) {
+    const csrf = html.match(correspondRefreshCsrfRegex)?.[1];
+    if (!csrf)
+        throw new Error("无法提取refresh_csrf");
+    return csrf;
 }
-export function getRoomBaseInfo(room_id, options) {
-    return customFetch(options, `https://api.live.bilibili.com/xlive/web-room/v1/index/getRoomBaseInfo?room_ids=${room_id}&req_biz=video`)
-        .then((res) => res.json())
-        .then((data) => data.data)
-        .then((data) => {
-        for (const k in data.by_room_ids) {
-            return data.by_room_ids[k];
+export async function fetchLiveRoomData(client, id) {
+    try {
+        const res = await client.xliveGetInfoByRoom({
+            room_id: id,
+        });
+        return parseGetInfoByRoom(res.data);
+    }
+    catch (e) {
+        // fallback
+        const res = await client.xliveGetRoomBaseInfo({
+            room_ids: [id],
+        });
+        for (const r in res.data.by_room_ids) {
+            return parseRoomBaseInfo(res.data.by_room_ids[r]);
         }
-    });
+        throw new Error("房间不存在");
+    }
 }

package/utils/fingerprint.d.ts

@@ -1,98 +0,0 @@
-interface FpInfoMap {
-    userAgent: string;
-    webdriver: boolean;
-    language: string;
-    colorDepth: number;
-    deviceMemory: number;
-    hardwareConcurrency: number;
-    screenResolution: [number, number];
-    availableScreenResolution: [number, number];
-    timezoneOffset: number;
-    timezone: string;
-    sessionStorage: boolean;
-    localStorage: boolean;
-    indexedDb: boolean;
-    addBehavior: boolean;
-    openDatabase: boolean;
-    cpuClass: string;
-    platform: string;
-    plugins: [string, string, [string, string][]][];
-    canvas: [string, string];
-    webgl: string[];
-    webglVendorAndRenderer: string;
-    hasLiedLanguages: boolean;
-    hasLiedResolution: boolean;
-    hasLiedOs: boolean;
-    hasLiedBrowser: boolean;
-    touchSupport: [number, boolean, boolean];
-    fonts: string[];
-    audio: string;
-}
-type FpItem<K extends keyof FpInfoMap> = {
-    key: K;
-    value: FpInfoMap[K];
-};
-export type FpInfo = FpItem<keyof FpInfoMap>[];
-export declare function fpGet<K extends keyof FpInfoMap>(fp: FpInfo, key: K): FpInfoMap[K];
-export declare function getExClimbWuzhiPayload(fp: FpInfo, info: {
-    uuid: string;
-    timestamp: string;
-    browser_resolution: string;
-    abtest: string;
-}): {
-    "3064": number;
-    "5062": string;
-    "03bf": string;
-    "39c8": string;
-    "34f1": string;
-    d402: string;
-    "654a": string;
-    "6e7c": string;
-    "3c43": {
-        "2673": number;
-        "5766": number;
-        "6527": number;
-        "7003": number;
-        "807e": number;
-        b8ce: string;
-        "641c": number;
-        "07a4": string;
-        "1c57": number;
-        "0bd0": number;
-        "748e": [number, number];
-        d61f: [number, number];
-        fc9d: number;
-        "6aa9": string;
-        "75b8": number;
-        "3b21": number;
-        "8a1c": number;
-        d52f: string;
-        adca: string;
-        "80c9": [string, string, [string, string][]][];
-        "13ab": string;
-        bfe9: string;
-        a3c1: string[];
-        "6bc5": string;
-        ed31: number;
-        "72bd": number;
-        "097b": number;
-        "52cd": number[];
-        a658: string[];
-        d02f: string;
-    };
-    "54ef": string;
-    "8b94": string;
-    df35: string;
-    "07a4": string;
-    "5f45": null;
-    db46: number;
-};
-/** 生成虚拟指纹信息 */
-export declare function generateFakeFpInfo(info: {
-    canvas: string;
-    webgl: string;
-    userAgent: string;
-    platform: string;
-}): FpInfo;
-export declare const mockFpInfo: FpInfo;
-export {};