@bililive-tools/douyin-recorder 1.12.3 → 1.16.1

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

@@ -2,7 +2,7 @@ import path from "node:path";
 import mitt from "mitt";
 import { defaultFromJSON, defaultToJSON, genRecorderUUID, genRecordUUID, utils, createDownloader, } from "@bililive-tools/manager";
 import { getInfo, getStream } from "./stream.js";
-import { ensureFolderExist, singleton } from "./utils.js";
+import { singleton } from "./utils.js";
 import { resolveShortURL, parseUser } from "./douyin_api.js";
 import DouYinDanmaClient from "douyin-danma-listener";
 function createRecorder(opts) {
@@ -164,6 +164,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
             startTime: opts.startTime,
             liveStartTime: liveStartTime,
             recordStartTime,
+            extraMs: opts.extraMs,
         }),
         disableDanma: this.disableProvideCommentsWhenRecording,
         videoFormat: this.videoFormat ?? "auto",
@@ -178,20 +179,6 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         });
         return info;
     });
-    const savePath = getSavePath({
-        owner,
-        title,
-        startTime: Date.now(),
-        liveStartTime,
-        recordStartTime,
-    });
-    try {
-        ensureFolderExist(savePath);
-    }
-    catch (err) {
-        this.state = "idle";
-        throw err;
-    }
     const handleVideoCreated = async ({ filename, title, cover, rawFilename }) => {
         this.emit("videoFileCreated", { filename, cover, rawFilename });
         if (title && this?.liveInfo) {
@@ -211,8 +198,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);
@@ -428,7 +415,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         recorderType: downloader.type,
         url: stream.url,
         downloaderArgs,
-        savePath: savePath,
+        savePath: downloader.videoFilePath,
         stop,
         cut,
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bililive-tools/douyin-recorder",
-  "version": "1.12.3",
+  "version": "1.16.1",
   "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",
-    "@bililive-tools/manager": "^1.14.1",
-    "douyin-danma-listener": "0.4.1"
+    "douyin-danma-listener": "0.4.1",
+    "@bililive-tools/manager": "^1.16.1"
   },
   "devDependencies": {
     "@types/node": "*"