bililive-cli 3.12.1 → 3.13.0

package/lib/{index-BeyiZ-FP.cjs → index-Bw3nOSUH.cjs}

@@ -11363,12 +11363,12 @@ const APP_DEFAULT_CONFIG = {
         hotProgressColor: "#f9f5f3",
         hotProgressFillColor: "#333333",
         convert2Mp4: false,
-        removeSourceAferrConvert2Mp4: true,
         flvRepair: false,
         syncId: undefined,
         uploadHandleTime: ["00:00:00", "23:59:59"],
         limitUploadTime: false,
         uploadNoDanmu: false,
+        uploadToSameMedia: false,
         noDanmuVideoPreset: undefined,
         limitVideoConvertTime: false,
         videoHandleTime: ["00:00:00", "23:59:59"],
@@ -54494,7 +54494,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-CUI0soP3.cjs'); });
+		module = await Promise.resolve().then(function () { return require('./linux-CXmRE85w.cjs'); });
 	}
 
 	return module.default(paths);
@@ -65707,8 +65707,9 @@ class Platform extends BaseRequest {
      */
     async editMediaWebApi(videos, options, mode) {
         this.auth.authLogin();
+        const { sortByCid, ...mediaOptions } = options;
         const archive = await this.getArchive({
-            aid: options.aid,
+            aid: mediaOptions.aid,
         });
         const archiveData = archive.archive;
         for (const key of [
@@ -65725,9 +65726,9 @@ class Platform extends BaseRequest {
             videos: [],
             ...archiveData,
             csrf: csrf,
-            ...options,
+            ...mediaOptions,
             watermark: {
-                state: options.watermark?.state ?? archive.watermark.state,
+                state: mediaOptions.watermark?.state ?? archive.watermark.state,
             },
         };
         this.checkOptions(data);
@@ -65740,10 +65741,10 @@ class Platform extends BaseRequest {
             data.desc = this.convertDescV2ToDesc(data.desc_v2);
         }
         if (mode === "append") {
-            data.videos = [...archive.videos, ...videos];
+            data.videos = this.sortVideosByCid([...archive.videos, ...videos], sortByCid);
         }
         else if (mode === "replace") {
-            data.videos = videos;
+            data.videos = this.sortVideosByCid(videos, sortByCid);
         }
         else {
             throw new Error("mode can only be append or replace");
@@ -65872,6 +65873,29 @@ class Platform extends BaseRequest {
         // }
         return true;
     }
+    sortVideosByCid(videos, cidOrder) {
+        if (!cidOrder || cidOrder.length === 0) {
+            return videos;
+        }
+        const orderMap = new Map();
+        cidOrder.forEach((cid, index) => {
+            if (!orderMap.has(cid)) {
+                orderMap.set(cid, index);
+            }
+        });
+        const matchedVideos = [];
+        const unmatchedVideos = [];
+        videos.forEach(video => {
+            const order = orderMap.get(video.cid);
+            if (order === undefined) {
+                unmatchedVideos.push(video);
+                return;
+            }
+            matchedVideos.push({ video, order });
+        });
+        matchedVideos.sort((left, right) => left.order - right.order);
+        return [...matchedVideos.map(item => item.video), ...unmatchedVideos];
+    }
     /**
      * 获取推荐标签
      * subtype,title,description三个参数对结果影响较大
@@ -66923,7 +66947,10 @@ class Video extends BaseRequest {
         const duration = detail.View?.duration;
         if (!duration)
             throw new Error("视频时长获取失败");
-        const totalSegment = Math.ceil(duration / 360);
+        const part = detail.View?.pages?.find((p) => p.cid === params.cid);
+        if (!part)
+            throw new Error("未找到对应cid的视频分P");
+        const totalSegment = Math.ceil(part.duration / 360);
         const dmList = [];
         // 从1开始
         for (let i = 0; i < totalSegment; i++) {
@@ -179736,31 +179763,119 @@ async function drawSmoothLineChart(data, width, height) {
     return canvas$1;
 }
 
+const createEmptyXmlBuckets = () => ({
+    danmu: [],
+    sc: [],
+    guard: [],
+    gift: [],
+});
+const isXmlDanmuItemType = (value) => {
+    return ["danmu", "sc", "guard", "gift"].includes(String(value));
+};
+const isValidXmlItemForType = (type, item) => {
+    if (type === "danmu") {
+        return typeof item["@_p"] === "string" && item["@_p"].length > 0;
+    }
+    return ((typeof item["@_ts"] === "string" && item["@_ts"].length > 0) ||
+        typeof item["@_ts"] === "number");
+};
+const logInvalidTransformedItem = (reason, sourceType, item, targetType) => {
+    logObj.error("filterFunction transform item dropped", {
+        reason,
+        sourceType,
+        targetType,
+        item,
+    });
+};
+const createFilterFunction = (filterFunction) => {
+    if (!filterFunction.includes("filter")) {
+        return;
+    }
+    return new Function("type", "danmu", "logger", `
+    ${filterFunction}
+    return filter(type, danmu, logger);`);
+};
+const createTransformFunction = (filterFunction) => {
+    if (!filterFunction.includes("transform")) {
+        return;
+    }
+    return new Function("type", "danmu", "logger", `
+    ${filterFunction}
+    return transform(type, danmu, logger);`);
+};
+const transformXmlItem = (sourceType, item, transformFunc) => {
+    const transformed = transformFunc(sourceType, item, logObj);
+    if (transformed == null || transformed === false) {
+        return null;
+    }
+    const candidate = transformed === true || transformed === undefined ? item : transformed;
+    if (typeof candidate !== "object" || candidate === null || Array.isArray(candidate)) {
+        logInvalidTransformedItem("transform must return an object", sourceType, candidate);
+        return null;
+    }
+    const nextType = "type" in candidate ? candidate.type : sourceType;
+    if (!isXmlDanmuItemType(nextType)) {
+        logInvalidTransformedItem("unsupported target type", sourceType, candidate, nextType);
+        return null;
+    }
+    const normalizedItem = { ...candidate };
+    delete normalizedItem.type;
+    if (!isValidXmlItemForType(nextType, normalizedItem)) {
+        logInvalidTransformedItem("missing required fields for target type", sourceType, candidate, nextType);
+        return null;
+    }
+    return {
+        type: nextType,
+        item: normalizedItem,
+    };
+};
+const processXmlItems = (events, filterFunction) => {
+    const buckets = createEmptyXmlBuckets();
+    const filterFunc = createFilterFunction(filterFunction);
+    const transformFunc = createTransformFunction(filterFunction);
+    for (const event of events) {
+        if (filterFunc && !filterFunc(event.sourceType, event.item, logObj)) {
+            continue;
+        }
+        if (!transformFunc) {
+            buckets[event.sourceType].push(event.item);
+            continue;
+        }
+        const transformedItem = transformXmlItem(event.sourceType, event.item, transformFunc);
+        if (!transformedItem) {
+            continue;
+        }
+        buckets[transformedItem.type].push(transformedItem.item);
+    }
+    return buckets;
+};
+const createXmlEvents = (items, sourceType) => {
+    const result = [];
+    for (const item of items) {
+        result.push({
+            sourceType,
+            item,
+        });
+    }
+    return result;
+};
 /**
- * 生成过滤后的xml文件
+ * 生成经过自定义处理后的xml文件
  * @param input
  * @param output
- * @param filterFunction
+ * @param options
  * @returns
  */
-const genFilteredXml = async (input, output, filterFunction) => {
-    const filterFunc = new Function("type", "danmu", "logger", `
-    ${filterFunction}
-    return filter(type, danmu, logger);`);
+const genProcessedXml = async (input, output, filterFunction) => {
     const { jObj, danmuku, sc, guard, gift } = await parseXmlFile(input, true);
-    const filteredDanmuku = danmuku.filter((item) => {
-        return filterFunc("danmu", item, logObj);
-    });
-    const filteredSc = sc.filter((item) => {
-        return filterFunc("sc", item, logObj);
-    });
-    const filteredGuard = guard.filter((item) => {
-        return filterFunc("guard", item, logObj);
-    });
-    const filteredGift = gift.filter((item) => {
-        return filterFunc("gift", item, logObj);
-    });
-    const xmlData = generateMergedXmlContent(filteredDanmuku, filteredGift, filteredSc, filteredGuard, jObj.i?.metadata || {});
+    const events = [
+        ...createXmlEvents(danmuku, "danmu"),
+        ...createXmlEvents(sc, "sc"),
+        ...createXmlEvents(guard, "guard"),
+        ...createXmlEvents(gift, "gift"),
+    ];
+    const processedBuckets = processXmlItems(events, filterFunction);
+    const xmlData = generateMergedXmlContent(processedBuckets.danmu, processedBuckets.gift, processedBuckets.sc, processedBuckets.guard, jObj.i?.metadata || {});
     await fs$k.writeFile(output, xmlData);
     return output;
 };
@@ -179785,10 +179900,13 @@ const addConvertDanmu2AssTask = async (originInput, output, danmuOptions, option
         opts = await customChangeFunc(originInput, opts);
     }
     let filteredOutput;
-    if (opts.filterFunction && (opts.filterFunction ?? "").includes("filter")) {
-        // 如果存在自定义过滤函数，则需要把过滤后的xml保存到临时文件夹中
+    const hasFilterFunction = Boolean((opts.filterFunction ?? "").trim()) && (opts.filterFunction ?? "").includes("filter");
+    const hasTransformFunction = Boolean((opts.filterFunction ?? "").trim()) &&
+        (opts.filterFunction ?? "").includes("transform");
+    if (hasTransformFunction || hasFilterFunction) {
+        // 如果存在自定义数据处理函数，则需要把处理后的xml保存到临时文件夹中
         filteredOutput = path$y.join(tempDir, `${uuid$5()}.xml`);
-        await genFilteredXml(originInput, filteredOutput, opts.filterFunction);
+        await genProcessedXml(originInput, filteredOutput, opts.filterFunction);
     }
     if (opts.blacklist) {
         const fileTxtPath = path$y.join(tempDir, `${uuid$5()}.txt`);
@@ -181468,8 +181586,10 @@ async function addMediaApi(uid, video, options) {
  * 编辑视频接口
  */
 async function editMediaApi(uid, aid, video, options) {
-    const mediaOptions = {};
-    console.log("编辑视频", options);
+    const mediaOptions = {
+        sortByCid: options.sortByCid,
+    };
+    // console.log("编辑视频", options);
     // const globalConfig = container.resolve("globalConfig");
     // const mediaOptions = formatOptions(options, path.join(globalConfig.userDataPath, "cover"));
     const client = createClient(uid);
@@ -181808,6 +181928,7 @@ async function editMedia(aid, filePath, options, uid, extraOptions) {
         uid,
         mediaOptions: formattedOptions,
         aid,
+        sortParams: extraOptions?.sortParams,
     }, {
         onEnd: async () => {
             // 审核检查
@@ -182159,6 +182280,8 @@ const biliApi = {
     editVideoPartName,
     queryVideoStatus,
     getPlayUrl,
+    readUser,
+    writeUser,
 };
 
 /**
@@ -184110,11 +184233,14 @@ class BiliPartVideoTask extends AbstractTask {
                     logObj.error(`task ${this.taskId} error: ${error}`);
                 }
             }
-            this.completedPart = data;
+            this.completedPart = {
+                ...data,
+                filePath: this.command.filePath,
+            };
             this.endTime = Date.now();
             // 重置进度追踪
             this.speedCalculator.reset();
-            callback.onEnd && callback.onEnd(data);
+            callback.onEnd && callback.onEnd(this.completedPart);
             this.emitter.emit("task-end", { taskId: this.taskId });
         });
         command.emitter.on("error", (err) => {
@@ -184161,6 +184287,7 @@ class BiliPartVideoTask extends AbstractTask {
                         cid: part.cid,
                         filename: part.filename,
                         title: this.command.title,
+                        filePath: this.command.filePath,
                     };
                     this.endTime = Date.now();
                     // 重置进度追踪
@@ -184365,7 +184492,7 @@ class BiliAddVideoTask extends BiliVideoTask {
             this.progress = 100;
             this.callback.onEnd && this.callback.onEnd(data);
             this.output = String(data.aid);
-            this.emitter.emit("task-end", { taskId: this.taskId });
+            this.emitter.emit("task-end", { taskId: this.taskId, data: parts });
             uploadPartService.removeByCids(parts.map((part) => part.cid));
             exports.statisticsService.addOrUpdate({
                 where: { stat_key: this.lastUpdateTimeKey },
@@ -184391,10 +184518,12 @@ class BiliAddVideoTask extends BiliVideoTask {
 class BiliEditVideoTask extends BiliVideoTask {
     aid;
     mediaOptions;
+    sortParams;
     constructor(options, callback) {
         super(options, callback);
         this.aid = options.aid;
         this.mediaOptions = options.mediaOptions;
+        this.sortParams = options.sortParams;
         this.on("completed", () => {
             this.submit();
         });
@@ -184439,12 +184568,26 @@ class BiliEditVideoTask extends BiliVideoTask {
             return;
         }
         try {
-            const data = await retryWithAxiosError(() => editMediaApi(this.uid, this.aid, parts, this.mediaOptions), 5);
+            const sortByCid = [];
+            if (this.sortParams && Array.isArray(this.sortParams)) {
+                for (const param of this.sortParams) {
+                    if (param.cid) {
+                        sortByCid.push(param.cid);
+                    }
+                    else {
+                        const part = parts.find((p) => p.filePath === param.filePath);
+                        if (part) {
+                            sortByCid.push(part.cid);
+                        }
+                    }
+                }
+            }
+            const data = await retryWithAxiosError(() => editMediaApi(this.uid, this.aid, parts, { ...this.mediaOptions, sortByCid: sortByCid }), 5);
             this.status = "completed";
             this.progress = 100;
             this.callback.onEnd && this.callback.onEnd(data);
             this.output = String(data.aid);
-            this.emitter.emit("task-end", { taskId: this.taskId });
+            this.emitter.emit("task-end", { taskId: this.taskId, data: parts });
             uploadPartService.removeByCids(parts.map((part) => part.cid));
             exports.statisticsService.addOrUpdate({
                 where: { stat_key: this.lastUpdateTimeKey },
@@ -185517,7 +185660,7 @@ function getValuesFromArrayLikeFlexSpaceBetween(array, columnCount) {
     });
     return columnValues;
 }
-function ensureFolderExist$5(fileOrFolderPath) {
+function ensureFolderExist(fileOrFolderPath) {
     const folder = path$y.dirname(fileOrFolderPath);
     if (!fs$D.existsSync(folder)) {
         fs$D.mkdirSync(folder, { recursive: true });
@@ -185926,7 +186069,7 @@ var utils$2 = {
     replaceExtName,
     singleton: singleton$1,
     getValuesFromArrayLikeFlexSpaceBetween,
-    ensureFolderExist: ensureFolderExist$5,
+    ensureFolderExist,
     assert: assert$m,
     assertStringType,
     assertNumberType,
@@ -186408,11 +186551,20 @@ class Segment extends EventEmitter$j {
                 });
             }
         }
-        this.outputVideoFilePath = this.getSavePath({
+        let recordSavePath = this.getSavePath({
             startTime: startTime,
-            title: liveInfo?.title,
+            title: liveInfo?.title ? liveInfo.title : undefined,
         });
-        ensureFolderExist$5(this.outputVideoFilePath);
+        // 文件重复判断
+        if (require$$0$6.existsSync(recordSavePath + "." + this.videoExt)) {
+            recordSavePath = this.getSavePath({
+                startTime: startTime,
+                title: liveInfo?.title,
+                extraMs: true,
+            });
+        }
+        this.outputVideoFilePath = recordSavePath;
+        ensureFolderExist(this.outputVideoFilePath);
         if (!this.disableDanma) {
             this.extraDataController = createRecordExtraDataController(`${this.outputVideoFilePath}.xml`);
         }
@@ -186456,12 +186608,19 @@ class StreamManager extends EventEmitter$j {
     callBack;
     constructor(getSavePath, hasSegment, disableDanma, recorderType, videoFormat, callBack) {
         super();
-        const recordSavePath = getSavePath({ startTime: Date.now() });
-        this.recordSavePath = recordSavePath;
+        const startTime = Date.now();
+        let recordSavePath = getSavePath({ startTime });
         this.videoFormat = videoFormat;
         this.recorderType = recorderType;
         this.hasSegment = hasSegment;
         this.callBack = callBack;
+        console.log("Initial recordSavePath:", recordSavePath);
+        // 文件重复判断
+        if (require$$0$6.existsSync(recordSavePath + "." + videoFormat)) {
+            console.log("File already exists, generating new save path with extraMs");
+            recordSavePath = getSavePath({ startTime, extraMs: true });
+        }
+        this.recordSavePath = recordSavePath;
         if (hasSegment) {
             this.segment = new Segment(getSavePath, disableDanma, this.videoExt);
             this.segment.on("DebugLog", (data) => {
@@ -186475,6 +186634,7 @@ class StreamManager extends EventEmitter$j {
             });
         }
         else {
+            ensureFolderExist(recordSavePath);
             const extraDataSavePath = `${recordSavePath}.xml`;
             if (!disableDanma) {
                 this.extraDataController = createRecordExtraDataController(extraDataSavePath);
@@ -186932,6 +187092,9 @@ function genSavePathFromRule(manager, recorder, extData) {
         channelId,
     };
     let savePathRule = manager.savePathRule;
+    if (extData?.extraMs) {
+        savePathRule += "_{ms}";
+    }
     try {
         savePathRule = ejs.render(savePathRule, params);
     }
@@ -187331,6 +187494,11 @@ class BililiveDownloader extends EventEmitter$j {
         if (timeMatch) {
             time = timeMatch[1];
         }
+        const spaceMath = line.match(/下载进度:\s*([\d.]+\s*MB)\s*/);
+        if (spaceMath) {
+            const space = spaceMath[1];
+            time = time ? `${time} ${space}` : space;
+        }
         return {
             time,
         };
@@ -187590,7 +187758,7 @@ class FFmpegDownloader extends EventEmitter$j {
         let time = null;
         const timeMatch = line.match(/time=([0-9:.]+)/);
         if (timeMatch) {
-            time = timeMatch[1];
+            time = timeMatch[1].split(".")[0];
         }
         return {
             time,
@@ -187694,12 +187862,6 @@ function getBililivePath() {
     return bililivePath;
 }
 
-function ensureFolderExist$4(fileOrFolderPath) {
-    const folder = path$y.dirname(fileOrFolderPath);
-    if (!fs$D.existsSync(folder)) {
-        fs$D.mkdirSync(folder, { recursive: true });
-    }
-}
 const uuid$1 = () => {
     return crypto$c.randomUUID();
 };
@@ -195043,6 +195205,7 @@ const checkLiveStatusAndRecord$4 = async function ({ getSavePath, banLiveId, isM
             startTime: opts.startTime,
             liveStartTime,
             recordStartTime,
+            extraMs: opts.extraMs,
         }),
         disableDanma: this.disableProvideCommentsWhenRecording,
         videoFormat: this.videoFormat ?? "auto",
@@ -195052,20 +195215,6 @@ const checkLiveStatusAndRecord$4 = async function ({ getSavePath, banLiveId, isM
         const info = await getInfo$4(this.channelId);
         return info;
     });
-    const savePath = getSavePath({
-        owner,
-        title,
-        startTime: Date.now(),
-        liveStartTime,
-        recordStartTime,
-    });
-    try {
-        ensureFolderExist$4(savePath);
-    }
-    catch (err) {
-        this.state = "idle";
-        throw err;
-    }
     const handleVideoCreated = async ({ filename, title, cover, rawFilename }) => {
         this.emit("videoFileCreated", { filename, cover, rawFilename });
         if (title && this?.liveInfo) {
@@ -195277,7 +195426,7 @@ const checkLiveStatusAndRecord$4 = async function ({ getSavePath, banLiveId, isM
         recorderType: downloader.type,
         url: stream.url,
         downloaderArgs,
-        savePath: savePath,
+        savePath: downloader.videoFilePath,
         stop,
         cut,
     };
@@ -196180,12 +196329,6 @@ const requester$2 = axios.create({
     proxy: false,
 });
 
-function ensureFolderExist$3(fileOrFolderPath) {
-    const folder = path$y.dirname(fileOrFolderPath);
-    if (!fs$D.existsSync(folder)) {
-        fs$D.mkdirSync(folder, { recursive: true });
-    }
-}
 function assert$l(assertion, msg) {
     if (!assertion) {
         throw new Error(msg);
@@ -211223,6 +211366,7 @@ const checkLiveStatusAndRecord$3 = async function ({ getSavePath, banLiveId, isM
             startTime: opts.startTime,
             liveStartTime,
             recordStartTime,
+            extraMs: opts.extraMs,
         }),
         disableDanma: this.disableProvideCommentsWhenRecording,
         videoFormat: this.videoFormat ?? "auto",
@@ -211234,20 +211378,6 @@ const checkLiveStatusAndRecord$3 = async function ({ getSavePath, banLiveId, isM
         const info = await getInfo$3(this.channelId);
         return info;
     });
-    const savePath = getSavePath({
-        owner,
-        title,
-        startTime: Date.now(),
-        liveStartTime,
-        recordStartTime,
-    });
-    try {
-        ensureFolderExist$3(savePath);
-    }
-    catch (err) {
-        this.state = "idle";
-        throw err;
-    }
     const handleVideoCreated = async ({ filename, title, cover, rawFilename }) => {
         this.emit("videoFileCreated", { filename, cover, rawFilename });
         if (title && this?.liveInfo) {
@@ -211376,7 +211506,7 @@ const checkLiveStatusAndRecord$3 = async function ({ getSavePath, banLiveId, isM
         recorderType: downloader.type,
         url: stream.url,
         downloaderArgs,
-        savePath: savePath,
+        savePath: downloader.videoFilePath,
         stop,
         cut,
     };
@@ -211413,12 +211543,6 @@ const provider$3 = {
     },
 };
 
-function ensureFolderExist$2(fileOrFolderPath) {
-    const folder = path$y.dirname(fileOrFolderPath);
-    if (!fs$D.existsSync(folder)) {
-        fs$D.mkdirSync(folder, { recursive: true });
-    }
-}
 function assert$j(assertion, msg) {
     if (!assertion) {
         throw new Error(msg);
@@ -212924,6 +213048,7 @@ const checkLiveStatusAndRecord$2 = async function ({ getSavePath, isManualStart,
             startTime: opts.startTime,
             liveStartTime: liveStartTime,
             recordStartTime,
+            extraMs: opts.extraMs,
         }),
         formatName: streamOptions.format_name,
         disableDanma: this.disableProvideCommentsWhenRecording,
@@ -212936,20 +213061,6 @@ const checkLiveStatusAndRecord$2 = async function ({ getSavePath, isManualStart,
         const info = await getInfo$2(this.channelId);
         return info;
     });
-    const savePath = getSavePath({
-        owner,
-        title,
-        startTime: Date.now(),
-        liveStartTime: liveStartTime,
-        recordStartTime,
-    });
-    try {
-        ensureFolderExist$2(savePath);
-    }
-    catch (err) {
-        this.state = "idle";
-        throw err;
-    }
     const handleVideoCreated = async ({ filename, title, cover, rawFilename }) => {
         this.emit("videoFileCreated", { filename, cover, rawFilename });
         if (title && this?.liveInfo) {
@@ -213052,7 +213163,7 @@ const checkLiveStatusAndRecord$2 = async function ({ getSavePath, isManualStart,
         recorderType: downloader.type,
         url: stream.url,
         downloaderArgs,
-        savePath: savePath,
+        savePath: downloader.videoFilePath,
         stop,
         cut,
     };
@@ -213109,12 +213220,6 @@ function singleton(fn) {
         return promise;
     };
 }
-function ensureFolderExist$1(fileOrFolderPath) {
-    const folder = path$y.dirname(fileOrFolderPath);
-    if (!fs$D.existsSync(folder)) {
-        fs$D.mkdirSync(folder, { recursive: true });
-    }
-}
 function assert$i(assertion, msg) {
     if (!assertion) {
         throw new Error(msg);
@@ -249016,6 +249121,7 @@ const checkLiveStatusAndRecord$1 = async function ({ getSavePath, banLiveId, isM
             startTime: opts.startTime,
             liveStartTime: liveStartTime,
             recordStartTime,
+            extraMs: opts.extraMs,
         }),
         disableDanma: this.disableProvideCommentsWhenRecording,
         videoFormat: this.videoFormat ?? "auto",
@@ -249030,20 +249136,6 @@ const checkLiveStatusAndRecord$1 = async function ({ getSavePath, banLiveId, isM
         });
         return info;
     });
-    const savePath = getSavePath({
-        owner,
-        title,
-        startTime: Date.now(),
-        liveStartTime,
-        recordStartTime,
-    });
-    try {
-        ensureFolderExist$1(savePath);
-    }
-    catch (err) {
-        this.state = "idle";
-        throw err;
-    }
     const handleVideoCreated = async ({ filename, title, cover, rawFilename }) => {
         this.emit("videoFileCreated", { filename, cover, rawFilename });
         if (title && this?.liveInfo) {
@@ -249280,7 +249372,7 @@ const checkLiveStatusAndRecord$1 = async function ({ getSavePath, banLiveId, isM
         recorderType: downloader.type,
         url: stream.url,
         downloaderArgs,
-        savePath: savePath,
+        savePath: downloader.videoFilePath,
         stop,
         cut,
     };
@@ -290180,13 +290272,6 @@ async function getStream(opts) {
     };
 }
 
-function ensureFolderExist(fileOrFolderPath) {
-    const folder = path$y.dirname(fileOrFolderPath);
-    if (!fs$D.existsSync(folder)) {
-        fs$D.mkdirSync(folder, { recursive: true });
-    }
-}
-
 function createRecorder(opts) {
     // 内部实现时，应该只有 proxy 包裹的那一层会使用这个 recorder 标识符，不应该有直接通过
     // 此标志来操作这个对象的地方，不然会跳过 proxy 的拦截。
@@ -290357,6 +290442,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
             startTime: opts.startTime,
             liveStartTime,
             recordStartTime,
+            extraMs: opts.extraMs,
         }),
         disableDanma: this.disableProvideCommentsWhenRecording,
         videoFormat: this.videoFormat ?? "auto",
@@ -290365,20 +290451,6 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         const info = await getInfo(roomId);
         return info;
     });
-    const savePath = getSavePath({
-        owner,
-        title,
-        startTime: Date.now(),
-        liveStartTime,
-        recordStartTime,
-    });
-    try {
-        ensureFolderExist(savePath);
-    }
-    catch (err) {
-        this.state = "idle";
-        throw err;
-    }
     const handleVideoCreated = async ({ filename, title, cover, rawFilename }) => {
         this.emit("videoFileCreated", { filename, cover, rawFilename });
         if (title && this?.liveInfo) {
@@ -290445,7 +290517,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         recorderType: downloader.type,
         url: stream.url,
         downloaderArgs,
-        savePath: savePath,
+        savePath: downloader.videoFilePath,
         stop,
         cut,
     };