@bililive-tools/douyin-recorder 1.17.0 → 1.17.2

package/lib/douyin_api.d.ts

@@ -18,6 +18,7 @@ export declare function getRoomInfo(webRoomId: string, opts?: {
     uid?: string | number;
 }): Promise<{
     living: boolean;
+    isLiveRadio?: boolean;
     roomId: string;
     owner: string;
     title: string;

package/lib/douyin_api.js

@@ -159,6 +159,7 @@ async function getRoomInfoByUserWeb(secUserId, opts = {}) {
     if (!res.data.includes("直播中")) {
         return {
             living: false,
+            isLiveRadio: false,
             nickname: "",
             sec_uid: "",
             avatar: "",
@@ -177,19 +178,38 @@ async function getRoomInfoByUserWeb(secUserId, opts = {}) {
         .replace(/\\"/g, '"')
         .replace(/\\"/g, '"')
         .replace(/"\$\w+"/g, "null");
-    // const roomRegex = /(\{\\"common\\":.*?)"\]\)/;
-    // const roomMatch = res.data.match(roomRegex);
-    // if (!roomMatch) {
-    //   throw new Error("No room match found in HTML");
-    // }
-    // let roomJsonStr = roomMatch[1];
-    // roomJsonStr = roomJsonStr
-    //   .replace(/\\"/g, '"')
-    //   .replace(/\\"/g, '"')
-    //   .replace(/"\$\w+"/g, "null");
     try {
-        // console.log(userJsonStr);
         const userData = JSON.parse(userJsonStr);
+        const roomData = userData?.user?.user?.roomData;
+        const streamUrl = roomData?.stream_url;
+        let liveCoreSdkData = null;
+        if (streamUrl) {
+            liveCoreSdkData = { live_core_sdk_data: streamUrl.live_core_sdk_data };
+            if (liveCoreSdkData?.live_core_sdk_data?.pull_data) {
+                const flvPullUrl = streamUrl.flv_pull_url;
+                let streamData = {};
+                for (const quality of [{ key: "or4", desc: "原画" }, ...qualityList]) {
+                    const flvUrls = Object.values(flvPullUrl);
+                    if (flvUrls.some((url) => url.includes(`${quality.key}`))) {
+                        const url = flvUrls.find((url) => url.includes(`${quality.key}`));
+                        const convertedQuality = quality.key === "or4" ? "origin" : quality.key;
+                        streamData[convertedQuality] = {
+                            // @ts-ignore
+                            main: {
+                                flv: url,
+                                hls: "",
+                            },
+                        };
+                    }
+                }
+                liveCoreSdkData.live_core_sdk_data.pull_data.stream_data = streamData;
+            }
+            else {
+                liveCoreSdkData = null;
+            }
+        }
+        // console.log("pppp", JSON.stringify(liveCoreSdkData, null, 2));
+        // console.log(JSON.stringify(streamUrl, null, 2));
         // console.log(JSON.stringify(userData, null, 2));
         // const roomData = JSON.parse(roomJsonStr);
         // console.log(roomData);
@@ -197,15 +217,16 @@ async function getRoomInfoByUserWeb(secUserId, opts = {}) {
         // const streamData = data.state.streamStore.streamData;
         return {
             living: userData?.user?.user?.roomData?.status === 2,
+            isLiveRadio: roomData?.live_type_audio ?? false,
             nickname: userData?.user?.user?.nickname ?? "",
             sec_uid: userData?.user?.user?.secUid ?? "",
             avatar: userData?.user?.user?.avatar ?? "",
-            api: "webHTML",
+            api: "userHTML",
             room: {
                 title: "",
                 cover: "",
                 id_str: userData?.user?.user?.roomIdStr,
-                stream_url: null,
+                stream_url: liveCoreSdkData,
             },
         };
     }
@@ -250,8 +271,10 @@ async function getRoomInfoByHtml(webRoomId, opts = {}) {
         const data = JSON.parse(jsonStr);
         const roomInfo = data.state.roomStore.roomInfo;
         const streamData = data.state.streamStore.streamData;
+        const isLiveRadio = roomInfo.enter_mode == 1;
         return {
-            living: roomInfo?.room?.status === 2,
+            living: roomInfo?.room?.status === 2 || isLiveRadio,
+            isLiveRadio: isLiveRadio,
             nickname: roomInfo?.anchor?.nickname ?? "",
             sec_uid: roomInfo?.anchor?.sec_uid ?? "",
             avatar: roomInfo?.anchor?.avatar_thumb?.url_list?.[0] ?? "",
@@ -260,15 +283,17 @@ async function getRoomInfoByHtml(webRoomId, opts = {}) {
                 title: roomInfo?.room?.title ?? "",
                 cover: roomInfo?.room?.cover?.url_list?.[0] ?? "",
                 id_str: roomInfo?.room?.id_str ?? "",
-                stream_url: {
-                    pull_datas: roomInfo?.room?.stream_url?.pull_datas,
-                    live_core_sdk_data: {
-                        pull_data: {
-                            options: { qualities: streamData.H264_streamData?.options?.qualities ?? [] },
-                            stream_data: streamData.H264_streamData?.stream ?? {},
+                stream_url: roomInfo?.room?.stream_url?.pull_datas
+                    ? {
+                        pull_datas: roomInfo?.room?.stream_url?.pull_datas,
+                        live_core_sdk_data: {
+                            pull_data: {
+                                options: { qualities: streamData.H264_streamData?.options?.qualities ?? [] },
+                                stream_data: streamData.H264_streamData?.stream ?? {},
+                            },
                         },
-                    },
-                },
+                    }
+                    : null,
             },
         };
     }
@@ -316,6 +341,7 @@ async function getRoomInfoByWeb(webRoomId, opts = {}) {
         // 直播已结束
         return {
             living: false,
+            isLiveRadio: false,
             nickname: "",
             sec_uid: "",
             avatar: "",
@@ -332,7 +358,8 @@ async function getRoomInfoByWeb(webRoomId, opts = {}) {
     const data = res.data.data;
     const room = data?.data?.[0];
     return {
-        living: data?.room_status === 0,
+        living: data?.room_status === 0 || data?.room_status === 1,
+        isLiveRadio: data?.room_status === 1,
         nickname: data?.user?.nickname ?? "",
         avatar: data?.user?.avatar_thumb?.url_list?.[0] ?? "",
         sec_uid: data?.user?.sec_uid ?? "",
@@ -371,6 +398,7 @@ async function getRoomInfoByMobile(secUserId, opts = {}) {
     const room = res?.data?.data?.room;
     return {
         living: room?.status === 2,
+        isLiveRadio: room?.live_type_audio ?? false,
         nickname: room?.owner?.nickname,
         sec_uid: room?.owner?.sec_uid,
         avatar: room?.owner?.avatar_thumb?.url_list?.[0],
@@ -408,11 +436,12 @@ export async function getRoomInfo(webRoomId, opts = {}) {
     else {
         data = await getRoomInfoByWeb(webRoomId, opts);
     }
-    // console.log(JSON.stringify(data, null, 2));
     const room = data.room;
-    if (api === "userHTML") {
+    assert(room, `No room data, id ${webRoomId}`);
+    if (!room?.stream_url) {
         return {
             living: data.living,
+            isLiveRadio: data.isLiveRadio,
             roomId: webRoomId,
             owner: data.nickname,
             title: room?.title ?? data.nickname,
@@ -425,22 +454,6 @@ export async function getRoomInfo(webRoomId, opts = {}) {
             api: data.api,
         };
     }
-    assert(room, `No room data, id ${webRoomId}`);
-    if (room?.stream_url == null) {
-        return {
-            living: false,
-            roomId: webRoomId,
-            owner: data.nickname,
-            title: room?.title ?? data.nickname,
-            streams: [],
-            sources: [],
-            avatar: data.avatar,
-            cover: room.cover,
-            liveId: room.id_str,
-            uid: data.sec_uid,
-            api: data.api,
-        };
-    }
     let qualities = [];
     let stream_data = "";
     if (opts.doubleScreen && !isEmpty(room.stream_url.pull_datas)) {
@@ -509,6 +522,7 @@ export async function getRoomInfo(webRoomId, opts = {}) {
     // console.log(JSON.stringify(sources, null, 2), qualities);
     return {
         living: data.living,
+        isLiveRadio: data.isLiveRadio,
         roomId: webRoomId,
         owner: data.nickname,
         title: room.title,

package/lib/index.js

@@ -77,6 +77,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         return this.recordHandle;
     }
     // 获取直播间信息
+    let isLiveRadio = false;
     try {
         const liveInfo = await getInfo(this.channelId, {
             auth: this.auth,
@@ -84,6 +85,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
             uid: this.uid,
         });
         this.liveInfo = liveInfo;
+        isLiveRadio = liveInfo.isLiveRadio;
         this.emit("stateChange", { state: "idle" });
     }
     catch (error) {
@@ -121,6 +123,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
             doubleScreen: this.doubleScreen,
             api: this.api,
             uid: this.uid,
+            isLiveRadio: isLiveRadio,
         });
         this.liveInfo.owner = res.owner;
         this.liveInfo.title = res.title;

package/lib/stream.d.ts

@@ -6,6 +6,7 @@ export declare function getInfo(channelId: string, opts?: {
     uid?: string | number;
 }): Promise<{
     living: boolean;
+    isLiveRadio: boolean;
     owner: string;
     title: string;
     roomId: string;
@@ -26,6 +27,7 @@ export declare function getStream(opts: Pick<Recorder, "channelId" | "quality" |
     doubleScreen?: boolean;
     api?: APIType;
     uid?: string | number;
+    isLiveRadio?: boolean;
 }): Promise<{
     currentStream: {
         name: string;
@@ -34,6 +36,7 @@ export declare function getStream(opts: Pick<Recorder, "channelId" | "quality" |
         onlyAudio: boolean;
     };
     living: boolean;
+    isLiveRadio?: boolean;
     roomId: string;
     owner: string;
     title: string;

package/lib/stream.js

@@ -15,6 +15,7 @@ export async function getInfo(channelId, opts) {
     const startTime = new Date();
     return {
         living: info.living,
+        isLiveRadio: info.isLiveRadio,
         owner: info.owner,
         title: info.title,
         roomId: info.roomId,
@@ -30,12 +31,20 @@ export async function getInfo(channelId, opts) {
 }
 export async function getStream(opts) {
     let api = opts.api ?? "web";
-    if (api === "userHTML") {
+    if (api === "userHTML" || api === "webHTML") {
         // userHTML 接口只能用于状态检测
         api = "web";
     }
     else if (api === "random") {
-        api = selectRandomAPI(["userHTML"]);
+        api = selectRandomAPI(["userHTML", "webHTML"]);
+    }
+    if (opts.isLiveRadio) {
+        // 直播电台可能需要特殊处理，优先使用 mobile 接口，某些直播间userHTML不会有数据,mobile可能更加合适
+        api = "mobile";
+        // 如果用户指定了userHTML接口，那么优先使用userHTML接口获取流信息
+        if (opts.api === "userHTML") {
+            api = "userHTML";
+        }
     }
     const info = await getRoomInfo(opts.channelId, {
         doubleScreen: opts.doubleScreen ?? true,

package/lib/types.d.ts

@@ -24,6 +24,7 @@ export interface RoomInfo {
     sec_uid: string;
     avatar: string;
     api: RealAPIType;
+    isLiveRadio: boolean;
     room: {
         title: string;
         cover: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bililive-tools/douyin-recorder",
-  "version": "1.17.0",
+  "version": "1.17.2",
   "description": "@bililive-tools douyin recorder implemention",
   "main": "./lib/index.js",
   "type": "module",