@bililive-tools/douyin-recorder 1.3.0 → 1.5.0

package/README.md

@@ -43,6 +43,8 @@ interface Options {
   saveGiftDanma?: boolean; // 保存礼物弹幕
   saveCover?: boolean; // 保存封面
   videoFormat?: "auto"; // 视频格式： "auto", "ts", "mkv" ，auto模式下, 分段使用 "ts"，不分段使用 "mp4"
+  useServerTimestamp?: boolean; // 控制弹幕是否使用服务端时间戳，默认为true
+  doubleScreen?: boolean; // 是否使用双屏直播流，开启后如果是双屏直播，那么就使用拼接的流，默认为true
   auth?: string; // 传递cookie，用于录制会员视频
 }
 ```

package/lib/douyin_api.d.ts

@@ -5,7 +5,11 @@
  */
 export declare function resolveShortURL(shortURL: string): Promise<string>;
 export declare const getCookie: () => Promise<string>;
-export declare function getRoomInfo(webRoomId: string, retryOnSpecialCode?: boolean, auth?: string): Promise<{
+export declare function getRoomInfo(webRoomId: string, opts?: {
+    retryOnSpecialCode?: boolean;
+    auth?: string;
+    doubleScreen?: boolean;
+}): Promise<{
     living: boolean;
     roomId: string;
     owner: string;

package/lib/douyin_api.js

@@ -1,4 +1,5 @@
 import axios from "axios";
+import { isEmpty } from "lodash-es";
 import { assert } from "./utils.js";
 const requester = axios.create({
     timeout: 10e3,
@@ -76,10 +77,10 @@ export const getCookie = async () => {
     };
     return cookies;
 };
-export async function getRoomInfo(webRoomId, retryOnSpecialCode = true, auth) {
+export async function getRoomInfo(webRoomId, opts = {}) {
     let cookies = undefined;
-    if (auth) {
-        cookies = auth;
+    if (opts.auth) {
+        cookies = opts.auth;
     }
     else {
         // 抖音的 'webcast/room/web/enter' api 会需要 ttwid 的 cookie，这个 cookie 是由这个请求的响应头设置的，
@@ -110,7 +111,7 @@ export async function getRoomInfo(webRoomId, retryOnSpecialCode = true, auth) {
         },
     });
     // 无 cookie 时 code 为 10037
-    if (res.data.status_code === 10037 && retryOnSpecialCode) {
+    if (res.data.status_code === 10037 && opts.retryOnSpecialCode) {
         // resp 自动设置 cookie
         // const cookieRes = await requester.get("https://live.douyin.com/favicon.ico");
         // const cookies = cookieRes.headers["set-cookie"]
@@ -119,7 +120,10 @@ export async function getRoomInfo(webRoomId, retryOnSpecialCode = true, auth) {
         //   })
         //   .join("; ");
         // console.log("cookies", cookies);
-        return getRoomInfo(webRoomId, false);
+        return getRoomInfo(webRoomId, {
+            retryOnSpecialCode: false,
+            doubleScreen: opts.doubleScreen,
+        });
     }
     assert(res.data.status_code === 0, `Unexpected resp, code ${res.data.status_code}, msg ${JSON.stringify(res.data.data)}, id ${webRoomId}`);
     const data = res.data.data;
@@ -138,7 +142,22 @@ export async function getRoomInfo(webRoomId, retryOnSpecialCode = true, auth) {
             liveId: room.id_str,
         };
     }
-    const { options: { qualities }, stream_data, } = room.stream_url.live_core_sdk_data.pull_data;
+    let qualities = [];
+    let stream_data = "";
+    if (opts.doubleScreen && !isEmpty(room.stream_url.pull_datas)) {
+        const pull_data = Object.values(room.stream_url.pull_datas)[0] ?? {
+            options: {
+                qualities: [],
+            },
+            stream_data: "",
+        };
+        qualities = pull_data.options.qualities;
+        stream_data = pull_data.stream_data;
+    }
+    if (!stream_data) {
+        qualities = room.stream_url.live_core_sdk_data.pull_data.options.qualities;
+        stream_data = room.stream_url.live_core_sdk_data.pull_data.stream_data;
+    }
     const streamData = JSON.parse(stream_data).data;
     const streams = qualities.map((info) => ({
         desc: info.name,

package/lib/index.js

@@ -18,6 +18,7 @@ function createRecorder(opts) {
         availableSources: [],
         qualityMaxRetry: opts.qualityRetry ?? 0,
         qualityRetry: opts.qualityRetry ?? 0,
+        useServerTimestamp: opts.useServerTimestamp ?? true,
         state: "idle",
         getChannelURL() {
             return `https://live.douyin.com/${this.channelId}`;
@@ -109,6 +110,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
             strictQuality: strictQuality,
             cookie: this.auth,
             formatPriorities: this.formatPriorities,
+            doubleScreen: this.doubleScreen,
         });
     }
     catch (err) {
@@ -178,7 +180,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
             room_id: this.channelId,
             platform: provider?.id,
             // liveStartTimestamp: liveInfo.startTime?.getTime(),
-            recordStopTimestamp: Date.now(),
+            // recordStopTimestamp: Date.now(),
             title: title,
             user_name: owner,
         });
@@ -205,7 +207,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
             return;
         const comment = {
             type: "comment",
-            timestamp: Number(msg.eventTime) * 1000,
+            timestamp: this.useServerTimestamp ? Number(msg.eventTime) * 1000 : Date.now(),
             text: msg.content,
             color: "#ffffff",
             sender: {
@@ -226,11 +228,12 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
             return;
         if (this.saveGiftDanma === false)
             return;
+        const serverTimestamp = Number(msg.common.createTime) > 9999999999
+            ? Number(msg.common.createTime)
+            : Number(msg.common.createTime) * 1000;
         const gift = {
             type: "give_gift",
-            timestamp: Number(msg.common.createTime) > 9999999999
-                ? Number(msg.common.createTime)
-                : Number(msg.common.createTime) * 1000,
+            timestamp: this.useServerTimestamp ? serverTimestamp : Date.now(),
             name: msg.gift.name,
             price: 1,
             count: Number(msg.totalCount ?? 1),

package/lib/stream.d.ts

@@ -14,6 +14,7 @@ export declare function getStream(opts: Pick<Recorder, "channelId" | "quality" |
     strictQuality?: boolean;
     cookie?: string;
     formatPriorities?: Array<"flv" | "hls">;
+    doubleScreen?: boolean;
 }): Promise<{
     currentStream: {
         name: string;

package/lib/stream.js

@@ -13,7 +13,11 @@ export async function getInfo(channelId) {
     };
 }
 export async function getStream(opts) {
-    const info = await getRoomInfo(opts.channelId, true, opts.cookie);
+    const info = await getRoomInfo(opts.channelId, {
+        retryOnSpecialCode: true,
+        doubleScreen: opts.doubleScreen ?? true,
+        auth: opts.cookie,
+    });
     if (!info.living) {
         throw new Error("It must be called getStream when living");
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bililive-tools/douyin-recorder",
-  "version": "1.3.0",
+  "version": "1.5.0",
   "description": "@bililive-tools douyin recorder implemention",
   "main": "./lib/index.js",
   "type": "module",
@@ -37,7 +37,7 @@
     "axios": "^1.7.8",
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.1",
-    "@bililive-tools/manager": "^1.3.0",
+    "@bililive-tools/manager": "^1.4.0",
     "douyin-danma-listener": "0.2.0"
   },
   "devDependencies": {