bililive-cli 3.10.1 → 3.11.0

package/lib/{index-DOo0dewT.cjs → index-DmrbnwzK.cjs}

@@ -4,7 +4,7 @@ var path$7 = require('node:path');
 var require$$2$1 = require('node:http');
 var require$$1$2 = require('node:url');
 var a = require('node:https');
-var index = require('./index-CuJEbURl.cjs');
+var index = require('./index-aJuLOmr2.cjs');
 var require$$0$4 = require('tty');
 var require$$1$3 = require('util');
 var require$$0$b = require('assert');
@@ -277,7 +277,7 @@ class BaiduPCS extends index.TypedEmitter {
         try {
             // 执行上传
             this.logger.info(`开始上传: ${localFilePath} 到 ${targetDir}`);
-            const args = ["upload", localFilePath, targetDir];
+            const args = ["upload", localFilePath, targetDir, "--norapid"];
             console.log(options);
             // if (options?.retry !== undefined) {
             //   args.push("--retry", options.retry.toString());
@@ -368,6 +368,25 @@ class BaiduPCS extends index.TypedEmitter {
     }
 }
 
+const createdDirCache = new Set();
+const pendingDirRequests = new Map();
+const driveIdCache = new Map();
+const pendingDriveIdRequests = new Map();
+const driveLabels = {
+    backup: ["备份盘", "文件网盘"],
+    resource: ["资源库"],
+};
+function normalizeRemotePath(remotePath) {
+    return path$7.posix.normalize(remotePath.replace(/\\/g, "/"));
+}
+function isDirectoryAlreadyExistsError(error) {
+    if (!(error instanceof Error))
+        return false;
+    const errorMessage = error.message.toLowerCase();
+    return (errorMessage.includes("already exists") ||
+        errorMessage.includes("file exists") ||
+        errorMessage.includes("已存在"));
+}
 /**
  * 阿里云盘上传类
  * 使用 aliyunpan 工具进行文件上传
@@ -376,6 +395,7 @@ class AliyunPan extends index.TypedEmitter {
     binary;
     remotePath;
     logger;
+    driveType;
     cmd = null;
     loginCmd = null; // 专门用于登录的进程
     constructor(options) {
@@ -383,9 +403,16 @@ class AliyunPan extends index.TypedEmitter {
         this.binary = options?.binary || "aliyunpan";
         this.remotePath = options?.remotePath || "/录播";
         this.logger = options?.logger || index.logObj;
+        this.driveType = options?.driveType || "backup";
         // 检查aliyunpan是否安装
         // this.checkInstallation();
     }
+    static clearCaches() {
+        createdDirCache.clear();
+        pendingDirRequests.clear();
+        driveIdCache.clear();
+        pendingDriveIdRequests.clear();
+    }
     /**
      * 检查aliyunpan是否已安装
      */
@@ -410,6 +437,109 @@ class AliyunPan extends index.TypedEmitter {
             return false;
         }
     }
+    getDriveIdCacheKey() {
+        return `${this.binary}:${this.driveType}`;
+    }
+    async resolveDriveId() {
+        const cacheKey = this.getDriveIdCacheKey();
+        const cachedDriveId = driveIdCache.get(cacheKey);
+        if (cachedDriveId) {
+            return cachedDriveId;
+        }
+        const pendingRequest = pendingDriveIdRequests.get(cacheKey);
+        if (pendingRequest) {
+            return pendingRequest;
+        }
+        const requestPromise = new Promise((resolve, reject) => {
+            const driveCmd = require$$1$1.spawn(this.binary, ["drive"], {
+                stdio: ["ignore", "pipe", "pipe"],
+                windowsHide: true,
+            });
+            let stdout = "";
+            let stderr = "";
+            let isSettled = false;
+            const timer = setTimeout(() => {
+                isSettled = true;
+                driveCmd.kill();
+                reject(new Error("解析阿里云盘 driveId 超时"));
+            }, 10000);
+            const cleanup = () => {
+                clearTimeout(timer);
+                pendingDriveIdRequests.delete(cacheKey);
+            };
+            const tryResolveDriveId = (data) => {
+                stdout += data.toString();
+                const driveId = this.parseDriveId(stdout, this.driveType);
+                if (!driveId || isSettled)
+                    return;
+                isSettled = true;
+                cleanup();
+                driveIdCache.set(cacheKey, driveId);
+                resolve(driveId);
+                driveCmd.kill();
+            };
+            driveCmd.stdout.on("data", tryResolveDriveId);
+            driveCmd.stderr.on("data", (data) => {
+                stderr += data.toString();
+            });
+            driveCmd.on("close", (code) => {
+                cleanup();
+                if (isSettled)
+                    return;
+                reject(new Error(`解析阿里云盘 driveId 失败: ${stderr || stdout || code}`));
+            });
+            driveCmd.on("error", (error) => {
+                cleanup();
+                if (isSettled)
+                    return;
+                reject(error);
+            });
+        });
+        pendingDriveIdRequests.set(cacheKey, requestPromise);
+        return requestPromise;
+    }
+    parseDriveId(output, driveType) {
+        const lines = output.split("\n");
+        for (const line of lines) {
+            if (!driveLabels[driveType].some((label) => line.includes(label)))
+                continue;
+            const tokens = line.match(/[A-Za-z0-9_-]{6,}/g);
+            if (tokens?.length) {
+                return tokens.at(-1) ?? null;
+            }
+        }
+        return null;
+    }
+    getDirCacheKey(remotePath, driveId) {
+        return `${this.binary}:${driveId}:${remotePath}`;
+    }
+    async ensureRemoteDir(remotePath, driveId) {
+        const normalizedPath = normalizeRemotePath(remotePath);
+        const cacheKey = this.getDirCacheKey(normalizedPath, driveId);
+        if (createdDirCache.has(cacheKey)) {
+            return;
+        }
+        const pendingRequest = pendingDirRequests.get(cacheKey);
+        if (pendingRequest) {
+            return pendingRequest;
+        }
+        const requestPromise = (async () => {
+            try {
+                await this.executeCommand(["mkdir", normalizedPath, "--driveId", driveId]);
+            }
+            catch (error) {
+                if (!isDirectoryAlreadyExistsError(error)) {
+                    throw error;
+                }
+                this.logger.warn(`目录已存在，跳过创建: ${normalizedPath}`);
+            }
+            createdDirCache.add(cacheKey);
+        })().finally(() => {
+            pendingDirRequests.delete(cacheKey);
+        });
+        pendingDirRequests.set(cacheKey, requestPromise);
+        return requestPromise;
+    }
     /**
      * 执行aliyunpan命令
      * @param args 命令参数
@@ -511,13 +641,13 @@ class AliyunPan extends index.TypedEmitter {
             this.emit("error", error);
             throw error;
         }
-        // 确保目标文件夹存在
-        const targetDir = path$7.join(this.remotePath, remoteDir).replace(/\\/g, "/");
-        await this.executeCommand(["mkdir", targetDir]);
+        const driveId = await this.resolveDriveId();
+        const targetDir = normalizeRemotePath(path$7.join(this.remotePath, remoteDir));
+        await this.ensureRemoteDir(targetDir, driveId);
         try {
             // 执行上传
             this.logger.info(`开始上传: ${localFilePath} 到 ${targetDir}`);
-            const args = ["upload", localFilePath, targetDir, "--norapid"];
+            const args = ["upload", localFilePath, targetDir, "--norapid", "--driveId", driveId];
             // 添加覆盖策略选项
             if (options?.policy === "overwrite") {
                 args.push("--ow");
@@ -596,6 +726,7 @@ class AliyunPan extends index.TypedEmitter {
                     this.loginCmd.on("close", (code) => {
                         if (code === 0) {
                             if (hasLoginSuccess) {
+                                AliyunPan.clearCaches();
                                 this.logger.info("close: 阿里云盘登录成功");
                                 this.loginCmd = null;
                                 resolve();
@@ -717,8 +848,9 @@ class AliyunPan extends index.TypedEmitter {
      */
     async mkdir(remotePath) {
         try {
-            const targetPath = path$7.join(this.remotePath, remotePath).replace(/\\/g, "/");
-            await this.executeCommand(["mkdir", targetPath]);
+            const driveId = await this.resolveDriveId();
+            const targetPath = normalizeRemotePath(path$7.join(this.remotePath, remotePath));
+            await this.ensureRemoteDir(targetPath, driveId);
             this.logger.info(`创建目录成功: ${targetPath}`);
             return true;
         }
@@ -30850,6 +30982,48 @@ async function getLiveInfo(ids) {
         .map((item) => item.value);
     return list;
 }
+async function batchStartRecord(ids) {
+    const recorderManager = exports.container.resolve("recorderManager");
+    const requests = ids.map(async (id) => {
+        try {
+            await recorderManager.manager.startRecord(id);
+            return { id, success: true };
+        }
+        catch (error) {
+            return { id, success: false, error: error.message || "开始录制失败" };
+        }
+    });
+    const results = await Promise.allSettled(requests);
+    const finalResults = results
+        .filter((item) => item.status === "fulfilled")
+        .map((item) => item.value);
+    return {
+        results: finalResults,
+        successCount: finalResults.filter((r) => r.success).length,
+        failedCount: finalResults.filter((r) => !r.success).length,
+    };
+}
+async function batchStopRecord(ids) {
+    const recorderManager = exports.container.resolve("recorderManager");
+    const requests = ids.map(async (id) => {
+        try {
+            await recorderManager.manager.stopRecord(id);
+            return { id, success: true };
+        }
+        catch (error) {
+            return { id, success: false, error: error.message || "停止录制失败" };
+        }
+    });
+    const results = await Promise.allSettled(requests);
+    const finalResults = results
+        .filter((item) => item.status === "fulfilled")
+        .map((item) => item.value);
+    return {
+        results: finalResults,
+        successCount: finalResults.filter((r) => r.success).length,
+        failedCount: finalResults.filter((r) => !r.success).length,
+    };
+}
 var recorderService = {
     getRecorders,
     getRecorderNum,
@@ -30861,6 +31035,8 @@ var recorderService = {
     stopRecord,
     cutRecord,
     getLiveInfo,
+    batchStartRecord,
+    batchStopRecord,
     resolveChannel,
     batchResolveChannel,
     getBiliStream,
@@ -76719,10 +76895,36 @@ router$9.post("/:id/stop_record", async (ctx) => {
     const { id } = ctx.params;
     ctx.body = { payload: await recorderService.stopRecord({ id }) };
 });
+/**
+ * 切割录制
+ * @route POST /recorder/:recorderId/cut
+ * @param recorderId 直播间ID
+ * @returns 录制任务信息
+ */
 router$9.post("/:id/cut", async (ctx) => {
     const { id } = ctx.params;
     ctx.body = { payload: await recorderService.cutRecord({ id }) };
 });
+/**
+ * 批量开始录制
+ * @route POST /recorder/manager/batch_start_record
+ * @param ids 直播间ID列表
+ * @returns 批量操作结果
+ */
+router$9.post("/manager/batch_start_record", async (ctx) => {
+    const { ids } = ctx.request.body;
+    ctx.body = { payload: await recorderService.batchStartRecord(ids) };
+});
+/**
+ * 批量停止录制
+ * @route POST /recorder/manager/batch_stop_record
+ * @param ids 直播间ID列表
+ * @returns 批量操作结果
+ */
+router$9.post("/manager/batch_stop_record", async (ctx) => {
+    const { ids } = ctx.request.body;
+    ctx.body = { payload: await recorderService.batchStopRecord(ids) };
+});
 /**
  * 解析直播间地址，获取对应的直播间信息
  * @route GET /recorder/manager/resolveChannel
@@ -77682,14 +77884,27 @@ router$6.get("/download/:id", async (ctx) => {
 async function download$1(output, url, options) {
     if ((await index.fs.pathExists(output)) && !options.override)
         throw new Error(`${output}已存在`);
+    const { dir, name } = require$$0$6.parse(output);
+    const tsOutput = require$$0$6.join(dir, `${name}.ts`);
     const { ffmpegPath } = index.getBinPath();
-    const downloader = new index.M3U8Downloader(url, output, {
-        convert2Mp4: true,
+    const downloader = new index.M3U8Downloader(url, tsOutput, {
+        convert2Mp4: false,
         ffmpegPath: ffmpegPath,
         segmentsDir: require$$0$6.join(index.getTempPath(), index.uuid()),
     });
     const task = new index.KuaishouDownloadVideoTask(downloader, {
         name: `下载任务：${require$$0$6.parse(output).name}`,
+    }, {
+        onEnd: async () => {
+            const outputName = `${name}.mp4`;
+            await index.transcode(tsOutput, outputName, { encoder: "copy", audioCodec: "copy" }, {
+                saveType: 2,
+                savePath: dir,
+                override: false,
+                removeOrigin: true,
+                autoRun: true,
+            });
+        },
     });
     index.taskQueue.addTask(task, true);
     return task;
@@ -78418,6 +78633,7 @@ const createUploadInstance = async (opts) => {
         return new AliyunPan({
             binary: opts.execPath,
             remotePath: opts.remotePath ?? "",
+            driveType: opts.aliyunpanDriveType,
         });
     }
     else if (opts.type === "alist") {
@@ -78448,7 +78664,7 @@ const createUploadInstance = async (opts) => {
         throw new Error("Unsupported type");
     }
 };
-const addSyncTask = async ({ input, remotePath, execPath, policy, type, removeOrigin, apiUrl, username, password, clientId, clientSecret, stringFilters, }) => {
+const addSyncTask = async ({ input, remotePath, execPath, policy, type, removeOrigin, apiUrl, username, password, clientId, clientSecret, aliyunpanDriveType, stringFilters, }) => {
     const { binary: binaryPath, apiUrl: iApiUrl, username: iUsername, password: iPassword, clientId: iClientId, clientSecret: iClientSecret, limitRate, retry, } = getConfig(type);
     const instance = await createUploadInstance({
         type,
@@ -78459,6 +78675,7 @@ const addSyncTask = async ({ input, remotePath, execPath, policy, type, removeOr
         password: password ?? iPassword,
         clientId: clientId ?? iClientId,
         clientSecret: clientSecret ?? iClientSecret,
+        aliyunpanDriveType,
         limitRate: limitRate ?? 0,
         stringFilters,
         retry,
@@ -78661,12 +78878,13 @@ router$2.get("/aliyunpanLogin", async (ctx) => {
 router$2.post("/sync", async (ctx) => {
     const params = ctx.request.body;
     // @ts-ignore
-    const { file, type, options, targetPath } = params;
+    const { file, type, options, targetPath, aliyunpanDriveType } = params;
     const task = await addSyncTask({
         input: file,
         type: type,
         removeOrigin: options.removeOrigin,
         remotePath: targetPath,
+        aliyunpanDriveType,
     });
     ctx.body = task.taskId;
 });
@@ -80427,6 +80645,7 @@ class WebhookHandler {
                 retry: 3,
                 policy: "skip",
                 type: syncConfig.syncSource,
+                aliyunpanDriveType: syncConfig.aliyunpanDriveType,
             });
             index.logObj.info(`开始同步${fileType}文件: ${filePath}`);
             task.on("task-end", async () => {
@@ -80718,12 +80937,12 @@ class WebhookHandler {
      * 处理审核后删除的引用计数和回调
      * @private
      */
-    setupDeleteAfterCheckLock(pathArray) {
+    setupDeleteAfterCheckLock(pathArray, afterUploadDeletAction) {
         // 返回 checkCallback
         return async (status) => {
-            console.log(`审核状态: ${status}`, pathArray);
-            if (status === "completed") {
-                // 审核通过，释放引用（会自动删除）
+            // console.log(`审核状态: ${status}`, pathArray);
+            if (status === "completed" && afterUploadDeletAction === "deleteAfterCheck") {
+                // 审核通过且配置为审核后删除，释放引用（会自动删除）
                 for (const { path } of pathArray) {
                     await this.fileRefManager.releaseRef(path);
                 }
@@ -80731,7 +80950,7 @@ class WebhookHandler {
         };
     }
     addUploadTask = async (uid, pathArray, options, limitedUploadTime, afterUploadDeletAction) => {
-        const checkCallback = this.setupDeleteAfterCheckLock(pathArray);
+        const checkCallback = this.setupDeleteAfterCheckLock(pathArray, afterUploadDeletAction);
         const task = await index.biliApi.addMedia(pathArray, options, uid, {
             limitedUploadTime,
             afterUploadDeletAction: "none",
@@ -80740,9 +80959,9 @@ class WebhookHandler {
         });
         return this.handleUploadTask(task, pathArray);
     };
-    addEditMediaTask = async (uid, aid, pathArray, limitedUploadTime, afterUploadDeletAction) => {
-        const checkCallback = this.setupDeleteAfterCheckLock(pathArray);
-        const task = await index.biliApi.editMedia(aid, pathArray, {}, uid, {
+    addEditMediaTask = async (uid, aid, pathArray, uploadPreset, limitedUploadTime, afterUploadDeletAction) => {
+        const checkCallback = this.setupDeleteAfterCheckLock(pathArray, afterUploadDeletAction);
+        const task = await index.biliApi.editMedia(aid, pathArray, uploadPreset, uid, {
             limitedUploadTime,
             afterUploadDeletAction: "none",
             forceCheck: afterUploadDeletAction === "deleteAfterCheck",
@@ -80866,13 +81085,13 @@ class WebhookHandler {
      * 执行续传操作
      * @private
      */
-    async performContinueUpload(live, aid, filePaths, type, config, limitedUploadTime) {
+    async performContinueUpload(live, aid, filePaths, type, config, uploadPreset, limitedUploadTime) {
         index.logObj.info("续传", filePaths);
         live.batchUpdateUploadStatus(filePaths.map((item) => item.part), "uploading", type);
         await this.addEditMediaTask(config.uid, aid, filePaths.map((item) => ({
             path: item.path,
             title: item.title,
-        })), limitedUploadTime, config.afterUploadDeletAction);
+        })), uploadPreset, limitedUploadTime, config.afterUploadDeletAction);
         live.batchUpdateUploadStatus(filePaths.map((item) => item.part), "uploaded", type);
     }
     /**
@@ -80922,7 +81141,7 @@ class WebhookHandler {
         try {
             // 8. 执行上传（续传或新上传）
             if (live[aidField]) {
-                await this.performContinueUpload(live, live[aidField], filePaths, type, config, limitedUploadTime);
+                await this.performContinueUpload(live, live[aidField], filePaths, type, config, uploadPreset, limitedUploadTime);
             }
             else {
                 await this.performNewUpload(live, filePaths, type, config, uploadPreset, limitedUploadTime);
@@ -80993,7 +81212,7 @@ exports.handler = void 0;
 exports.appConfig = void 0;
 exports.container = void 0;
 const fileCache = createFileCache();
-path$7.dirname(require$$1$2.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-DOo0dewT.cjs', document.baseURI).href))));
+path$7.dirname(require$$1$2.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-DmrbnwzK.cjs', document.baseURI).href))));
 const authMiddleware = (passKey) => {
     return async (ctx, next) => {
         const authHeader = ctx.headers["authorization"] || ctx.request.query.auth;

package/lib/{index-CuJEbURl.cjs → index-aJuLOmr2.cjs}

@@ -11408,6 +11408,7 @@ const APP_DEFAULT_CONFIG = {
         fileSync: {
             removeOrigin: false,
             syncType: undefined,
+            aliyunpanDriveType: "backup",
             targetPath: "/",
         },
         danmu: {
@@ -11646,7 +11647,7 @@ const APP_DEFAULT_CONFIG = {
         line: undefined,
         checkInterval: 60,
         maxThreadCount: 3,
-        waitTime: 0,
+        waitTime: 500,
         disableProvideCommentsWhenRecording: false,
         segment: "90",
         saveGiftDanma: false,
@@ -44555,7 +44556,7 @@ async function trash(paths, options) {
 	} else if (process$2.platform === 'win32') {
 		module = await Promise.resolve().then(function () { return require('./windows-OmnJ7a39.cjs'); });
 	} else {
-		module = await Promise.resolve().then(function () { return require('./linux-CINV_k6s.cjs'); });
+		module = await Promise.resolve().then(function () { return require('./linux-fd_XbwNY.cjs'); });
 	}
 
 	return module.default(paths);
@@ -192718,9 +192719,11 @@ async function download$1(output, decodeData, options) {
     }
     if (!m3u8Url)
         throw new Error("无法找到对应的流");
+    const { dir, name } = path$y.parse(output);
+    const tsOutput = path$y.join(dir, `${name}.ts`);
     const { ffmpegPath } = getBinPath();
-    const downloader = new M3U8Downloader(m3u8Url, output, {
-        convert2Mp4: true,
+    const downloader = new M3U8Downloader(m3u8Url, tsOutput, {
+        convert2Mp4: false,
         ffmpegPath: ffmpegPath,
         segmentsDir: path$y.join(getTempPath(), uuid$4()),
     });
@@ -192733,6 +192736,14 @@ async function download$1(output, decodeData, options) {
                 const xml = convert2Xml(danmu, options.danmuMeta || {});
                 fs$k.writeFile(path$y.join(path$y.dirname(output), `${path$y.parse(output).name}.xml`), xml);
             }
+            const outputName = `${name}.mp4`;
+            await transcode(tsOutput, outputName, { encoder: "copy", audioCodec: "copy" }, {
+                saveType: 2,
+                savePath: dir,
+                override: false,
+                removeOrigin: true,
+                autoRun: true,
+            });
         },
     });
     taskQueue.addTask(task, false);
@@ -192774,14 +192785,27 @@ var douyu = { download: download$1, parseVideo: parseVideo$1, getAvailableStream
 async function download(output, url, options) {
     if ((await fs$k.pathExists(output)) && !options.override)
         throw new Error(`${output}已存在`);
+    const { dir, name } = path$y.parse(output);
+    const tsOutput = path$y.join(dir, `${name}.ts`);
     const { ffmpegPath } = getBinPath();
-    const downloader = new M3U8Downloader(url, output, {
-        convert2Mp4: true,
+    const downloader = new M3U8Downloader(url, tsOutput, {
+        convert2Mp4: false,
         ffmpegPath: ffmpegPath,
         segmentsDir: path$y.join(getTempPath(), uuid$4()),
     });
     const task = new HuyaDownloadVideoTask(downloader, {
         name: `下载任务：${path$y.parse(output).name}`,
+    }, {
+        onEnd: async () => {
+            const outputName = `${name}.mp4`;
+            await transcode(tsOutput, outputName, { encoder: "copy", audioCodec: "copy" }, {
+                saveType: 2,
+                savePath: dir,
+                override: false,
+                removeOrigin: true,
+                autoRun: true,
+            });
+        },
     });
     taskQueue.addTask(task, true);
     return task;
@@ -214068,6 +214092,22 @@ async function getRoomInfoByWeb(webRoomId, opts = {}) {
             "User-Agent": ua,
         },
     });
+    if (res.data.status_code === 30003) {
+        // 直播已结束
+        return {
+            living: false,
+            nickname: "",
+            sec_uid: "",
+            avatar: "",
+            api: "web",
+            room: {
+                title: "",
+                cover: "",
+                id_str: "",
+                stream_url: null,
+            },
+        };
+    }
     assert$i(res.data.status_code === 0, `Unexpected resp, code ${res.data.status_code}, msg ${JSON.stringify(res.data.data)}, id ${webRoomId}, cookies: ${cookies}`);
     const data = res.data.data;
     const room = data?.data?.[0];
@@ -246387,9 +246427,14 @@ const checkLiveStatusAndRecord$1 = async function ({ getSavePath, banLiveId, isM
         const extraDataController = downloader.getExtraDataController();
         if (!extraDataController)
             return;
+        let timestamp = Date.now();
+        if (this.useServerTimestamp && msg.eventTime) {
+            // 某些消息可能没有 eventTime 字段
+            timestamp = Number(msg.eventTime) * 1000;
+        }
         const comment = {
             type: "comment",
-            timestamp: this.useServerTimestamp ? Number(msg.eventTime) * 1000 : Date.now(),
+            timestamp: timestamp,
             text: msg.content,
             color: "#ffffff",
             sender: {
@@ -287573,17 +287618,11 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
             roomId = info.roomId;
             liveStartTimeFromSearch = info.liveStartTime;
         }
+        console.log("roomid", roomId);
         if (!roomId)
             return null;
-        if (this.liveInfo?.liveId === banLiveId) {
-            this.tempStopIntervalCheck = true;
-        }
-        else {
-            this.tempStopIntervalCheck = false;
-        }
-        if (this.tempStopIntervalCheck)
-            return null;
         const liveInfo = await getInfo(roomId);
+        console.log("liveInfo", liveInfo);
         // @ts-ignore
         this.liveInfo = liveInfo;
         if (liveStartTimeFromSearch) {
@@ -287596,6 +287635,14 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         throw error;
     }
     const { living, owner, title, liveStartTime, recordStartTime } = this.liveInfo;
+    if (this.liveInfo?.liveId === banLiveId) {
+        this.tempStopIntervalCheck = true;
+    }
+    else {
+        this.tempStopIntervalCheck = false;
+    }
+    if (this.tempStopIntervalCheck)
+        return null;
     if (!living)
         return null;
     // 检查标题是否包含关键词

package/lib/index.cjs

@@ -3715,7 +3715,7 @@ const {
   Help,
 } = commander;
 
-var version = "3.10.1";
+var version = "3.11.0";
 
 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-CuJEbURl.cjs'); }).then(function (n) { return n.index; });
-    const { serverStart } = await Promise.resolve().then(function () { return require('./index-DOo0dewT.cjs'); });
+    const { init } = await Promise.resolve().then(function () { return require('./index-aJuLOmr2.cjs'); }).then(function (n) { return n.index; });
+    const { serverStart } = await Promise.resolve().then(function () { return require('./index-DmrbnwzK.cjs'); });
     const globalConfig = {
         ffmpegPresetPath: path$1.join(c.configFolder, "ffmpeg_presets.json"),
         videoPresetPath: path$1.join(c.configFolder, "presets.json"),

package/lib/{linux-CINV_k6s.cjs → linux-fd_XbwNY.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-CuJEbURl.cjs');
+var index = require('./index-aJuLOmr2.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.10.1",
+  "version": "3.11.0",
   "type": "module",
   "description": "biliLive-tools的cli程序",
   "main": "./lib/index.js",
@@ -39,9 +39,9 @@
     "commander": "^12.1.0",
     "rimraf": "^6.0.1",
     "tsx": "^4.19.2",
-    "@biliLive-tools/http": "3.10.1",
-    "@biliLive-tools/shared": "3.10.1",
-    "@biliLive-tools/types": "3.10.1"
+    "@biliLive-tools/http": "3.11.0",
+    "@biliLive-tools/types": "3.11.0",
+    "@biliLive-tools/shared": "3.11.0"
   },
   "scripts": {
     "start": "tsx src/index.ts",