@bililive-tools/douyu-recorder 1.1.0 → 1.2.0

package/README.md

@@ -36,6 +36,7 @@ interface Options {
   channelId: string; // 直播间ID，具体解析见文档，也可自行解析
   quality: number; // 见画质参数
   qualityRetry?: number; // 画质匹配重试次数, -1为强制匹配画质，0为自动配置，正整数为最大匹配次数
+  source?: string; // 指定 cdn，见文档，不传为自动
   streamPriorities: []; // 废弃
   sourcePriorities: []; // 废弃
   disableAutoCheck?: boolean; // 为 true 时 manager 将跳过自动检查
@@ -45,6 +46,7 @@ interface Options {
   saveGiftDanma?: boolean; // 保存礼物弹幕
   saveSCDanma?: boolean; // 保存高能弹幕
   saveCover?: boolean; // 保存封面
+  videoFormat?: "auto"; // 视频格式： "auto", "ts", "mkv" ，auto模式下, 分段使用 "ts"，不分段使用 "mp4"
 }
 ```
 
@@ -71,6 +73,20 @@ const url = "https://www.douyu.com/2140934";
 const { id } = await provider.resolveChannelInfoFromURL(url);
 ```
 
+## cdn
+
+如果有更多线路或者错误，请发issue
+
+| 线路   | 值        |
+| ------ | --------- |
+| 自动   | auto      |
+| 线路1  | scdnctshh |
+| 线路4  | tctc-h5   |
+| 线路5  | tct-h5    |
+| 线路6  | ali-h5    |
+| 线路7  | hw-h5     |
+| 线路13 | hs-h5     |
+
 # 协议
 
 与原项目保存一致为 LGPL

package/lib/dy_client/index.js

@@ -9,7 +9,7 @@ import { BufferCoder } from "./buffer_coder.js";
 import { STT } from "./stt.js";
 export function createDYClient(channelId, opts = {}) {
     let ws = null;
-    let maxRetry = 5;
+    let maxRetry = 10;
     let coder = new BufferCoder();
     let heartbeatTimer = null;
     const send = (message) => ws?.send(coder.encode(STT.serialize(message)));

package/lib/index.js

@@ -108,7 +108,6 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
     const liveInfo = await getInfo(this.channelId);
     const { living, owner, title, liveId } = liveInfo;
     this.liveInfo = liveInfo;
-    this.emit("LiveStart", { liveId });
     if (liveInfo.liveId === banLiveId) {
         this.tempStopIntervalCheck = true;
     }
@@ -138,6 +137,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
             return null;
         }
     }
+    this.emit("LiveStart", { liveId });
     let res;
     // TODO: 先不做什么错误处理，就简单包一下预期上会有错误的地方
     try {
@@ -154,6 +154,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         res = await getStream({
             channelId: this.channelId,
             quality: this.quality,
+            source: this.source,
             strictQuality,
         });
     }
@@ -186,6 +187,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         segment: this.segment ?? 0,
         getSavePath: (opts) => getSavePath({ owner, title, startTime: opts.startTime }),
         disableDanma: this.disableProvideCommentsWhenRecording,
+        videoFormat: this.videoFormat ?? "auto",
     }, onEnd);
     const savePath = getSavePath({
         owner,

package/lib/stream.d.ts

@@ -11,6 +11,7 @@ export declare function getInfo(channelId: string): Promise<{
 export declare function getStream(opts: Pick<Recorder, "channelId" | "quality"> & {
     rejectCache?: boolean;
     strictQuality?: boolean;
+    source?: string;
 }): Promise<{
     living: true;
     sources: import("./dy_api.js").SourceProfile[];

package/lib/stream.js

@@ -47,6 +47,7 @@ export async function getStream(opts) {
     let liveInfo = await getLiveInfo({
         channelId: opts.channelId,
         rate: qn,
+        cdn: opts.source === "auto" ? undefined : opts.source,
     });
     if (!liveInfo.living)
         throw new Error("It must be called getStream when living");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bililive-tools/douyu-recorder",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "bililive-tools douyu recorder implemention",
   "main": "./lib/index.js",
   "type": "module",
@@ -41,7 +41,7 @@
     "lodash-es": "^4.17.21",
     "axios": "^1.7.8",
     "douyu-api": "^0.1.0",
-    "@bililive-tools/manager": "^1.1.0"
+    "@bililive-tools/manager": "^1.2.0"
   },
   "devDependencies": {
     "@types/ws": "^8.5.13"