@bililive-tools/douyin-recorder 1.17.3 → 1.18.0

package/lib/index.js

@@ -18,6 +18,7 @@ function createRecorder(opts) {
         availableSources: [],
         qualityRetry: opts.qualityRetry ?? 0,
         useServerTimestamp: opts.useServerTimestamp ?? true,
+        cookieMode: opts.cookieMode ?? "all",
         state: "idle",
         cache: null,
         appendTimeline: null,
@@ -31,7 +32,7 @@ function createRecorder(opts) {
         async getLiveInfo() {
             const channelId = this.channelId;
             const info = await getInfo(channelId, {
-                auth: this.auth,
+                auth: this.cookieMode === "danma" ? undefined : this.auth,
                 uid: this.uid,
             });
             return {
@@ -46,7 +47,7 @@ function createRecorder(opts) {
                 streamPriorities: this.streamPriorities,
                 sourcePriorities: this.sourcePriorities,
                 strictQuality: false,
-                auth: this.auth,
+                auth: this.cookieMode === "danma" ? undefined : this.auth,
                 formatPriorities: this.formatPriorities,
                 doubleScreen: this.doubleScreen,
                 api: this.api,
@@ -68,11 +69,11 @@ function createRecorder(opts) {
 }
 const ffmpegOutputOptions = [];
 const ffmpegInputOptions = ["-rw_timeout", "10000000", "-timeout", "10000000"];
-const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isManualStart, }) {
+const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isManualStart, streamRetryHint, }) {
     // 如果已经在录制中,只在需要检查标题关键词时才获取最新信息
     if (this.recordHandle != null) {
         const shouldStop = await utils.checkTitleKeywordsWhileRecording(this, isManualStart, (channelId) => getInfo(channelId, {
-            auth: this.auth,
+            auth: this.cookieMode === "danma" ? undefined : this.auth,
             api: this.api,
             uid: this.uid,
         }));
@@ -86,7 +87,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
     let isLiveRadio = false;
     try {
         const liveInfo = await getInfo(this.channelId, {
-            auth: this.auth,
+            auth: this.cookieMode === "danma" ? undefined : this.auth,
             api: this.api,
             uid: this.uid,
         });
@@ -124,12 +125,14 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
             streamPriorities: this.streamPriorities,
             sourcePriorities: this.sourcePriorities,
             strictQuality: strictQuality,
-            auth: this.auth,
+            auth: this.cookieMode === "danma" ? undefined : this.auth,
             formatPriorities: this.formatPriorities,
             doubleScreen: this.doubleScreen,
             api: this.api,
             uid: this.uid,
             isLiveRadio: isLiveRadio,
+            preferAlternativeStream: streamRetryHint?.preferAlternativeStream === true &&
+                streamRetryHint.liveId === this.liveInfo.liveId,
         });
         this.liveInfo.owner = res.owner;
         this.liveInfo.title = res.title;
@@ -186,12 +189,14 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         debugLevel: this.debugLevel ?? "none",
         onlyAudio: stream.onlyAudio,
         headers: {
-            Cookie: this.auth,
+            Origin: "https://live.douyin.com",
+            Referer: "https://live.douyin.com/",
+            // Cookie: this.auth,
         },
         proxy: this.proxy,
     }, onEnd, async () => {
         const info = await getInfo(this.channelId, {
-            auth: this.auth,
+            auth: this.cookieMode === "danma" ? undefined : this.auth,
         });
         return info;
     });
@@ -231,8 +236,9 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
     // 礼物延迟处理时间(毫秒),可根据实际情况调整
     const GIFT_DELAY = 5000;
     const client = new DouYinDanmaClient(this?.liveInfo?.liveId, {
-        cookie: this.auth,
+        cookie: this.cookieMode === "stream" ? undefined : this.auth,
     });
+    console.log("DouYinDanmaClient", this?.liveInfo?.liveId, this.cookieMode, this.auth);
     client.on("chat", (msg) => {
         const extraDataController = downloader.getExtraDataController();
         if (!extraDataController)

package/lib/stream.d.ts

@@ -28,13 +28,9 @@ export declare function getStream(opts: Pick<Recorder, "channelId" | "quality" |
     api?: APIType;
     uid?: string | number;
     isLiveRadio?: boolean;
+    /** 优先尝试用户格式优先级中的备用格式 */
+    preferAlternativeStream?: boolean;
 }): Promise<{
-    currentStream: {
-        name: string;
-        source: string;
-        url: string;
-        onlyAudio: boolean;
-    };
     living: boolean;
     isLiveRadio?: boolean;
     roomId: string;
@@ -47,4 +43,11 @@ export declare function getStream(opts: Pick<Recorder, "channelId" | "quality" |
     liveId: string;
     uid: string;
     api: RealAPIType;
+    currentStream: {
+        name: string;
+        source: string;
+        url: string;
+        onlyAudio: boolean;
+    };
 }>;
+export declare function getFormatPriorities(formatPriorities: Array<"flv" | "hls">, preferAlternativeStream?: boolean): Array<"flv" | "hls">;

package/lib/stream.js

@@ -57,7 +57,7 @@ export async function getStream(opts) {
     }
     // 抖音为自动cdn，所以指定选择第一个
     const sources = info.sources[0];
-    const formatPriorities = opts.formatPriorities || ["flv", "hls"];
+    const formatPriorities = getFormatPriorities(opts.formatPriorities || ["flv", "hls"], opts.preferAlternativeStream);
     // 查找指定质量的流
     let targetStream = sources.streams.find((s) => s.quality === opts.quality);
     let qualityName = targetStream?.name ?? "未知";
@@ -104,3 +104,9 @@ export async function getStream(opts) {
         },
     };
 }
+export function getFormatPriorities(formatPriorities, preferAlternativeStream = false) {
+    if (!preferAlternativeStream || formatPriorities.length < 2) {
+        return [...formatPriorities];
+    }
+    return [formatPriorities[1], formatPriorities[0]];
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bililive-tools/douyin-recorder",
-  "version": "1.17.3",
+  "version": "1.18.0",
   "description": "@bililive-tools douyin recorder implemention",
   "main": "./lib/index.js",
   "type": "module",
@@ -30,7 +30,11 @@
     "录制",
     "抖音"
   ],
-  "repository": "https://github.com/renmu123/biliLive-tools/tree/master/packages/DouYinRecorder",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/renmu123/biliLive-tools",
+    "directory": "packages/DouYinRecorder"
+  },
   "author": "WhiteMind",
   "license": "LGPL",
   "dependencies": {
@@ -38,8 +42,8 @@
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.1",
     "sm-crypto": "^0.3.13",
-    "@bililive-tools/manager": "^1.17.1",
-    "douyin-danma-listener": "0.4.1"
+    "@bililive-tools/manager": "^1.18.0",
+    "douyin-danma-listener": "0.4.2"
   },
   "devDependencies": {
     "@types/node": "*"