@bililive-tools/manager 1.17.0 → 1.17.1

package/lib/downloader/IDownloader.d.ts

@@ -4,6 +4,12 @@ import type { FormatName } from "./index.js";
 import type { XmlStreamController } from "../xml_stream_controller.js";
 import type { VideoFileCompletedPayload } from "./streamManager.js";
 export type Segment = number | string | undefined;
+export interface VideoFileCreatedPayload {
+    filename: string;
+    cover?: string;
+    rawFilename?: string;
+    title?: string;
+}
 /**
  * 录制器构造函数选项的基础接口
  */
@@ -51,12 +57,7 @@ export interface IDownloader extends EventEmitter {
     getExtraDataController(): XmlStreamController | null;
     createCommand(): any;
     get videoFilePath(): string;
-    on(event: "videoFileCreated", listener: (data: {
-        filename: string;
-        cover?: string;
-        rawFilename?: string;
-        title?: string;
-    }) => void): this;
+    on(event: "videoFileCreated", listener: (data: VideoFileCreatedPayload) => void): this;
     on(event: "videoFileCompleted", listener: (data: VideoFileCompletedPayload) => void): this;
     on(event: "DebugLog", listener: (data: {
         type: string;
@@ -64,12 +65,7 @@ export interface IDownloader extends EventEmitter {
     }) => void): this;
     on(event: "progress", listener: (info: any) => void): this;
     on(event: string, listener: (...args: any[]) => void): this;
-    emit(event: "videoFileCreated", data: {
-        filename: string;
-        cover?: string;
-        rawFilename?: string;
-        title?: string;
-    }): boolean;
+    emit(event: "videoFileCreated", data: VideoFileCreatedPayload): boolean;
     emit(event: "videoFileCompleted", data: VideoFileCompletedPayload): boolean;
     emit(event: "DebugLog", data: {
         type: string;

package/lib/downloader/streamManager.js

@@ -146,6 +146,7 @@ export class StreamManager extends EventEmitter {
             recordSavePath = getSavePath({ startTime, extraMs: true });
         }
         this.recordSavePath = recordSavePath;
+        ensureFolderExist(recordSavePath);
         if (hasSegment) {
             this.segment = new Segment(getSavePath, disableDanma, this.videoExt, {
                 firstStartTime: startTime,
@@ -161,7 +162,6 @@ export class StreamManager extends EventEmitter {
             });
         }
         else {
-            ensureFolderExist(recordSavePath);
             const extraDataSavePath = `${recordSavePath}.xml`;
             if (!disableDanma) {
                 this.extraDataController = createRecordExtraDataController(extraDataSavePath);

package/lib/index.d.ts

@@ -9,6 +9,7 @@ export * from "./manager.js";
 export * from "./cache.js";
 export * from "./downloader/FFmpegDownloader.js";
 export { createDownloader } from "./downloader/index.js";
+export type { VideoFileCreatedPayload } from "./downloader/IDownloader.js";
 export { checkTitleKeywordsWhileRecording, checkTitleKeywordsBeforeRecord } from "./utils.js";
 export { utils };
 /**

package/lib/manager.d.ts

@@ -13,12 +13,16 @@ export interface ProviderCheckConfig {
     /** 每次检查之间的等待时间（毫秒） */
     waitTime?: number;
 }
+export interface ResolveChannelOptions {
+    /** 解析频道信息时使用的网络代理 */
+    proxy?: string;
+}
 export interface RecorderProvider<E extends AnyObject> {
     id: string;
     name: string;
     siteURL: string;
     matchURL: (this: RecorderProvider<E>, channelURL: string) => boolean;
-    resolveChannelInfoFromURL: (this: RecorderProvider<E>, channelURL: string) => Promise<{
+    resolveChannelInfoFromURL: (this: RecorderProvider<E>, channelURL: string, options?: ResolveChannelOptions) => Promise<{
         id: ChannelId;
         title: string;
         owner: string;
@@ -62,6 +66,9 @@ export interface RecorderManager<ME extends UnknownObject, P extends RecorderPro
     RecoderLiveStart: {
         recorder: Recorder<E>;
     };
+    RecoderChargeLive: {
+        recorder: Recorder<E>;
+    };
     RecordStop: {
         recorder: SerializedRecorder<E>;
         recordHandle: RecordHandle;

package/lib/manager.js

@@ -5,7 +5,7 @@ import { omit, range } from "lodash-es";
 import { parseArgsStringToArgv } from "string-argv";
 import { RecorderCacheImpl, MemoryCacheStore } from "./cache.js";
 import { getBiliStatusInfoByRoomIds } from "./api.js";
-import { formatDate, removeSystemReservedChars, formatTemplate, replaceExtName, downloadImage, isBetweenTimeRange, sleep, } from "./utils.js";
+import { formatDate, removeSystemReservedChars, formatTemplate, replaceExtName, downloadImage, isBetweenTimeRange, sleep, replaceFourByteUnicode, } from "./utils.js";
 import { StreamManager } from "./downloader/streamManager.js";
 const RECORDER_TIMELINE_LIMIT = 40;
 function normalizeTimelineText(text) {
@@ -43,6 +43,7 @@ function getStateTimelineText(state, msg) {
         "stopping-record": "停止录制中",
         "check-error": "检查失败",
         "title-blocked": "标题命中过滤规则",
+        "charge-skipped": "特殊直播(付费/权限/加密)，无法录制，已跳过",
     };
     return stateTextMap[state];
 }
@@ -142,6 +143,8 @@ export function createRecorderManager(opts) {
     const tempBanObj = {};
     // 用于是否触发LiveStart事件，不要重复触发
     const liveStartObj = {};
+    // 用于是否触发ChargeLive(充电直播)事件，按场次去重，不要每个检查周期重复触发
+    const chargeLiveObj = {};
     // 用于记录触发重试直播场次的次数
     const retryCountObj = {};
     const manager = {
@@ -254,6 +257,15 @@ export function createRecorderManager(opts) {
                 liveStartObj[key] = true;
                 this.emit("RecoderLiveStart", { recorder: recorder });
             });
+            recorder.on("ChargeLive", () => {
+                // 充电直播按场次去重，避免每个检查周期重复推送
+                const liveId = recorder.liveInfo?.liveId;
+                const key = `${recorder.channelId}-${liveId ?? ""}`;
+                if (chargeLiveObj[key])
+                    return;
+                chargeLiveObj[key] = true;
+                this.emit("RecoderChargeLive", { recorder: recorder });
+            });
             recorder.on("stateChange", ({ state, msg }) => {
                 recorder.state = state;
                 if (state !== "idle") {
@@ -274,6 +286,16 @@ export function createRecorderManager(opts) {
             recorder.recordHandle?.stop("remove recorder");
             this.recorders.splice(idx, 1);
             delete tempBanObj[recorder.channelId];
+            // 清理该房间的 liveStart/chargeLive 去重标记，否则删除后重新添加同一场直播不会再次推送通知
+            const keyPrefix = `${recorder.channelId}-`;
+            Object.keys(liveStartObj).forEach((k) => {
+                if (k.startsWith(keyPrefix))
+                    delete liveStartObj[k];
+            });
+            Object.keys(chargeLiveObj).forEach((k) => {
+                if (k.startsWith(keyPrefix))
+                    delete chargeLiveObj[k];
+            });
             this.emit("RecorderRemoved", recorder.toJSON());
         },
         getRecorder(id) {
@@ -444,6 +466,7 @@ export function genSavePathFromRule(manager, recorder, extData) {
         title: title,
         remarks: remarks,
         channelId,
+        replaceFourByteUnicode,
     };
     let savePathRule = manager.savePathRule;
     if (extData?.extraMs) {

package/lib/recorder.d.ts

@@ -5,8 +5,8 @@ import { AnyObject, PickRequired, UnknownObject } from "./utils.js";
 import type { NamespacedCache } from "./cache.js";
 import type { DownloaderType } from "./downloader/index.js";
 import type { XmlStreamStats } from "./xml_stream_controller.js";
-type FormatName = "auto" | "flv" | "hls" | "fmp4" | "flv_only" | "hls_only" | "fmp4_only";
-type CodecName = "auto" | "avc" | "hevc" | "avc_only" | "hevc_only";
+export type FormatName = "auto" | "flv" | "hls" | "fmp4" | "flv_only" | "hls_only" | "fmp4_only";
+export type CodecName = "auto" | "avc" | "hevc" | "av1" | "avc_only" | "hevc_only" | "av1_only";
 export interface RecorderCreateOpts<E extends AnyObject = UnknownObject> {
     providerId: RecorderProvider<E>["id"];
     channelId: ChannelId;
@@ -71,8 +71,8 @@ export interface RecorderCreateOpts<E extends AnyObject = UnknownObject> {
     debugLevel?: "none" | "basic" | "verbose";
 }
 export type SerializedRecorder<E extends AnyObject> = PickRequired<RecorderCreateOpts<E>, "id"> & Pick<Recorder<E>, "id" | "channelId" | "remarks" | "disableAutoCheck" | "quality" | "streamPriorities" | "sourcePriorities" | "extra" | "segment" | "saveSCDanma" | "saveCover" | "convert2Mp4" | "saveGiftDanma" | "disableProvideCommentsWhenRecording" | "liveInfo" | "uid" | "titleKeywords">;
-/** 录制状态，idle: 空闲中，recording: 录制中，stopping-record: 停止录制中，check-error: 检查错误，title-blocked: 标题黑名单 */
-export type RecorderState = "idle" | "recording" | "stopping-record" | "check-error" | "title-blocked";
+/** 录制状态，idle: 空闲中，recording: 录制中，stopping-record: 停止录制中，check-error: 检查错误，title-blocked: 标题黑名单，charge-skipped: 充电直播(DRM加密)已跳过 */
+export type RecorderState = "idle" | "recording" | "stopping-record" | "check-error" | "title-blocked" | "charge-skipped";
 export type Progress = {
     time: string | null;
 };
@@ -133,6 +133,9 @@ export interface Recorder<E extends AnyObject = UnknownObject> extends Emitter<{
     Updated: (string | keyof Recorder)[];
     Message: Message;
     DebugLog: DebugLog;
+    ChargeLive: {
+        channelId: string;
+    };
 }>, RecorderCreateOpts<E> {
     id: string;
     extra: Partial<E>;
@@ -153,6 +156,9 @@ export interface Recorder<E extends AnyObject = UnknownObject> extends Emitter<{
         liveId?: string;
         recordStartTime: Date;
         area?: string;
+        liveType?: string;
+        liveTypeDesc?: string;
+        canRecord?: boolean;
     };
     tempStopIntervalCheck?: boolean;
     timeline?: RecorderTimelineItem[];
@@ -177,10 +183,12 @@ export interface Recorder<E extends AnyObject = UnknownObject> extends Emitter<{
         liveStartTime: Date;
         area: string;
     }>;
-    getStream: (this: Recorder<E>) => Promise<{
+    getStream: (this: Recorder<E>, opts?: {
+        formatName?: FormatName;
+        formatPriorities?: Array<"flv" | "hls">;
+    }) => Promise<{
         source: string;
         name: string;
         url: string;
     }>;
 }
-export {};

package/lib/utils.d.ts

@@ -36,6 +36,10 @@ export declare function assertNumberType(data: unknown, msg?: string): asserts d
 export declare function assertObjectType(data: unknown, msg?: string): asserts data is object;
 export declare function formatDate(date: Date, format: string): string;
 export declare function removeSystemReservedChars(str: string): string;
+/**
+ * 替换四字节 Unicode 字符（如部分 emoji 表情）为指定字符。
+ */
+export declare function replaceFourByteUnicode(value: unknown, replacement?: string): string;
 export declare function isFfmpegStartSegment(line: string): boolean;
 export declare function isMesioStartSegment(line: string): boolean;
 export declare function isBililiveStartSegment(line: string): boolean;
@@ -125,6 +129,7 @@ declare const _default: {
     assertObjectType: typeof assertObjectType;
     asyncThrottle: typeof asyncThrottle;
     isFfmpegStartSegment: typeof isFfmpegStartSegment;
+    replaceFourByteUnicode: typeof replaceFourByteUnicode;
     createFFmpegInvalidStreamChecker: typeof createFFmpegInvalidStreamChecker;
     createTimeoutChecker: typeof createTimeoutChecker;
     downloadImage: typeof downloadImage;

package/lib/utils.js

@@ -124,6 +124,12 @@ export function formatDate(date, format) {
 export function removeSystemReservedChars(str) {
     return filenamify(str, { replacement: "_" });
 }
+/**
+ * 替换四字节 Unicode 字符（如部分 emoji 表情）为指定字符。
+ */
+export function replaceFourByteUnicode(value, replacement = "_") {
+    return String(value ?? "").replace(/[\uD800-\uDBFF][\uDC00-\uDFFF]/g, replacement);
+}
 export function isFfmpegStartSegment(line) {
     return line.includes("Opening ") && line.includes("for writing");
 }
@@ -507,6 +513,7 @@ export default {
     assertObjectType,
     asyncThrottle,
     isFfmpegStartSegment,
+    replaceFourByteUnicode,
     createFFmpegInvalidStreamChecker,
     createTimeoutChecker,
     downloadImage,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bililive-tools/manager",
-  "version": "1.17.0",
+  "version": "1.17.1",
   "description": "Batch scheduling recorders",
   "main": "./lib/index.js",
   "type": "module",
@@ -33,14 +33,17 @@
   "license": "LGPL",
   "dependencies": {
     "@renmu/fluent-ffmpeg": "2.3.3",
-    "fast-xml-parser": "^4.5.0",
-    "filenamify": "^7.0.0",
-    "mitt": "^3.0.1",
-    "string-argv": "^0.3.2",
-    "lodash-es": "^4.17.21",
     "axios": "^1.15.0",
+    "ejs": "^3.1.10",
+    "fast-xml-parser": "^5.9.3",
+    "filenamify": "^7.0.0",
     "fs-extra": "^11.2.0",
-    "ejs": "^3.1.10"
+    "lodash-es": "^4.17.21",
+    "mitt": "^3.0.1",
+    "string-argv": "^0.3.2"
+  },
+  "devDependencies": {
+    "@types/ejs": "^3.1.5"
   },
   "scripts": {
     "build": "pnpm run test && tsc",