bililive-cli 3.22.0 → 3.22.1

package/lib/{fileFromPath-1V4Za2hv.cjs → fileFromPath-D1rsnNRo.cjs}

@@ -2,8 +2,8 @@
 
 var require$$0 = require('fs');
 var require$$0$1 = require('path');
-var index$1 = require('./index-ByKMHGR7.cjs');
-var index = require('./index-Db-mrTi0.cjs');
+var index$1 = require('./index-CmRhhp3m.cjs');
+var index = require('./index-B-Cevjk4.cjs');
 require('node:dns');
 require('constants');
 require('stream');

package/lib/{index-Db-mrTi0.cjs → index-B-Cevjk4.cjs}

@@ -4,7 +4,7 @@ var path$3 = require('node:path');
 var http$4 = require('node:http');
 var urlLib = require('node:url');
 var https = require('node:https');
-var index$1 = require('./index-ByKMHGR7.cjs');
+var index$1 = require('./index-CmRhhp3m.cjs');
 var require$$0$5 = require('tty');
 var require$$1$4 = require('util');
 var require$$0$b = require('assert');
@@ -62606,7 +62606,7 @@ class MultipartBody {
 let fileFromPathWarned = false;
 async function fileFromPath(path, ...args) {
     // this import fails in environments that don't handle export maps correctly, like old versions of Jest
-    const { fileFromPath: _fileFromPath } = await Promise.resolve().then(function () { return require('./fileFromPath-1V4Za2hv.cjs'); });
+    const { fileFromPath: _fileFromPath } = await Promise.resolve().then(function () { return require('./fileFromPath-D1rsnNRo.cjs'); });
     if (!fileFromPathWarned) {
         console.warn(`fileFromPath is deprecated; use fs.createReadStream(${JSON.stringify(path)}) instead`);
         fileFromPathWarned = true;
@@ -79275,7 +79275,7 @@ let handler;
 let appConfig;
 let container;
 const fileCache = createFileCache();
-path$3.dirname(urlLib.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-Db-mrTi0.cjs', document.baseURI).href))));
+path$3.dirname(urlLib.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-B-Cevjk4.cjs', document.baseURI).href))));
 const authMiddleware = (passKey) => {
     return async (ctx, next) => {
         const authHeader = ctx.headers["authorization"] || ctx.request.query.auth;

package/lib/{index-ByKMHGR7.cjs → index-CmRhhp3m.cjs}

@@ -12144,6 +12144,7 @@ const APP_DEFAULT_CONFIG = {
         douyu: {
             quality: 0,
             source: "auto",
+            cookie: "",
             checkInterval: undefined,
             maxThreadCount: undefined,
             waitTime: undefined,
@@ -54947,7 +54948,7 @@ async function trash(paths, options) {
 	} else if (process$2.platform === 'win32') {
 		module = await Promise.resolve().then(function () { return require('./windows-C30k1cv-.cjs'); });
 	} else {
-		module = await Promise.resolve().then(function () { return require('./linux-C-4qLKcq.cjs'); });
+		module = await Promise.resolve().then(function () { return require('./linux-BFUWjr8o.cjs'); });
 	}
 
 	return module.default(paths);
@@ -191874,7 +191875,7 @@ const handleRestartTask = (taskId) => {
 
 let ntsuspend;
 function getNtSuspend() {
-    ntsuspend ??= node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-ByKMHGR7.cjs', document.baseURI).href)))("ntsuspend");
+    ntsuspend ??= node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-CmRhhp3m.cjs', document.baseURI).href)))("ntsuspend");
     return ntsuspend;
 }
 class DanmuTask extends AbstractTask {
@@ -233369,6 +233370,7 @@ class HttpClient {
                 method: mergedOpts.method || "GET",
                 headers: {
                     "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
+                    ...(mergedOpts.cookie ? { Cookie: mergedOpts.cookie } : {}),
                     ...mergedOpts.headers,
                 },
                 body: mergedOpts.body,
@@ -233394,6 +233396,7 @@ class HttpClient {
                 method: "GET",
                 headers: {
                     "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
+                    ...(mergedOpts.cookie ? { Cookie: mergedOpts.cookie } : {}),
                     ...mergedOpts?.headers,
                 },
                 dispatcher: agent,
@@ -233435,6 +233438,7 @@ class HttpClient {
                 headers: {
                     "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
                     "Content-Type": contentType,
+                    ...(mergedOpts.cookie ? { Cookie: mergedOpts.cookie } : {}),
                     ...mergedOpts?.headers,
                 },
                 body: requestBody,
@@ -233461,6 +233465,7 @@ class HttpClient {
                 headers: {
                     "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
                     Accept: "*/*",
+                    ...(mergedOpts.cookie ? { Cookie: mergedOpts.cookie } : {}),
                     ...mergedOpts?.headers,
                 },
                 dispatcher: agent,
@@ -238592,8 +238597,8 @@ registry.register("xhs", (opts) => new XhsParser(opts));
 registry.register("xiaohongshu", (opts) => new XhsParser(opts));
 registry.register("tiktok", (opts) => new TikTokParser(opts));
 
-async function getInfo$5(channelId) {
-    const parser = new DouyuParser();
+async function getInfo$5(channelId, auth) {
+    const parser = new DouyuParser({ cookie: auth });
     const data = await parser.getRoomInfo(channelId);
     const startTime = data.liveStartTime || new Date();
     const recordStartTime = new Date();
@@ -238615,7 +238620,7 @@ async function getStream$7(opts) {
     if (opts.source === "auto" && opts.avoidEdgeCDN) {
         cdn = "hw-h5";
     }
-    const parser = new DouyuParser();
+    const parser = new DouyuParser({ cookie: opts.auth });
     const shouldHevc = opts.codecName === "hevc";
     const isOldApi = opts.api === "old";
     let liveInfo = await parser.getLiveInfo(opts.channelId, {
@@ -238649,20 +238654,18 @@ async function getStream$7(opts) {
         throw new Error("Source list is empty");
     }
     // 是否存在画质下没有source的情况，可能需要切换画质
-    if (liveInfo.currentStream.rate !== qn) {
-        if (liveInfo.streams.length === 0) {
-            throw new Error("Can not get expect quality because of no available stream");
-        }
-        else {
-            liveInfo = await parser.getLiveInfo(opts.channelId, {
-                rate: liveInfo.streams[0].rate,
-                onlyAudio: opts.onlyAudio,
-                hevc: shouldHevc,
-            });
-            if (!liveInfo.living)
-                throw new Error("It must be called getStream when living");
-        }
-    }
+    // if (liveInfo.currentStream.rate !== qn) {
+    //   if (liveInfo.streams.length === 0) {
+    //     throw new Error("Can not get expect quality because of no available stream");
+    //   } else {
+    //     liveInfo = await parser.getLiveInfo(opts.channelId, {
+    //       rate: liveInfo.streams[0].rate,
+    //       onlyAudio: opts.onlyAudio,
+    //       hevc: shouldHevc,
+    //     });
+    //     if (!liveInfo.living) throw new Error("It must be called getStream when living");
+    //   }
+    // }
     return liveInfo;
 }
 
@@ -245069,6 +245072,7 @@ function createRecorder$5(opts) {
                 avoidEdgeCDN: true,
                 codecName: this.codecName,
                 api: this.api,
+                auth: this.auth,
             });
             return res.currentStream;
         },
@@ -245136,6 +245140,7 @@ const checkLiveStatusAndRecord$5 = async function ({ getSavePath, banLiveId, isM
             avoidEdgeCDN: true,
             codecName: this.codecName,
             api: this.api,
+            auth: this.auth,
         });
     }
     catch (err) {
@@ -381261,7 +381266,10 @@ class RecorderConfig {
                     return get$1(globalConfig, "douyu.source");
                 }
                 else if (key === "cookie") {
-                    if (setting.providerId === "DouYin") {
+                    if (setting.providerId === "DouYu") {
+                        return get$1(globalConfig, "douyu.cookie");
+                    }
+                    else if (setting.providerId === "DouYin") {
                         return get$1(globalConfig, "douyin.cookie");
                     }
                     else if (setting.providerId === "XHS") {
@@ -381362,6 +381370,9 @@ class RecorderConfig {
                 }
             }
         }
+        else if (setting.providerId === "DouYu") {
+            auth = getValue("cookie");
+        }
         else if (setting.providerId === "DouYin") {
             auth = getValue("cookie");
             uid = setting?.uid;

package/lib/index.cjs

@@ -3715,7 +3715,7 @@ const {
   Help,
 } = commander;
 
-var version = "3.22.0";
+var version = "3.22.1";
 
 process.on("uncaughtException", function (error) {
     console.error(`${new Date().toISOString()} uncaughtException`, error);
@@ -3741,8 +3741,8 @@ program
         throw new Error(`${c.configFolder}参数不存在，请先重新运行 config gen 命令`);
     }
     // 下面两行顺序不能换（
-    const { init } = await Promise.resolve().then(function () { return require('./index-ByKMHGR7.cjs'); }).then(function (n) { return n.index; });
-    const { serverStart } = await Promise.resolve().then(function () { return require('./index-Db-mrTi0.cjs'); }).then(function (n) { return n.index; });
+    const { init } = await Promise.resolve().then(function () { return require('./index-CmRhhp3m.cjs'); }).then(function (n) { return n.index; });
+    const { serverStart } = await Promise.resolve().then(function () { return require('./index-B-Cevjk4.cjs'); }).then(function (n) { return n.index; });
     const globalConfig = {
         ffmpegPresetPath: path$1.join(c.configFolder, "ffmpeg_presets.json"),
         videoPresetPath: path$1.join(c.configFolder, "presets.json"),

package/lib/{linux-C-4qLKcq.cjs → linux-BFUWjr8o.cjs}

@@ -4,7 +4,7 @@ var os$3 = require('node:os');
 var path$5 = require('node:path');
 var fs$3 = require('node:fs');
 var crypto = require('node:crypto');
-var index = require('./index-ByKMHGR7.cjs');
+var index = require('./index-CmRhhp3m.cjs');
 var require$$0$1 = require('fs');
 var require$$0 = require('path');
 var require$$0$2 = require('child_process');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bililive-cli",
-  "version": "3.22.0",
+  "version": "3.22.1",
   "type": "module",
   "description": "biliLive-tools的cli程序",
   "main": "./lib/index.js",
@@ -41,9 +41,9 @@
     "commander": "^12.1.0",
     "rimraf": "^6.0.1",
     "tsx": "^4.19.2",
-    "@biliLive-tools/shared": "3.22.0",
-    "@biliLive-tools/types": "3.22.0",
-    "@biliLive-tools/http": "3.22.0"
+    "@biliLive-tools/shared": "3.22.1",
+    "@biliLive-tools/http": "3.22.1",
+    "@biliLive-tools/types": "3.22.1"
   },
   "scripts": {
     "start": "tsx src/index.ts",