@bililive-tools/manager 1.12.0 → 1.13.0

package/README.md

@@ -107,6 +107,7 @@ setBililivePath("BililiveRecorder.Cli.exe");
 | {hour}            | 时                                         |
 | {min}             | 分                                         |
 | {sec}             | 秒                                         |
+| {ms}              | 毫秒                                       |
 | {startTime}       | 分段开始时间，Date对象                     |
 | {recordStartTime} | 录制开始时间，Date对象                     |
 | {liveStartTime}   | 直播开始时间，Date对象，抖音同录制开始时间 |

package/lib/downloader/BililiveDownloader.d.ts

@@ -12,6 +12,7 @@ declare class BililiveRecorderCommand extends EventEmitter {
     inputOptions(...options: string[]): BililiveRecorderCommand;
     _getArguments(): string[];
     run(): void;
+    stop(): void;
     kill(): void;
     cut(): void;
 }
@@ -22,6 +23,7 @@ export declare class BililiveDownloader extends EventEmitter implements IDownloa
     type: "bililive";
     private command;
     private streamManager;
+    private timeoutChecker;
     readonly hasSegment: boolean;
     readonly getSavePath: (data: {
         startTime: number;

package/lib/downloader/BililiveDownloader.js

@@ -1,7 +1,7 @@
 import EventEmitter from "node:events";
 import { spawn } from "node:child_process";
 import { DEFAULT_USER_AGENT } from "./index.js";
-import { StreamManager, getBililivePath } from "../index.js";
+import { StreamManager, getBililivePath, utils } from "../index.js";
 import { byte2MB } from "../utils.js";
 // Bililive command builder class similar to ffmpeg
 class BililiveRecorderCommand extends EventEmitter {
@@ -75,10 +75,14 @@ class BililiveRecorderCommand extends EventEmitter {
             }
         });
     }
-    kill() {
+    stop() {
         if (this.process) {
             this.process.stdin?.write("q\n");
-            // this.process.kill("SIGTERM");
+        }
+    }
+    kill() {
+        if (this.process) {
+            this.process.kill("SIGINT");
         }
     }
     cut() {
@@ -97,6 +101,7 @@ export class BililiveDownloader extends EventEmitter {
     type = "bililive";
     command;
     streamManager;
+    timeoutChecker;
     hasSegment;
     getSavePath;
     segment;
@@ -118,6 +123,11 @@ export class BililiveDownloader extends EventEmitter {
         this.streamManager = new StreamManager(opts.getSavePath, hasSegment, this.disableDanma, "bililive", videoFormat, {
             onUpdateLiveInfo: this.onUpdateLiveInfo,
         });
+        this.timeoutChecker = utils.createTimeoutChecker(() => {
+            this.emit("DebugLog", { type: "error", text: "bililive timeout, killing process" });
+            this.command?.kill();
+            this.onEnd("bililive timeout");
+        }, 20 * 1000, false);
         this.getSavePath = opts.getSavePath;
         this.inputOptions = [];
         this.url = opts.url;
@@ -138,6 +148,7 @@ export class BililiveDownloader extends EventEmitter {
         });
     }
     createCommand() {
+        this.timeoutChecker?.start();
         const inputOptions = [...this.inputOptions, "--disable-log-file", "true"];
         if (this.debugLevel === "verbose") {
             inputOptions.push("-l", "Debug");
@@ -164,6 +175,7 @@ export class BililiveDownloader extends EventEmitter {
             .on("error", this.onEnd)
             .on("end", () => this.onEnd("finished"))
             .on("stderr", async (stderrLine) => {
+            this.timeoutChecker?.update();
             this.emit("DebugLog", { type: "ffmpeg", text: stderrLine });
             await this.streamManager.handleVideoStarted(stderrLine);
             const info = this.formatLine(stderrLine);
@@ -193,9 +205,9 @@ export class BililiveDownloader extends EventEmitter {
         return this.command._getArguments();
     }
     async stop() {
+        this.timeoutChecker?.stop();
         try {
-            // 直接发送SIGINT信号，会导致数据丢失
-            this.command.kill();
+            this.command.stop();
             await this.streamManager.handleVideoCompleted();
         }
         catch (err) {

package/lib/downloader/FFmpegDownloader.js

@@ -1,6 +1,6 @@
 import EventEmitter from "node:events";
 import { createFFMPEGBuilder, StreamManager, utils } from "../index.js";
-import { createInvalidStreamChecker, assert } from "../utils.js";
+import { createFFmpegInvalidStreamChecker, assert } from "../utils.js";
 import { DEFAULT_USER_AGENT } from "./index.js";
 export class FFmpegDownloader extends EventEmitter {
     onEnd;
@@ -77,7 +77,7 @@ export class FFmpegDownloader extends EventEmitter {
     createCommand() {
         this.timeoutChecker?.start();
         const invalidCount = this.isHls ? 35 : 18;
-        const isInvalidStream = createInvalidStreamChecker(invalidCount);
+        const isInvalidStream = createFFmpegInvalidStreamChecker(invalidCount);
         const inputOptions = [
             ...this.inputOptions,
             "-user_agent",

package/lib/manager.d.ts

@@ -78,7 +78,9 @@ export interface RecorderManager<ME extends UnknownObject, P extends RecorderPro
     addRecorder: (this: RecorderManager<ME, P, PE, E>, opts: RecorderCreateOpts<E>) => Recorder<E>;
     removeRecorder: (this: RecorderManager<ME, P, PE, E>, recorder: Recorder<E>) => void;
     getRecorder: (this: RecorderManager<ME, P, PE, E>, id: string) => Recorder<E> | null;
-    startRecord: (this: RecorderManager<ME, P, PE, E>, id: string) => Promise<Recorder<E> | undefined>;
+    startRecord: (this: RecorderManager<ME, P, PE, E>, id: string, opts?: {
+        ignoreDataLimit?: boolean;
+    }) => Promise<Recorder<E> | undefined>;
     stopRecord: (this: RecorderManager<ME, P, PE, E>, id: string) => Promise<Recorder<E> | undefined>;
     cutRecord: (this: RecorderManager<ME, P, PE, E>, id: string) => Promise<Recorder<E> | undefined>;
     autoCheckInterval: number;

package/lib/manager.js

@@ -198,12 +198,16 @@ export function createRecorderManager(opts) {
             const recorder = this.recorders.find((item) => item.id === id);
             return recorder ?? null;
         },
-        async startRecord(id) {
+        async startRecord(id, iOpts = {}) {
+            const { ignoreDataLimit = true } = iOpts;
             const recorder = this.recorders.find((item) => item.id === id);
             if (recorder == null)
                 return;
             if (recorder.recordHandle != null)
                 return;
+            // 如果手动开启且需要判断限制时间，再时间限制内时，就不启动录制
+            if (!ignoreDataLimit && isBetweenTimeRange(recorder.handleTime))
+                return;
             await recorder.checkLiveStatusAndRecord({
                 getSavePath(data) {
                     return genSavePathFromRule(manager, recorder, data);
@@ -321,6 +325,7 @@ export function genSavePathFromRule(manager, recorder, extData) {
         hour: formatDate(now, "HH"),
         min: formatDate(now, "mm"),
         sec: formatDate(now, "ss"),
+        ms: formatDate(now, "SSS"),
         ...extData,
         startTime: now,
         owner: owner,

package/lib/recorder.d.ts

@@ -36,6 +36,8 @@ export interface RecorderCreateOpts<E extends AnyObject = UnknownObject> {
     useM3U8Proxy?: boolean;
     /**B站m3u8代理url */
     m3u8ProxyUrl?: string;
+    /** B站自定义Host，用于替换直播流链接中的host */
+    customHost?: string;
     /** 流格式 */
     formatName?: FormatName;
     /** 流编码 */

package/lib/utils.d.ts

@@ -50,7 +50,7 @@ export declare const formatTemplate: (string: string, ...args: any[]) => string;
  * "receive invalid aac stream": ADTS无法被解析的flv流
  * "invalid stream": 一段时间内帧数不变
  */
-export declare function createInvalidStreamChecker(count?: number): (ffmpegLogLine: string) => [boolean, string];
+export declare function createFFmpegInvalidStreamChecker(count?: number): (ffmpegLogLine: string) => [boolean, string];
 export declare function createTimeoutChecker(onTimeout: () => void, time: number, autoStart?: boolean): {
     update: () => void;
     stop: () => void;
@@ -125,7 +125,7 @@ declare const _default: {
     assertObjectType: typeof assertObjectType;
     asyncThrottle: typeof asyncThrottle;
     isFfmpegStartSegment: typeof isFfmpegStartSegment;
-    createInvalidStreamChecker: typeof createInvalidStreamChecker;
+    createFFmpegInvalidStreamChecker: typeof createFFmpegInvalidStreamChecker;
     createTimeoutChecker: typeof createTimeoutChecker;
     downloadImage: typeof downloadImage;
     md5: (str: string) => string;

package/lib/utils.js

@@ -117,8 +117,9 @@ export function formatDate(date, format) {
         HH: date.getHours().toString().padStart(2, "0"),
         mm: date.getMinutes().toString().padStart(2, "0"),
         ss: date.getSeconds().toString().padStart(2, "0"),
+        SSS: date.getMilliseconds().toString().padStart(3, "0"),
     };
-    return format.replace(/yyyy|MM|dd|HH|mm|ss/g, (matched) => map[matched]);
+    return format.replace(/yyyy|MM|dd|HH|mm|ss|SSS/g, (matched) => map[matched]);
 }
 export function removeSystemReservedChars(str) {
     return filenamify(str, { replacement: "_" });
@@ -173,7 +174,7 @@ export const formatTemplate = function template(string, ...args) {
  * "receive invalid aac stream": ADTS无法被解析的flv流
  * "invalid stream": 一段时间内帧数不变
  */
-export function createInvalidStreamChecker(count = 15) {
+export function createFFmpegInvalidStreamChecker(count = 15) {
     let prevFrame = 0;
     let frameUnchangedCount = 0;
     return (ffmpegLogLine) => {
@@ -504,7 +505,7 @@ export default {
     assertObjectType,
     asyncThrottle,
     isFfmpegStartSegment,
-    createInvalidStreamChecker,
+    createFFmpegInvalidStreamChecker,
     createTimeoutChecker,
     downloadImage,
     md5,

package/lib/xml_stream_controller.js

@@ -23,7 +23,7 @@ export function createRecordExtraDataController(savePath) {
         isInitialized = true;
         try {
             // 创建XML文件头，使用占位符预留metadata位置
-            const header = `<?xml version="1.0" encoding="utf-8"?>\n<?xml-stylesheet type="text/xsl" href="#s"?>\n<i>\n<!--METADATA_PLACEHOLDER-->\n<BililiveRecorderXmlStyle><z:stylesheet version="1.0" id="s" xml:id="s" xmlns:z="http://www.w3.org/1999/XSL/Transform"><z:output method="html"/><z:template match="/"><html><meta name="viewport" content="width=device-width"/><title>弹幕文件 <z:value-of select="/i/metadata/user_name/text()"/></title><style>body{margin:0}h1,h2,p,table{margin-left:5px}table{border-spacing:0}td,th{border:1px solid grey;padding:1px 5px}th{position:sticky;top:0;background:#4098de}tr:hover{background:#d9f4ff}div{overflow:auto;max-height:80vh;max-width:100vw;width:fit-content}</style><h1>弹幕XML文件</h1><p>本文件不支持在 IE 浏览器里预览，请使用 Chrome Firefox Edge 等浏览器。</p><p>文件用法参考文档 <a href="https://rec.danmuji.org/user/danmaku/">https://rec.danmuji.org/user/danmaku/</a></p><table><tr><td>房间号</td><td><z:value-of select="/i/metadata/room_id/text()"/></td></tr><tr><td>主播名</td><td><z:value-of select="/i/metadata/user_name/text()"/></td></tr><tr><td><a href="#d">弹幕</a></td><td>共<z:value-of select="count(/i/d)"/>条记录</td></tr><tr><td><a href="#guard">上船</a></td><td>共<z:value-of select="count(/i/guard)"/>条记录</td></tr><tr><td><a href="#sc">SC</a></td><td>共<z:value-of select="count(/i/sc)"/>条记录</td></tr><tr><td><a href="#gift">礼物</a></td><td>共<z:value-of select="count(/i/gift)"/>条记录</td></tr></table><h2 id="d">弹幕</h2><div id="dm"><table><tr><th>用户名</th><th>出现时间</th><th>用户ID</th><th>弹幕</th><th>参数</th></tr><z:for-each select="/i/d"><tr><td><z:value-of select="@user"/></td><td></td><td></td><td><z:value-of select="."/></td><td><z:value-of select="@p"/></td></tr></z:for-each></table></div><script>Array.from(document.querySelectorAll('#dm tr')).slice(1).map(t=>t.querySelectorAll('td')).forEach(t=>{let p=t[4].textContent.split(','),a=p[0];t[1].textContent=\`\u0024{(Math.floor(a/60/60)+'').padStart(2,0)}:\u0024{(Math.floor(a/60%60)+'').padStart(2,0)}:\u0024{(a%60).toFixed(3).padStart(6,0)}\`;t[2].innerHTML=\`&lt;a target=_blank rel="nofollow noreferrer" "&gt;\u0024{p[6]}&lt;/a&gt;\`})</script><h2 id="guard">舰长购买</h2><div><table><tr><th>用户名</th><th>用户ID</th><th>舰长等级</th><th>购买数量</th><th>出现时间</th></tr><z:for-each select="/i/guard"><tr><td><z:value-of select="@user"/></td><td><a rel="nofollow noreferrer"><z:attribute name="href"><z:text></z:text><z:value-of select="@uid" /></z:attribute><z:value-of select="@uid"/></a></td><td><z:value-of select="@level"/></td><td><z:value-of select="@count"/></td><td><z:value-of select="@ts"/></td></tr></z:for-each></table></div><h2 id="sc">SuperChat 醒目留言</h2><div><table><tr><th>用户名</th><th>用户ID</th><th>内容</th><th>显示时长</th><th>价格</th><th>出现时间</th></tr><z:for-each select="/i/sc"><tr><td><z:value-of select="@user"/></td><td><a rel="nofollow noreferrer"><z:attribute name="href"><z:text></z:text><z:value-of select="@uid" /></z:attribute><z:value-of select="@uid"/></a></td><td><z:value-of select="."/></td><td><z:value-of select="@time"/></td><td><z:value-of select="@price"/></td><td><z:value-of select="@ts"/></td></tr></z:for-each></table></div><h2 id="gift">礼物</h2><div><table><tr><th>用户名</th><th>用户ID</th><th>礼物名</th><th>礼物数量</th><th>出现时间</th></tr><z:for-each select="/i/gift"><tr><td><z:value-of select="@user"/></td><td><span rel="nofollow noreferrer"><z:attribute name="href"></z:attribute><z:value-of select="@uid"/></span></td><td><z:value-of select="@giftname"/></td><td><z:value-of select="@giftcount"/></td><td><z:value-of select="@ts"/></td></tr></z:for-each></table></div></html></z:template></z:stylesheet></BililiveRecorderXmlStyle>`;
+            const header = `<?xml version="1.0" encoding="utf-8"?>\n<?xml-stylesheet type="text/xsl" href="#s"?>\n<i>\n<!--METADATA_PLACEHOLDER-->\n<RecorderXmlStyle><z:stylesheet version="1.0" id="s" xml:id="s" xmlns:z="http://www.w3.org/1999/XSL/Transform"><z:output method="html"/><z:template match="/"><html><meta name="viewport" content="width=device-width"/><title>弹幕文件 <z:value-of select="/i/metadata/user_name/text()"/></title><style>body{margin:0}h1,h2,p,table{margin-left:5px}table{border-spacing:0}td,th{border:1px solid grey;padding:1px 5px}th{position:sticky;top:0;background:#4098de}tr:hover{background:#d9f4ff}div{overflow:auto;max-height:80vh;max-width:100vw;width:fit-content}</style><h1>弹幕XML文件</h1><p>本文件不支持在 IE 浏览器里预览，请使用 Chrome Firefox Edge 等浏览器。</p><p>文件用法参考文档 <a href="https://rec.danmuji.org/user/danmaku/">https://rec.danmuji.org/user/danmaku/</a></p><table><tr><td>房间号</td><td><z:value-of select="/i/metadata/room_id/text()"/></td></tr><tr><td>主播名</td><td><z:value-of select="/i/metadata/user_name/text()"/></td></tr><tr><td><a href="#d">弹幕</a></td><td>共<z:value-of select="count(/i/d)"/>条记录</td></tr><tr><td><a href="#guard">上船</a></td><td>共<z:value-of select="count(/i/guard)"/>条记录</td></tr><tr><td><a href="#sc">SC</a></td><td>共<z:value-of select="count(/i/sc)"/>条记录</td></tr><tr><td><a href="#gift">礼物</a></td><td>共<z:value-of select="count(/i/gift)"/>条记录</td></tr></table><h2 id="d">弹幕</h2><div id="dm"><table><tr><th>用户名</th><th>出现时间</th><th>用户ID</th><th>弹幕</th><th>参数</th></tr><z:for-each select="/i/d"><tr><td><z:value-of select="@user"/></td><td></td><td></td><td><z:value-of select="."/></td><td><z:value-of select="@p"/></td></tr></z:for-each></table></div><script>Array.from(document.querySelectorAll('#dm tr')).slice(1).map(t=>t.querySelectorAll('td')).forEach(t=>{let p=t[4].textContent.split(','),a=p[0];t[1].textContent=\`\u0024{(Math.floor(a/60/60)+'').padStart(2,0)}:\u0024{(Math.floor(a/60%60)+'').padStart(2,0)}:\u0024{(a%60).toFixed(3).padStart(6,0)}\`;t[2].innerHTML=\`&lt;a target=_blank rel="nofollow noreferrer" "&gt;\u0024{p[6]}&lt;/a&gt;\`})</script><h2 id="guard">舰长购买</h2><div><table><tr><th>用户名</th><th>用户ID</th><th>舰长等级</th><th>购买数量</th><th>出现时间</th></tr><z:for-each select="/i/guard"><tr><td><z:value-of select="@user"/></td><td><a rel="nofollow noreferrer"><z:attribute name="href"><z:text></z:text><z:value-of select="@uid" /></z:attribute><z:value-of select="@uid"/></a></td><td><z:value-of select="@level"/></td><td><z:value-of select="@count"/></td><td><z:value-of select="@ts"/></td></tr></z:for-each></table></div><h2 id="sc">SuperChat 醒目留言</h2><div><table><tr><th>用户名</th><th>用户ID</th><th>内容</th><th>显示时长</th><th>价格</th><th>出现时间</th></tr><z:for-each select="/i/sc"><tr><td><z:value-of select="@user"/></td><td><a rel="nofollow noreferrer"><z:attribute name="href"><z:text></z:text><z:value-of select="@uid" /></z:attribute><z:value-of select="@uid"/></a></td><td><z:value-of select="."/></td><td><z:value-of select="@time"/></td><td><z:value-of select="@price"/></td><td><z:value-of select="@ts"/></td></tr></z:for-each></table></div><h2 id="gift">礼物</h2><div><table><tr><th>用户名</th><th>用户ID</th><th>礼物名</th><th>礼物数量</th><th>出现时间</th></tr><z:for-each select="/i/gift"><tr><td><z:value-of select="@user"/></td><td><span rel="nofollow noreferrer"><z:attribute name="href"></z:attribute><z:value-of select="@uid"/></span></td><td><z:value-of select="@giftname"/></td><td><z:value-of select="@giftcount"/></td><td><z:value-of select="@ts"/></td></tr></z:for-each></table></div></html></z:template></z:stylesheet></RecorderXmlStyle>`;
             await fs.promises.writeFile(savePath, header);
         }
         catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bililive-tools/manager",
-  "version": "1.12.0",
+  "version": "1.13.0",
   "description": "Batch scheduling recorders",
   "main": "./lib/index.js",
   "type": "module",