@bililive-tools/douyu-recorder 1.6.0 → 1.7.1

package/lib/dy_client/buffer_coder.js

@@ -18,6 +18,7 @@ export class BufferCoder {
         if (littleEndian == null) {
             littleEndian = this.littleEndian;
         }
+        // @ts-ignore
         this.buffer = this.concat(this.buffer, newBuffer).buffer;
         while (this.buffer && this.buffer.byteLength > 0) {
             if (this.readLength === 0) {
@@ -38,6 +39,7 @@ export class BufferCoder {
         if (littleEndian == null) {
             littleEndian = this.littleEndian;
         }
+        // @ts-ignore
         const out = this.concat(this.encoder.encode(msg), Uint8Array.of(0));
         const formatBodySize = 8 + out.length;
         const dv = new DataView(new ArrayBuffer(formatBodySize + 4));

package/lib/index.js

@@ -106,10 +106,17 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         return this.recordHandle;
     }
     // 获取直播间信息
-    const liveInfo = await getInfo(this.channelId);
-    const { living, owner, title } = liveInfo;
-    this.liveInfo = liveInfo;
-    if (liveInfo.liveId === banLiveId) {
+    try {
+        const liveInfo = await getInfo(this.channelId);
+        this.liveInfo = liveInfo;
+        this.state = "idle";
+    }
+    catch (error) {
+        this.state = "check-error";
+        throw error;
+    }
+    const { living, owner, title } = this.liveInfo;
+    if (this.liveInfo.liveId === banLiveId) {
         this.tempStopIntervalCheck = true;
     }
     else {
@@ -151,7 +158,6 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         if (isManualStart) {
             strictQuality = false;
         }
-        // TODO: 还需要测试仅音频流的情况，mesio可能并不支持
         res = await getStream({
             channelId: this.channelId,
             quality: this.quality,
@@ -164,7 +170,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
     catch (err) {
         if (this.qualityRetry > 0)
             this.qualityRetry -= 1;
-        this.state = "idle";
+        this.state = "check-error";
         throw err;
     }
     this.state = "recording";
@@ -225,7 +231,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         extraDataController?.setMeta({
             room_id: this.channelId,
             platform: provider?.id,
-            liveStartTimestamp: liveInfo.startTime?.getTime(),
+            liveStartTimestamp: this?.liveInfo?.startTime?.getTime(),
             // recordStopTimestamp: Date.now(),
             title: title,
             user_name: owner,
@@ -453,11 +459,18 @@ export const provider = {
             roomId = matched[1].trim();
         }
         else {
-            // 解析<link rel="canonical" href="xxxxxxx"/>中的href
-            const canonicalLink = html.match(/<link rel="canonical" href="(.*?)"/);
-            if (canonicalLink) {
-                const url = canonicalLink[1];
-                roomId = url.split("/").pop();
+            // 解析出query中的rid参数
+            const rid = new URL(channelURL).searchParams.get("rid");
+            if (rid) {
+                roomId = rid;
+            }
+            else {
+                // 解析<link rel="canonical" href="xxxxxxx"/>中的href
+                const canonicalLink = html.match(/<link rel="canonical" href="(.*?)"/);
+                if (canonicalLink) {
+                    const url = canonicalLink[1];
+                    roomId = url.split("/").pop();
+                }
             }
         }
         if (!roomId)

package/lib/stream.js

@@ -46,6 +46,7 @@ export async function getStream(opts) {
     const qn = (DouyuQualities.includes(opts.quality) ? opts.quality : 0);
     let cdn = opts.source === "auto" ? undefined : opts.source;
     if (opts.source === "auto" && opts.avoidEdgeCDN) {
+        // TODO: 如果不存在 cdn=hw-h5 的源，那么还是可能默认到边缘节点，就先这样吧
         cdn = "hw-h5";
     }
     let liveInfo = await getLiveInfo({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bililive-tools/douyu-recorder",
-  "version": "1.6.0",
+  "version": "1.7.1",
   "description": "bililive-tools douyu recorder implemention",
   "main": "./lib/index.js",
   "type": "module",
@@ -41,7 +41,7 @@
     "lodash-es": "^4.17.21",
     "axios": "^1.7.8",
     "douyu-api": "^0.1.0",
-    "@bililive-tools/manager": "^1.6.0"
+    "@bililive-tools/manager": "^1.6.1"
   },
   "devDependencies": {
     "@types/ws": "^8.5.13"