@bililive-tools/bilibili-recorder 1.17.0 → 1.18.1

package/lib/bilibili_api.d.ts

@@ -7,6 +7,7 @@ export declare function getRoomInit(roomIdOrShortId: number): Promise<{
     live_time: number;
     encrypted: boolean;
     is_sp: 0 | 1;
+    special_type: number;
 }>;
 export declare function getRoomInfo(roomIdOrShortId: number): Promise<{
     room_id: number;
@@ -79,6 +80,7 @@ export declare function getRoomPlayInfo(roomIdOrShortId: number, opts?: {
     short_id: number;
     live_status: LiveStatus;
     live_time: number;
+    all_special_types?: number[];
     playurl_info: {
         conf_json: string;
         playurl: {

package/lib/danma.d.ts

@@ -4,7 +4,11 @@ declare class DanmaClient extends EventEmitter {
     private roomId;
     private auth;
     private uid;
+    private readonly maxRetryCount;
     private retryCount;
+    private reconnectTimer;
+    private connectionGeneration;
+    private stopped;
     private useServerTimestamp;
     constructor(roomId: number, { auth, uid, useServerTimestamp, }: {
         auth: string | undefined;

package/lib/danma.js

@@ -46,7 +46,11 @@ class DanmaClient extends EventEmitter {
     roomId;
     auth;
     uid;
-    retryCount = 10;
+    maxRetryCount = 10;
+    retryCount = this.maxRetryCount;
+    reconnectTimer = null;
+    connectionGeneration = 0;
+    stopped = true;
     useServerTimestamp;
     constructor(roomId, { auth, uid, useServerTimestamp, }) {
         super();
@@ -56,7 +60,12 @@ class DanmaClient extends EventEmitter {
         this.useServerTimestamp = useServerTimestamp ?? true;
     }
     async start() {
+        const connectionGeneration = ++this.connectionGeneration;
+        this.stopped = false;
+        this.retryCount = this.maxRetryCount;
         const info = await getCachedBuvidConf();
+        if (this.stopped || connectionGeneration !== this.connectionGeneration)
+            return;
         const buvid3 = info.data.b_3;
         const handler = {
             onOpen: () => {
@@ -165,27 +174,54 @@ class DanmaClient extends EventEmitter {
                 lastAuth = `buvid3=${buvid3}`;
             }
         }
-        this.client = startListen(this.roomId, handler, {
-            ws: {
-                headers: {
-                    Cookie: lastAuth,
+        const connect = () => {
+            if (this.stopped || connectionGeneration !== this.connectionGeneration)
+                return;
+            const client = startListen(this.roomId, handler, {
+                ws: {
+                    headers: {
+                        Cookie: lastAuth,
+                    },
+                    uid: this.uid ?? 0,
+                    // 在本层控制重连次数，避免底层无限重连。
+                    keepalive: false,
                 },
-                uid: this.uid ?? 0,
-            },
-        });
-        this.client.live.on("error", (err) => {
-            console.error("DanmaClient error", err);
-            this.retryCount -= 1;
-            if (this.retryCount > 0) {
-                setTimeout(() => {
-                    this.client && this.client.reconnect();
+            });
+            this.client = client;
+            client.live.on("close", () => {
+                if (this.stopped ||
+                    connectionGeneration !== this.connectionGeneration ||
+                    this.client !== client ||
+                    this.reconnectTimer) {
+                    return;
+                }
+                if (this.retryCount <= 0) {
+                    console.error(`DanmaClient reconnect failed after ${this.maxRetryCount} attempts`);
+                    return;
+                }
+                const attempt = this.maxRetryCount - this.retryCount + 1;
+                this.retryCount -= 1;
+                this.emit("reconnect", { retryCount: attempt, maxRetry: this.maxRetryCount });
+                this.reconnectTimer = setTimeout(() => {
+                    this.reconnectTimer = null;
+                    connect();
                 }, 2000);
-            }
-            this.emit("error", err);
-        });
+            });
+            client.live.on("error", (err) => {
+                console.error("DanmaClient error", err);
+            });
+        };
+        connect();
     }
     stop() {
+        this.stopped = true;
+        this.connectionGeneration += 1;
+        if (this.reconnectTimer) {
+            clearTimeout(this.reconnectTimer);
+            this.reconnectTimer = null;
+        }
         this.client?.close();
+        this.client = null;
     }
 }
 export default DanmaClient;

package/lib/index.js

@@ -110,9 +110,29 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
     // 检查标题是否包含关键词，如果包含则不自动录制
     if (utils.checkTitleKeywordsBeforeRecord(this.liveInfo.title, this, isManualStart))
         return null;
-    const liveInfo = await getInfo(this.channelId);
+    const liveInfo = await getInfo(this.channelId, { cookie: this.auth });
     const { owner, title, roomId, liveStartTime, recordStartTime } = liveInfo;
     this.liveInfo = liveInfo;
+    // 特殊直播间无法录制(付费/DRM 加密、大航海权限专属、密码房等)：识别后跳过并告知用户。
+    // - 付费直播流为 DRM(SAMPLE-AES + Widevine/FairPlay/com.bilidrm)加密，ffmpeg 无法解密；
+    // - 大航海/权限专属、密码房无观看权限时拿不到可用流。
+    // 如需强行尝试(例如后续接入其它录制方式)，可设置 recorder.recordCharge = true。
+    if (!liveInfo.canRecord && this.recordCharge !== true) {
+        this.emit("DebugLog", {
+            type: "error",
+            text: `检测到${liveInfo.liveTypeDesc}(room ${roomId})，无法录制，已跳过：${title}`,
+        });
+        // 通知上层：检测到无法录制的特殊直播(供推送通知使用，由 manager 按场次去重)
+        this.emit("ChargeLive", { channelId: this.channelId });
+        // 持续状态标识：特殊直播已跳过。仅在状态变化时 emit，避免每个检查周期重复写时间线
+        if (this.state !== "charge-skipped") {
+            this.emit("stateChange", {
+                state: "charge-skipped",
+                msg: `${liveInfo.liveTypeDesc}，已跳过录制`,
+            });
+        }
+        return null;
+    }
     const qualityRetryLeft = (await this.cache.get("qualityRetryLeft")) ?? this.qualityRetry;
     const strictQuality = utils.shouldUseStrictQuality(qualityRetryLeft, this.qualityRetry, isManualStart);
     let res;
@@ -205,7 +225,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
         const info = await getInfo(this.channelId);
         return info;
     });
-    const handleVideoCreated = async ({ filename, title, cover, rawFilename }) => {
+    const handleVideoCreated = async ({ filename, title, cover, rawFilename, }) => {
         this.emit("videoFileCreated", { filename, cover, rawFilename });
         if (title && this?.liveInfo) {
             this.liveInfo.title = title;
@@ -285,16 +305,22 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
             text: "弹幕连接已关闭",
         });
     });
+    danmaClient.on("reconnect", ({ retryCount, maxRetry }) => {
+        this.appendTimeline({
+            text: `弹幕连接已断开，正在尝试重连... (重试次数: ${retryCount}/${maxRetry})`,
+        });
+        this.emit("DebugLog", {
+            type: "common",
+            text: `弹幕连接已断开，正在尝试重连... (重试次数: ${retryCount}/${maxRetry})`,
+        });
+    });
     if (enableDanmaListen) {
-        try {
-            danmaClient.start();
-        }
-        catch (err) {
+        void danmaClient.start().catch((err) => {
             this.emit("DebugLog", {
                 type: "error",
                 text: `弹幕连接失败，错误信息: ${String(err)}`,
             });
-        }
+        });
     }
     const downloaderArgs = downloader.getArguments();
     downloader.run();

package/lib/stream.d.ts

@@ -14,7 +14,17 @@ export declare function getLiveStatus(channelId: string): Promise<{
     owner: string;
     title: string;
 }>;
-export declare function getInfo(channelId: string): Promise<{
+/**
+ * 直播类型(B站专属)：
+ * - normal:   普通直播，可正常录制
+ * - paid:     付费/充电直播，流为 DRM(SAMPLE-AES + Widevine/FairPlay/com.bilidrm)加密，无法录制
+ * - guard:    大航海/权限专属直播(舰长/提督/总督等)，无观看权限时拿不到流
+ * - password: 密码加密直播间，未验证密码拿不到流
+ */
+export type BiliLiveType = "normal" | "paid" | "guard" | "password";
+export declare function getInfo(channelId: string, opts?: {
+    cookie?: string;
+}): Promise<{
     living: boolean;
     owner: string;
     title: string;
@@ -26,6 +36,10 @@ export declare function getInfo(channelId: string): Promise<{
     liveStartTime: Date;
     recordStartTime: Date;
     area: string;
+    liveType: BiliLiveType;
+    liveTypeDesc: string;
+    canRecord: boolean;
+    isCharge: boolean;
 }>;
 export declare function getStream(opts: Pick<Recorder, "channelId" | "quality"> & {
     cookie?: string;

package/lib/stream.js

@@ -19,7 +19,9 @@ export async function getLiveStatus(channelId) {
     if (data) {
         const startTime = new Date(data.live_time);
         return {
-            living: data.live_status === 1 && !data.is_encrypted,
+            // living 仅反映主播是否在播(live_status===1)；加密/付费/权限等"房间特殊状态"
+            // 不并入 living，由 getInfo 的 liveType/canRecord 单独判定。
+            living: data.live_status === 1,
             liveId: utils.md5(`${channelId}-${startTime?.getTime()}`),
             owner: data.uname,
             title: data.title,
@@ -28,49 +30,110 @@ export async function getLiveStatus(channelId) {
     const roomInit = await getRoomInit(Number(channelId));
     const startTime = new Date(roomInit.live_time * 1000);
     return {
-        living: roomInit.live_status === 1 && !roomInit.encrypted,
+        living: roomInit.live_status === 1,
         liveId: utils.md5(`${roomInit.room_id}-${startTime?.getTime()}`),
         ...roomInit,
         owner: "",
         title: "",
     };
 }
-export async function getInfo(channelId) {
+const LIVE_TYPE_DESC = {
+    normal: "普通直播",
+    paid: "付费直播(DRM 加密)",
+    guard: "大航海/权限专属直播",
+    password: "密码加密直播",
+};
+export async function getInfo(channelId, opts = {}) {
     const roomInit = await getRoomInit(Number(channelId));
-    const { [roomInit.uid]: status } = await getStatusInfoByUIDs([roomInit.uid]);
+    // 判断 1：是否在直播。仅看 live_status，不混入加密/付费等房间特殊状态。
+    const living = roomInit.live_status === 1;
     const recordStartTime = new Date();
-    if (!status) {
-        // 未获取到直播间信息，可能是加密，尝试换一个接口
+    // 基础信息(主播名/标题/封面等)始终获取，供频道预览(离线也要展示)。
+    let owner = "";
+    let title = "";
+    let avatar = "";
+    let cover = "";
+    let area = "";
+    let liveStartTime = new Date(0);
+    const { [roomInit.uid]: status } = await getStatusInfoByUIDs([roomInit.uid]);
+    if (status) {
+        owner = status.uname;
+        title = status.title;
+        avatar = status.face;
+        cover = status.cover_from_user;
+        area = status.area_v2_parent_name;
+        liveStartTime = new Date(status.live_time * 1000);
+    }
+    else {
+        // 未获取到直播间信息(可能是加密房等)，换一个接口取基础信息
         const data = await getRoomBaseInfo(Number(channelId));
-        const status = data[channelId];
-        const liveStartTime = new Date(status.live_time);
-        return {
-            uid: roomInit.uid,
-            living: roomInit.live_status === 1 && !roomInit.encrypted,
-            owner: status.uname,
-            title: status.title,
-            liveStartTime: liveStartTime,
-            avatar: "",
-            cover: status.cover,
-            roomId: roomInit.room_id,
-            liveId: utils.md5(`${roomInit.room_id}-${liveStartTime?.getTime()}`),
-            recordStartTime,
-            area: status.parent_area_name,
-        };
+        const base = data[Number(channelId)];
+        if (base) {
+            owner = base.uname;
+            title = base.title;
+            cover = base.cover;
+            liveStartTime = new Date(base.live_time);
+        }
+    }
+    // 判断 2 + 3：直播类型与能否录制。仅在播时才探测流(不在播无需多余请求)。
+    // 判定优先级(自上而下，命中即止)：
+    //   1. 密码房   → 未验证密码拿不到流，优先判定，不再请求取流接口
+    //   2. 付费标记 → room_init 的 is_sp/special_type 在付费直播进行时翻 1，无需取流即可确认
+    //   3. 取流探测 → 上面都未命中时才请求 getRoomPlayInfo，区分 DRM付费 / 权限受限 / 普通可录
+    let liveType = "normal";
+    let canRecord = false;
+    if (living) {
+        const paidByRoomInit = roomInit.is_sp === 1 || roomInit.special_type === 1;
+        if (roomInit.encrypted) {
+            liveType = "password";
+        }
+        else if (paidByRoomInit) {
+            liveType = "paid";
+        }
+        else {
+            try {
+                const playInfo = await getRoomPlayInfo(Number(channelId), { cookie: opts.cookie });
+                // all_special_types 含 203 = B站播放器自身判定的 DRM 加密直播
+                const allSpecialTypes = playInfo.all_special_types ?? [];
+                const isDRM = Array.isArray(allSpecialTypes) && allSpecialTypes.includes(203);
+                const hasStream = (playInfo.playurl_info?.playurl?.stream?.length ?? 0) > 0;
+                if (isDRM) {
+                    liveType = "paid";
+                }
+                else if (!hasStream) {
+                    // 取流接口正常返回、却拿不到任何流 → 权限受限(舰长/大航海等专属直播)
+                    liveType = "guard";
+                }
+                else {
+                    liveType = "normal";
+                    canRecord = true;
+                }
+            }
+            catch {
+                // 取流接口异常(网络/瞬时错误)：不臆断为权限受限，按普通直播放行，
+                // 交由后续 getStream 重试并产生 check-error，避免误跳过导致漏录。
+                liveType = "normal";
+                canRecord = true;
+            }
+        }
     }
-    const liveStartTime = new Date(status.live_time * 1000);
+    const liveTypeDesc = LIVE_TYPE_DESC[liveType];
     return {
         uid: roomInit.uid,
-        living: roomInit.live_status === 1 && !roomInit.encrypted,
-        owner: status.uname,
-        title: status.title,
-        avatar: status.face,
-        cover: status.cover_from_user,
+        living,
+        liveType,
+        liveTypeDesc,
+        canRecord,
+        isCharge: liveType === "paid",
+        owner,
+        title,
+        avatar,
+        cover,
         roomId: roomInit.room_id,
-        liveStartTime: liveStartTime,
+        liveStartTime,
         liveId: utils.md5(`${roomInit.room_id}-${liveStartTime.getTime()}`),
         recordStartTime,
-        area: status.area_v2_parent_name,
+        area,
     };
 }
 async function getLiveInfo(roomIdOrShortId, opts) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bililive-tools/bilibili-recorder",
-  "version": "1.17.0",
+  "version": "1.18.1",
   "description": "bililive-tools bilibili recorder implemention",
   "main": "./lib/index.js",
   "type": "module",