@bililive-tools/bilibili-recorder 1.6.0 → 1.7.0

package/lib/danma.d.ts

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

package/lib/index.js

@@ -86,16 +86,22 @@ const ffmpegInputOptions = [
 const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, banLiveId, }) {
     if (this.recordHandle != null)
         return this.recordHandle;
-    const { living, liveId, owner: _owner, title: _title } = await getLiveStatus(this.channelId);
-    this.liveInfo = {
-        living,
-        owner: _owner,
-        title: _title,
-        avatar: "",
-        cover: "",
-        liveId: liveId,
-    };
-    if (liveId === banLiveId) {
+    try {
+        const { living, liveId, owner: _owner, title: _title } = await getLiveStatus(this.channelId);
+        this.liveInfo = {
+            living,
+            owner: _owner,
+            title: _title,
+            avatar: "",
+            cover: "",
+            liveId: liveId,
+        };
+    }
+    catch (error) {
+        this.state = "check-error";
+        throw error;
+    }
+    if (this.liveInfo.liveId === banLiveId) {
         this.tempStopIntervalCheck = true;
     }
     else {
@@ -103,7 +109,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
     }
     if (this.tempStopIntervalCheck)
         return null;
-    if (!living)
+    if (!this.liveInfo.living)
         return null;
     // 检查标题是否包含关键词，如果包含则不自动录制
     // 手动开始录制时不检查标题关键词
@@ -111,11 +117,11 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
         this.titleKeywords &&
         typeof this.titleKeywords === "string" &&
         this.titleKeywords.trim()) {
-        const hasTitleKeyword = hasKeyword(_title, this.titleKeywords);
+        const hasTitleKeyword = hasKeyword(this.liveInfo.title, this.titleKeywords);
         if (hasTitleKeyword) {
             this.emit("DebugLog", {
                 type: "common",
-                text: `跳过录制：直播间标题 "${_title}" 包含关键词 "${this.titleKeywords}"`,
+                text: `跳过录制：直播间标题 "${this.liveInfo.title}" 包含关键词 "${this.titleKeywords}"`,
             });
             return null;
         }
@@ -149,7 +155,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
     catch (err) {
         if (this.qualityRetry > 0)
             this.qualityRetry -= 1;
-        this.state = "idle";
+        this.state = "check-error";
         throw err;
     }
     this.state = "recording";
@@ -259,7 +265,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
     });
     let danmaClient = new DanmaClient(roomId, {
         auth: this.auth,
-        uid: this.uid,
+        uid: Number(this.uid),
         useServerTimestamp: this.useServerTimestamp,
     });
     if (!this.disableProvideCommentsWhenRecording) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bililive-tools/bilibili-recorder",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "bililive-tools bilibili recorder implemention",
   "main": "./lib/index.js",
   "type": "module",
@@ -39,7 +39,7 @@
     "tiny-bilibili-ws": "^1.0.2",
     "lodash-es": "^4.17.21",
     "axios": "^1.7.8",
-    "@bililive-tools/manager": "^1.6.0"
+    "@bililive-tools/manager": "^1.6.1"
   },
   "scripts": {
     "build": "tsc",