@bililive-tools/bilibili-recorder 1.4.1 → 1.5.1

package/README.md

@@ -43,6 +43,7 @@ interface Options {
   disableProvideCommentsWhenRecording?: boolean; // 禁用弹幕录制
   saveGiftDanma?: boolean; // 保存礼物弹幕，包含舰长
   saveSCDanma?: boolean; // 保存SC
+  useServerTimestamp?: boolean; // 控制弹幕是否使用服务端时间戳，默认为true
   saveCover?: boolean; // 保存封面
   auth?: string; // 登录所需cookie
   uid?: number; // cookie所有者uid，用于弹幕录制

package/lib/danma.d.ts

@@ -5,7 +5,12 @@ declare class DanmaClient extends EventEmitter {
     private auth;
     private uid;
     private retryCount;
-    constructor(roomId: number, auth: string | undefined, uid: number | undefined);
+    private useServerTimestamp;
+    constructor(roomId: number, { auth, uid, useServerTimestamp, }: {
+        auth: string | undefined;
+        uid: number | undefined;
+        useServerTimestamp?: boolean;
+    });
     start(): Promise<void>;
     stop(): void;
 }

package/lib/danma.js

@@ -1,5 +1,5 @@
 import { EventEmitter } from "node:events";
-import { startListen } from "./blive-message-listener/index.js";
+import { startListen } from "blive-message-listener";
 import { getBuvidConf } from "./bilibili_api.js";
 // 全局缓存，一天过期时间 (24 * 60 * 60 * 1000 ms)
 const CACHE_DURATION = 24 * 60 * 60 * 1000;
@@ -47,11 +47,13 @@ class DanmaClient extends EventEmitter {
     auth;
     uid;
     retryCount = 10;
-    constructor(roomId, auth, uid) {
+    useServerTimestamp;
+    constructor(roomId, { auth, uid, useServerTimestamp, }) {
         super();
         this.roomId = roomId;
         this.auth = auth;
         this.uid = uid;
+        this.useServerTimestamp = useServerTimestamp ?? true;
     }
     async start() {
         const info = await getCachedBuvidConf();
@@ -64,7 +66,7 @@ class DanmaClient extends EventEmitter {
                     return;
                 const comment = {
                     type: "comment",
-                    timestamp: msg.body.timestamp,
+                    timestamp: this.useServerTimestamp ? msg.body.timestamp : Date.now(),
                     text: content,
                     color: msg.body.content_color,
                     mode: msg.body.type,
@@ -84,7 +86,7 @@ class DanmaClient extends EventEmitter {
                 const content = msg.body.content.replaceAll(/[\r\n]/g, "");
                 const comment = {
                     type: "super_chat",
-                    timestamp: msg.raw.send_time,
+                    timestamp: this.useServerTimestamp ? msg.raw.send_time : Date.now(),
                     text: content,
                     price: msg.body.price,
                     sender: {
@@ -102,7 +104,7 @@ class DanmaClient extends EventEmitter {
             onGuardBuy: (msg) => {
                 const gift = {
                     type: "guard",
-                    timestamp: msg.timestamp,
+                    timestamp: this.useServerTimestamp ? msg.timestamp : Date.now(),
                     name: msg.body.gift_name,
                     price: msg.body.price,
                     count: 1,
@@ -122,7 +124,7 @@ class DanmaClient extends EventEmitter {
             onGift: (msg) => {
                 const gift = {
                     type: "give_gift",
-                    timestamp: msg.raw.send_time,
+                    timestamp: this.useServerTimestamp ? msg?.raw?.data?.timestamp * 1000 : Date.now(),
                     name: msg.body.gift_name,
                     count: msg.body.amount,
                     price: msg.body.coin_type === "silver" ? 0 : msg.body.price / 1000,

package/lib/index.js

@@ -19,6 +19,7 @@ function createRecorder(opts) {
         qualityMaxRetry: opts.qualityRetry ?? 0,
         qualityRetry: opts.qualityRetry ?? 0,
         useM3U8Proxy: opts.useM3U8Proxy ?? false,
+        useServerTimestamp: opts.useServerTimestamp ?? true,
         m3u8ProxyUrl: opts.m3u8ProxyUrl,
         formatName: opts.formatName ?? "auto",
         codecName: opts.codecName ?? "auto",
@@ -252,7 +253,11 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
         }
         this.emit("progress", progress);
     });
-    let danmaClient = new DanmaClient(roomId, this.auth, this.uid);
+    let danmaClient = new DanmaClient(roomId, {
+        auth: this.auth,
+        uid: this.uid,
+        useServerTimestamp: this.useServerTimestamp,
+    });
     if (!this.disableProvideCommentsWhenRecording) {
         danmaClient.on("Message", (msg) => {
             const extraDataController = recorder.getExtraDataController();
@@ -301,8 +306,8 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
             return;
         this.state = "stopping-record";
         intervalId && clearInterval(intervalId);
-        danmaClient.stop();
         try {
+            danmaClient.stop();
             await recorder.stop();
         }
         catch (err) {
@@ -349,6 +354,7 @@ export const provider = {
             title: info.title,
             owner: info.owner,
             uid: info.uid,
+            avatar: info.avatar,
         };
     },
     createRecorder(opts) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bililive-tools/bilibili-recorder",
-  "version": "1.4.1",
+  "version": "1.5.1",
   "description": "bililive-tools bilibili recorder implemention",
   "main": "./lib/index.js",
   "type": "module",
@@ -34,12 +34,12 @@
   "author": "renmu123",
   "license": "LGPL",
   "dependencies": {
-    "blive-message-listener": "^0.5.0",
+    "blive-message-listener": "^0.5.1",
     "mitt": "^3.0.1",
     "tiny-bilibili-ws": "^1.0.2",
     "lodash-es": "^4.17.21",
     "axios": "^1.7.8",
-    "@bililive-tools/manager": "^1.3.0"
+    "@bililive-tools/manager": "^1.4.1"
   },
   "scripts": {
     "build": "tsc",