@bililive-tools/bilibili-recorder 1.12.0 → 1.15.0

package/README.md

@@ -55,6 +55,7 @@ interface Options {
   onlyAudio?: boolean; // 只录制音频，默认为否
   recorderType?: "auto" | "ffmpeg" | "mesio" | "bililive"; // 底层录制器，使用mesio和bililive时videoFormat参数无效
   debugLevel?: `verbose` | "basic"; // verbose参数时，录制器会输出更加详细的log
+  customHost?: string; // 自定义host来替换直播流的host
 }
 ```
 

package/lib/bilibili_api.d.ts

@@ -42,6 +42,7 @@ export declare function getStatusInfoByUIDs<UID extends number>(userIds: UID[]):
     online: number;
     room_id: number;
     short_id: number;
+    area_v2_parent_name: string;
 }>>;
 export declare function getRoomBaseInfo<RoomId extends number>(roomId: RoomId): Promise<Record<RoomId, {
     title: string;

package/lib/bilibili_api.js

@@ -8,6 +8,9 @@ const requester = axios.create({
     // axios 会自动读取环境变量中的 http_proxy 和 https_proxy 并应用，
     // 但会导致请求报错 "Client network socket disconnected before secure TLS connection was established"。
     proxy: false,
+    headers: {
+        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36",
+    },
 });
 export async function getRoomInit(roomIdOrShortId) {
     const res = await requester.get(`https://api.live.bilibili.com/room/v1/Room/room_init?id=${roomIdOrShortId}`);

package/lib/index.js

@@ -19,6 +19,7 @@ function createRecorder(opts) {
         state: "idle",
         qualityRetry: opts.qualityRetry ?? 0,
         useM3U8Proxy: opts.useM3U8Proxy ?? false,
+        customHost: opts.customHost,
         useServerTimestamp: opts.useServerTimestamp ?? true,
         m3u8ProxyUrl: opts.m3u8ProxyUrl,
         formatName: opts.formatName ?? "auto",
@@ -121,6 +122,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
             formatName: this.formatName,
             codecName: this.codecName,
             onlyAudio: this.onlyAudio,
+            customHost: this.customHost,
         });
     }
     catch (err) {

package/lib/stream.d.ts

@@ -25,6 +25,7 @@ export declare function getInfo(channelId: string): Promise<{
     liveId: string;
     liveStartTime: Date;
     recordStartTime: Date;
+    area: string;
 }>;
 export declare function getStream(opts: Pick<Recorder, "channelId" | "quality"> & {
     cookie?: string;
@@ -32,6 +33,7 @@ export declare function getStream(opts: Pick<Recorder, "channelId" | "quality">
     formatName: RecorderCreateOpts["formatName"];
     codecName: RecorderCreateOpts["codecName"];
     onlyAudio?: boolean;
+    customHost?: string;
 }): Promise<{
     currentStream: {
         name: string;

package/lib/stream.js

@@ -55,6 +55,7 @@ export async function getInfo(channelId) {
             roomId: roomInit.room_id,
             liveId: utils.md5(`${roomInit.room_id}-${liveStartTime?.getTime()}`),
             recordStartTime,
+            area: status.parent_area_name,
         };
     }
     const liveStartTime = new Date(status.live_time * 1000);
@@ -69,6 +70,7 @@ export async function getInfo(channelId) {
         liveStartTime: liveStartTime,
         liveId: utils.md5(`${roomInit.room_id}-${liveStartTime.getTime()}`),
         recordStartTime,
+        area: status.area_v2_parent_name,
     };
 }
 async function getLiveInfo(roomIdOrShortId, opts) {
@@ -158,6 +160,7 @@ async function getLiveInfo(roomIdOrShortId, opts) {
     // console.log("conditons", opts.codecName, conditons);
     let streamInfo;
     let streamOptions;
+    // console.log("conditons", JSON.stringify(res.playurl_info.playurl.stream, null, 2));
     for (const condition of conditons) {
         const streamList = res.playurl_info.playurl.stream
             .find(({ protocol_name }) => protocol_name === condition.protocol_name)
@@ -236,12 +239,14 @@ export async function getStream(opts) {
     if (!expectSource) {
         throw new Error("Can not get expect source");
     }
+    const host = opts.customHost ? `https://${opts.customHost}` : expectSource.host;
+    const url = host + liveInfo.base_url + expectSource.extra;
     return {
         ...liveInfo,
         currentStream: {
             name: liveInfo.name,
             source: expectSource.name,
-            url: expectSource.host + liveInfo.base_url + expectSource.extra,
+            url: url,
         },
     };
 }

package/lib/utils.d.ts

@@ -20,4 +20,3 @@ export declare function assert(assertion: unknown, msg?: string): asserts assert
 export declare function assertStringType(data: unknown, msg?: string): asserts data is string;
 export declare function assertNumberType(data: unknown, msg?: string): asserts data is number;
 export declare function assertObjectType(data: unknown, msg?: string): asserts data is object;
-export declare function createInvalidStreamChecker(count?: number): (ffmpegLogLine: string) => boolean;

package/lib/utils.js

@@ -59,25 +59,3 @@ export function assertNumberType(data, msg) {
 export function assertObjectType(data, msg) {
     assert(typeof data === "object", msg);
 }
-export function createInvalidStreamChecker(count = 10) {
-    let prevFrame = 0;
-    let frameUnchangedCount = 0;
-    return (ffmpegLogLine) => {
-        const streamInfo = ffmpegLogLine.match(/frame=\s*(\d+) fps=.*? q=.*? size=.*? time=.*? bitrate=.*? speed=.*?/);
-        if (streamInfo != null) {
-            const [, frameText] = streamInfo;
-            const frame = Number(frameText);
-            if (frame === prevFrame) {
-                if (++frameUnchangedCount >= count) {
-                    return true;
-                }
-            }
-            else {
-                prevFrame = frame;
-                frameUnchangedCount = 0;
-            }
-            return false;
-        }
-        return false;
-    };
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bililive-tools/bilibili-recorder",
-  "version": "1.12.0",
+  "version": "1.15.0",
   "description": "bililive-tools bilibili recorder implemention",
   "main": "./lib/index.js",
   "type": "module",
@@ -38,8 +38,8 @@
     "mitt": "^3.0.1",
     "tiny-bilibili-ws": "^1.0.2",
     "lodash-es": "^4.17.21",
-    "axios": "^1.7.8",
-    "@bililive-tools/manager": "^1.12.0"
+    "axios": "^1.15.0",
+    "@bililive-tools/manager": "^1.14.1"
   },
   "scripts": {
     "build": "tsc",