@bililive-tools/douyin-recorder 1.11.0 → 1.12.0

package/lib/douyin_api.js

@@ -144,7 +144,7 @@ async function getRoomInfoByUserWeb(secUserId, opts = {}) {
         const signed = get__ac_signature(timestamp, url, nonce, ua);
         cookies = `__ac_nonce=${nonce}; __ac_signature=${signed}; __ac_referer=__ac_blank`;
     }
-    const res = await axios.get(url, {
+    const res = await requester.get(url, {
         headers: {
             "User-Agent": ua,
             cookie: cookies,
@@ -229,7 +229,7 @@ async function getRoomInfoByHtml(webRoomId, opts = {}) {
         const signed = get__ac_signature(timestamp, url, nonce, ua);
         cookies = `__ac_nonce=${nonce}; __ac_signature=${signed}; __ac_referer=__ac_blank`;
     }
-    const res = await axios.get(url, {
+    const res = await requester.get(url, {
         headers: {
             "User-Agent": ua,
             cookie: cookies,

package/lib/index.js

@@ -30,7 +30,7 @@ function createRecorder(opts) {
         async getLiveInfo() {
             const channelId = this.channelId;
             const info = await getInfo(channelId, {
-                cookie: this.auth,
+                auth: this.auth,
                 uid: this.uid,
             });
             return {
@@ -65,7 +65,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
     // 如果已经在录制中,只在需要检查标题关键词时才获取最新信息
     if (this.recordHandle != null) {
         const shouldStop = await utils.checkTitleKeywordsWhileRecording(this, isManualStart, (channelId) => getInfo(channelId, {
-            cookie: this.auth,
+            auth: this.auth,
             api: this.api,
             uid: this.uid,
         }));
@@ -78,7 +78,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
     // 获取直播间信息
     try {
         const liveInfo = await getInfo(this.channelId, {
-            cookie: this.auth,
+            auth: this.auth,
             api: this.api,
             uid: this.uid,
         });
@@ -113,7 +113,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
             streamPriorities: this.streamPriorities,
             sourcePriorities: this.sourcePriorities,
             strictQuality: strictQuality,
-            cookie: this.auth,
+            auth: this.auth,
             formatPriorities: this.formatPriorities,
             doubleScreen: this.doubleScreen,
             api: this.api,
@@ -173,7 +173,9 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
             Cookie: this.auth,
         },
     }, onEnd, async () => {
-        const info = await getInfo(this.channelId);
+        const info = await getInfo(this.channelId, {
+            auth: this.auth,
+        });
         return info;
     });
     const savePath = getSavePath({
@@ -249,6 +251,41 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         this.emit("Message", comment);
         extraDataController.addMessage(comment);
     });
+    client.on("privilegeScreenChat", (msg) => {
+        const extraDataController = downloader.getExtraDataController();
+        if (!extraDataController)
+            return;
+        const comment = {
+            type: "comment",
+            // 抖音飘屏没有时间戳数据，默认使用当前时间
+            timestamp: Date.now(),
+            text: msg.content,
+            color: "#e0c39c",
+            sender: {
+                uid: msg.user.id,
+                name: msg.user.nickName,
+            },
+        };
+        this.emit("Message", comment);
+        extraDataController.addMessage(comment);
+    });
+    client.on("screenChat", (msg) => {
+        const extraDataController = downloader.getExtraDataController();
+        if (!extraDataController)
+            return;
+        const comment = {
+            type: "comment",
+            timestamp: this.useServerTimestamp ? Number(msg.eventTime) / 1000000 : Date.now(),
+            text: msg.content,
+            color: "#d7f6fc",
+            sender: {
+                uid: msg.user.id,
+                name: msg.user.nickName,
+            },
+        };
+        this.emit("Message", comment);
+        extraDataController.addMessage(comment);
+    });
     client.on("gift", (msg) => {
         const extraDataController = downloader.getExtraDataController();
         if (!extraDataController)
@@ -267,7 +304,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
             color: "#ffffff",
             sender: {
                 uid: msg.user.id,
-                name: msg.user.nickName,
+                name: msg?.user?.nickName ?? "unknown",
                 // avatar: msg.ic,
                 // extra: {
                 //   level: msg.level,

package/lib/stream.d.ts

@@ -1,7 +1,7 @@
 import type { Recorder } from "@bililive-tools/manager";
 import type { APIType, RealAPIType } from "./types.js";
 export declare function getInfo(channelId: string, opts?: {
-    cookie?: string;
+    auth?: string;
     api?: APIType;
     uid?: string | number;
 }): Promise<{
@@ -20,7 +20,7 @@ export declare function getInfo(channelId: string, opts?: {
 export declare function getStream(opts: Pick<Recorder, "channelId" | "quality" | "streamPriorities" | "sourcePriorities"> & {
     rejectCache?: boolean;
     strictQuality?: boolean;
-    cookie?: string;
+    auth?: string;
     formatPriorities?: Array<"flv" | "hls">;
     doubleScreen?: boolean;
     api?: APIType;

package/lib/stream.js

@@ -5,7 +5,7 @@ export async function getInfo(channelId, opts) {
     // 如果使用 balance 模式，使用负载均衡器
     if (opts?.api === "balance") {
         info = await globalLoadBalancer.callWithLoadBalance(channelId, {
-            auth: opts.cookie,
+            auth: opts.auth,
             uid: opts.uid,
         });
     }
@@ -38,7 +38,7 @@ export async function getStream(opts) {
     }
     const info = await getRoomInfo(opts.channelId, {
         doubleScreen: opts.doubleScreen ?? true,
-        auth: opts.cookie,
+        auth: opts.auth,
         api: api,
         uid: opts.uid,
     });

package/lib/utils.d.ts

@@ -8,5 +8,4 @@ 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 replaceExtName(filePath: string, newExtName: string): string;
 export declare function get__ac_signature(one_time_stamp: any, one_site: any, one_nonce: any, ua_n: any): string;

package/lib/utils.js

@@ -39,9 +39,6 @@ export function assertNumberType(data, msg) {
 export function assertObjectType(data, msg) {
     assert(typeof data === "object", msg);
 }
-export function replaceExtName(filePath, newExtName) {
-    return path.join(path.dirname(filePath), path.basename(filePath, path.extname(filePath)) + newExtName);
-}
 export function get__ac_signature(one_time_stamp, one_site, one_nonce, ua_n) {
     function cal_one_str(one_str, orgi_iv) {
         var k = orgi_iv;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bililive-tools/douyin-recorder",
-  "version": "1.11.0",
+  "version": "1.12.0",
   "description": "@bililive-tools douyin recorder implemention",
   "main": "./lib/index.js",
   "type": "module",
@@ -38,8 +38,8 @@
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.1",
     "sm-crypto": "^0.3.13",
-    "@bililive-tools/manager": "^1.10.0",
-    "douyin-danma-listener": "0.2.1"
+    "@bililive-tools/manager": "^1.12.0",
+    "douyin-danma-listener": "0.3.1"
   },
   "devDependencies": {
     "@types/node": "*"

package/lib/loadBalancer/example.d.ts

@@ -1,2 +0,0 @@
-declare function runExamples(): Promise<void>;
-export { runExamples };

package/lib/loadBalancer/example.js

@@ -1,130 +0,0 @@
-/**
- * 抖音录播器负载均衡使用示例
- */
-import { getInfo } from "../stream.js";
-import { loadBalancer } from "./loadBalancerManager.js";
-async function basicExample() {
-    console.log("=== 基本使用示例 ===");
-    try {
-        // 使用负载均衡模式获取房间信息
-        const roomInfo = await getInfo("测试房间ID", {
-            api: "balance", // 关键：使用balance模式启用负载均衡
-            cookie: "your-cookie-here",
-        });
-        console.log("获取到房间信息:", {
-            title: roomInfo.title,
-            owner: roomInfo.owner,
-            living: roomInfo.living,
-        });
-    }
-    catch (error) {
-        console.error("获取房间信息失败:", error.message);
-    }
-}
-async function managementExample() {
-    console.log("\n=== 管理功能示例 ===");
-    // 1. 查看当前状态
-    console.log("1. 当前负载均衡器状态:");
-    loadBalancer.printStatus();
-    // 2. 检查API健康状态
-    console.log("\n2. API健康状态检查:");
-    const apis = ["web", "webHTML", "mobile", "userHTML"];
-    apis.forEach((api) => {
-        const isHealthy = loadBalancer.isAPIHealthy(api);
-        console.log(`${api}: ${isHealthy ? "✅ 健康" : "❌ 不健康"}`);
-    });
-    // 3. 获取推荐API
-    const recommendedAPI = loadBalancer.getRecommendedAPI();
-    console.log(`\n3. 推荐使用的API: ${recommendedAPI}`);
-    // 4. 配置调整示例
-    console.log("\n4. 配置调整示例:");
-    console.log("原始配置:", loadBalancer.getConfig());
-    // 调整配置：更保守的失败策略
-    loadBalancer.updateConfig({
-        maxFailures: 2, // 减少到2次失败就禁用
-        blockDuration: 120000, // 禁用2分钟
-    });
-    console.log("调整后配置:", loadBalancer.getConfig());
-    // 5. API权重调整示例
-    console.log("\n5. API权重调整示例:");
-    console.log("调整前状态:");
-    console.table(loadBalancer.getStatus());
-    // 提高mobile接口的优先级和权重
-    loadBalancer.updateAPIConfig("mobile", {
-        priority: 1, // 最高优先级
-        weight: 5, // 最高权重
-    });
-    console.log("调整mobile接口权重后:");
-    console.table(loadBalancer.getStatus());
-}
-async function errorHandlingExample() {
-    console.log("\n=== 错误处理示例 ===");
-    // 模拟检查被禁用的API
-    const blockedAPIs = loadBalancer.getBlockedAPIs();
-    if (blockedAPIs.length > 0) {
-        console.log(`发现 ${blockedAPIs.length} 个被禁用的API:`, blockedAPIs);
-        // 可以选择重置这些API
-        console.log("重置被禁用的API...");
-        blockedAPIs.forEach((api) => {
-            loadBalancer.resetAPI(api);
-        });
-        console.log("重置完成，当前健康的API:", loadBalancer.getHealthyAPIs());
-    }
-    else {
-        console.log("所有API都处于健康状态 ✅");
-    }
-}
-async function monitoringExample() {
-    console.log("\n=== 监控示例 ===");
-    // 模拟监控函数
-    function checkSystemHealth() {
-        const status = loadBalancer.getStatus();
-        const healthyCount = status.filter((s) => !s.isBlocked).length;
-        const totalCount = status.length;
-        console.log(`系统健康状态: ${healthyCount}/${totalCount} 个API可用`);
-        if (healthyCount < totalCount / 2) {
-            console.warn("⚠️  警告：超过一半的API不可用！");
-            loadBalancer.printStatus();
-            // 可以触发告警或自动恢复逻辑
-            console.log("执行自动恢复...");
-            loadBalancer.resetAll();
-        }
-        // 显示详细状态
-        status.forEach((s) => {
-            if (s.isBlocked) {
-                const retryTime = new Date(s.nextRetryTime).toLocaleString();
-                console.log(`❌ ${s.api}: 被禁用，下次重试时间: ${retryTime}`);
-            }
-            else if (s.failureCount > 0) {
-                console.log(`⚠️  ${s.api}: 失败 ${s.failureCount} 次，仍可用`);
-            }
-            else {
-                console.log(`✅ ${s.api}: 健康`);
-            }
-        });
-    }
-    // 执行健康检查
-    checkSystemHealth();
-    // 在实际应用中，可以设置定时器
-    // setInterval(checkSystemHealth, 60000); // 每分钟检查一次
-}
-// 主函数
-async function runExamples() {
-    try {
-        await basicExample();
-        await managementExample();
-        await errorHandlingExample();
-        await monitoringExample();
-        console.log("\n=== 示例执行完成 ===");
-        console.log("\n最终状态:");
-        loadBalancer.printStatus();
-    }
-    catch (error) {
-        console.error("示例执行失败:", error);
-    }
-}
-// 如果直接运行此文件
-if (import.meta.url === `file://${process.argv[1]}`) {
-    runExamples();
-}
-export { runExamples };