@bililive-tools/douyin-recorder 1.16.0 → 1.17.0

package/README.md

@@ -84,14 +84,14 @@ const { id } = await provider.resolveChannelInfoFromURL(url);
 
 `mobile` 及 `userHTML` 必须传入 `uid` 参数
 
-| 描述             | 备注                                     |
-| ---------------- | ---------------------------------------- |
-| web直播间接口    | 效果不错                                 |
-| mobile直播间接口 | 不易风控，无验证码，海外IP可能无法使用   |
-| 直播间web解析    | 易风控，有验证码，单个接口1M流量         |
-| 用户web解析      | 不易风控，海外IP无法使用，单个接口1M流量 |
-| 负载均衡         | 使用负载均衡算法来分摊防止风控           |
-| 随机             | 从几个接口里挑一个                       |
+| 描述             | 备注                                                   |
+| ---------------- | ------------------------------------------------------ |
+| web直播间接口    | 效果不错                                               |
+| mobile直播间接口 | 不易风控，无验证码，海外IP可能无法使用，不会应用Cookie |
+| 直播间web解析    | 易风控，有验证码，单个接口1M流量                       |
+| 用户web解析      | 不易风控，海外IP无法使用，单个接口1M流量               |
+| 负载均衡         | 使用负载均衡算法来分摊防止风控                         |
+| 随机             | 从几个接口里挑一个                                     |
 
 # 协议
 

package/lib/douyin_api.js

@@ -153,6 +153,9 @@ async function getRoomInfoByUserWeb(secUserId, opts = {}) {
     if (res.data.includes("验证码")) {
         throw new Error("需要验证码，请在浏览器中打开链接获取" + url);
     }
+    if (!res.data.includes("抖音号")) {
+        throw new Error("userHTML页面没有正常加载" + String(res.data));
+    }
     if (!res.data.includes("直播中")) {
         return {
             living: false,
@@ -344,6 +347,7 @@ async function getRoomInfoByWeb(webRoomId, opts = {}) {
 }
 async function getRoomInfoByMobile(secUserId, opts = {}) {
     if (!secUserId) {
+        console.error(opts);
         throw new Error("Mobile API need secUserId, please set uid field");
     }
     if (typeof secUserId === "number") {
@@ -360,7 +364,7 @@ async function getRoomInfoByMobile(secUserId, opts = {}) {
     const res = await requester.get(`https://webcast.amemv.com/webcast/room/reflow/info/`, {
         params,
         headers: {
-            cookie: opts.auth,
+        // cookie: opts.auth,
         },
     });
     // @ts-ignore

package/lib/index.js

@@ -20,6 +20,7 @@ function createRecorder(opts) {
         useServerTimestamp: opts.useServerTimestamp ?? true,
         state: "idle",
         cache: null,
+        appendTimeline: null,
         getChannelURL() {
             return `https://live.douyin.com/${this.channelId}`;
         },
@@ -83,10 +84,13 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
             uid: this.uid,
         });
         this.liveInfo = liveInfo;
-        this.state = "idle";
+        this.emit("stateChange", { state: "idle" });
     }
     catch (error) {
-        this.state = "check-error";
+        this.emit("stateChange", {
+            state: "check-error",
+            msg: `检查失败，` + (error instanceof Error ? error.message : String(error)),
+        });
         throw error;
     }
     if (this.liveInfo.liveId && this.liveInfo.liveId === banLiveId) {
@@ -106,7 +110,6 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
     const strictQuality = utils.shouldUseStrictQuality(qualityRetryLeft, this.qualityRetry, isManualStart);
     let res;
     try {
-        // TODO: 检查mobile接口处理双屏录播流
         res = await getStream({
             channelId: this.channelId,
             quality: this.quality,
@@ -131,11 +134,14 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
     catch (err) {
         if (qualityRetryLeft > 0)
             await this.cache.set("qualityRetryLeft", qualityRetryLeft - 1);
-        this.state = "check-error";
+        this.emit("stateChange", {
+            state: "check-error",
+            msg: `检查失败，` + (err instanceof Error ? err.message : String(err)),
+        });
         throw err;
     }
     const { owner, title, liveStartTime, recordStartTime } = this.liveInfo;
-    this.state = "recording";
+    this.emit("stateChange", { state: "recording" });
     const { currentStream: stream, sources: availableSources, streams: availableStreams } = res;
     this.availableStreams = availableStreams.map((s) => s.desc);
     this.availableSources = availableSources.map((s) => s.name);
@@ -173,6 +179,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         headers: {
             Cookie: this.auth,
         },
+        proxy: this.proxy,
     }, onEnd, async () => {
         const info = await getInfo(this.channelId, {
             auth: this.auth,
@@ -198,8 +205,8 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         });
     };
     downloader.on("videoFileCreated", handleVideoCreated);
-    downloader.on("videoFileCompleted", ({ filename }) => {
-        this.emit("videoFileCompleted", { filename });
+    downloader.on("videoFileCompleted", (data) => {
+        this.emit("videoFileCompleted", data);
     });
     downloader.on("DebugLog", (data) => {
         this.emit("DebugLog", data);
@@ -324,24 +331,26 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         giftMessageCache.set(groupId, { gift, timer });
     });
     client.on("reconnect", (attempts) => {
+        this.appendTimeline({ text: `弹幕连接断开，正在重试: ${attempts}` });
         this.emit("DebugLog", {
             type: "common",
-            text: `douyin ${this.channelId}  danma has reconnect ${attempts}`,
+            text: `douyin ${this.channelId} danma has reconnect ${attempts}`,
         });
     });
     client.on("error", (err) => {
         this.emit("DebugLog", {
             type: "common",
-            text: `douyin ${this.channelId}  danma error: ${String(err)}`,
+            text: `douyin ${this.channelId} danma error: ${String(err)}`,
         });
     });
     client.on("init", (url) => {
         this.emit("DebugLog", {
             type: "common",
-            text: `douyin ${this.channelId}  danma init ${url}`,
+            text: `douyin ${this.channelId} danma init ${url}`,
         });
     });
     client.on("open", () => {
+        this.appendTimeline({ text: `弹幕连接已建立` });
         this.emit("DebugLog", {
             type: "common",
             text: `douyin ${this.channelId} danma open`,
@@ -378,7 +387,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
     const stop = singleton(async (reason) => {
         if (!this.recordHandle)
             return;
-        this.state = "stopping-record";
+        this.emit("stateChange", { state: "stopping-record" });
         try {
             // 清理所有礼物缓存定时器
             for (const [_groupId, cached] of giftMessageCache.entries()) {
@@ -405,7 +414,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         this.emit("RecordStop", { recordHandle: this.recordHandle, reason });
         this.recordHandle = undefined;
         this.liveInfo = undefined;
-        this.state = "idle";
+        this.emit("stateChange", { state: "idle" });
         this.cache.set("qualityRetryLeft", this.qualityRetry);
     });
     this.recordHandle = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bililive-tools/douyin-recorder",
-  "version": "1.16.0",
+  "version": "1.17.0",
   "description": "@bililive-tools douyin recorder implemention",
   "main": "./lib/index.js",
   "type": "module",
@@ -38,8 +38,8 @@
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.1",
     "sm-crypto": "^0.3.13",
-    "douyin-danma-listener": "0.4.1",
-    "@bililive-tools/manager": "^1.16.0"
+    "@bililive-tools/manager": "^1.17.0",
+    "douyin-danma-listener": "0.4.1"
   },
   "devDependencies": {
     "@types/node": "*"