bililive-cli 3.12.1 → 3.13.1

package/lib/{index-BeyiZ-FP.cjs → index-CgpPN0zA.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-B6245EX2.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,
@@ -186091,71 +186234,80 @@ async function getBiliStatusInfoByRoomIds(RoomIds) {
 
 /**
  * XML流式写入控制器，用于实时写入弹幕、礼物等信息到XML文件
- * 相比原有的json方案，这个实现每隔5秒就会写入数据，减少内存占用和数据丢失风险
+ * 相比原有的json方案，这个实现每隔10秒就会写入数据，减少内存占用和数据丢失风险
  */
+const METADATA_PLACEHOLDER = "<!--METADATA_PLACEHOLDER-->";
+const XML_FILE_HEADER = `<?xml version="1.0" encoding="utf-8"?>\n<?xml-stylesheet type="text/xsl" href="#s"?>\n<i>\n${METADATA_PLACEHOLDER}\n<RecorderXmlStyle><z:stylesheet version="1.0" id="s" xml:id="s" xmlns:z="http://www.w3.org/1999/XSL/Transform"><z:output method="html"/><z:template match="/"><html><meta name="viewport" content="width=device-width"/><title>弹幕文件 <z:value-of select="/i/metadata/user_name/text()"/></title><style>body{margin:0}h1,h2,p,table{margin-left:5px}table{border-spacing:0}td,th{border:1px solid grey;padding:1px 5px}th{position:sticky;top:0;background:#4098de}tr:hover{background:#d9f4ff}div{overflow:auto;max-height:80vh;max-width:100vw;width:fit-content}</style><h1>弹幕XML文件</h1><p>本文件不支持在 IE 浏览器里预览，请使用 Chrome Firefox Edge 等浏览器。</p><p>文件用法参考文档 <a href="https://rec.danmuji.org/user/danmaku/">https://rec.danmuji.org/user/danmaku/</a></p><table><tr><td>房间号</td><td><z:value-of select="/i/metadata/room_id/text()"/></td></tr><tr><td>主播名</td><td><z:value-of select="/i/metadata/user_name/text()"/></td></tr><tr><td><a href="#d">弹幕</a></td><td>共<z:value-of select="count(/i/d)"/>条记录</td></tr><tr><td><a href="#guard">上船</a></td><td>共<z:value-of select="count(/i/guard)"/>条记录</td></tr><tr><td><a href="#sc">SC</a></td><td>共<z:value-of select="count(/i/sc)"/>条记录</td></tr><tr><td><a href="#gift">礼物</a></td><td>共<z:value-of select="count(/i/gift)"/>条记录</td></tr></table><h2 id="d">弹幕</h2><div id="dm"><table><tr><th>用户名</th><th>出现时间</th><th>用户ID</th><th>弹幕</th><th>参数</th></tr><z:for-each select="/i/d"><tr><td><z:value-of select="@user"/></td><td></td><td></td><td><z:value-of select="."/></td><td><z:value-of select="@p"/></td></tr></z:for-each></table></div><script>Array.from(document.querySelectorAll('#dm tr')).slice(1).map(t=>t.querySelectorAll('td')).forEach(t=>{let p=t[4].textContent.split(','),a=p[0];t[1].textContent=\`\u0024{(Math.floor(a/60/60)+'').padStart(2,0)}:\u0024{(Math.floor(a/60%60)+'').padStart(2,0)}:\u0024{(a%60).toFixed(3).padStart(6,0)}\`;t[2].innerHTML=\`&lt;a target=_blank rel="nofollow noreferrer" "&gt;\u0024{p[6]}&lt;/a&gt;\`})</script><h2 id="guard">舰长购买</h2><div><table><tr><th>用户名</th><th>用户ID</th><th>舰长等级</th><th>购买数量</th><th>出现时间</th></tr><z:for-each select="/i/guard"><tr><td><z:value-of select="@user"/></td><td><a rel="nofollow noreferrer"><z:attribute name="href"><z:text></z:text><z:value-of select="@uid" /></z:attribute><z:value-of select="@uid"/></a></td><td><z:value-of select="@level"/></td><td><z:value-of select="@count"/></td><td><z:value-of select="@ts"/></td></tr></z:for-each></table></div><h2 id="sc">SuperChat 醒目留言</h2><div><table><tr><th>用户名</th><th>用户ID</th><th>内容</th><th>显示时长</th><th>价格</th><th>出现时间</th></tr><z:for-each select="/i/sc"><tr><td><z:value-of select="@user"/></td><td><a rel="nofollow noreferrer"><z:attribute name="href"><z:text></z:text><z:value-of select="@uid" /></z:attribute><z:value-of select="@uid"/></a></td><td><z:value-of select="."/></td><td><z:value-of select="@time"/></td><td><z:value-of select="@price"/></td><td><z:value-of select="@ts"/></td></tr></z:for-each></table></div><h2 id="gift">礼物</h2><div><table><tr><th>用户名</th><th>用户ID</th><th>礼物名</th><th>礼物数量</th><th>出现时间</th></tr><z:for-each select="/i/gift"><tr><td><z:value-of select="@user"/></td><td><span rel="nofollow noreferrer"><z:attribute name="href"></z:attribute><z:value-of select="@uid"/></span></td><td><z:value-of select="@giftname"/></td><td><z:value-of select="@giftcount"/></td><td><z:value-of select="@ts"/></td></tr></z:for-each></table></div></html></z:template></z:stylesheet></RecorderXmlStyle>\n`;
 function createRecordExtraDataController(savePath) {
     const data = {
+        header: XML_FILE_HEADER,
         meta: {
             recordStartTimestamp: Date.now(),
         },
         pendingMessages: [],
     };
     let hasCompleted = false;
-    let isWriting = false;
-    let isInitialized = false;
-    // 初始化文件
-    const initializeFile = async () => {
-        if (isInitialized)
-            return;
-        isInitialized = true;
-        try {
-            // 创建XML文件头，使用占位符预留metadata位置
-            const header = `<?xml version="1.0" encoding="utf-8"?>\n<?xml-stylesheet type="text/xsl" href="#s"?>\n<i>\n<!--METADATA_PLACEHOLDER-->\n<RecorderXmlStyle><z:stylesheet version="1.0" id="s" xml:id="s" xmlns:z="http://www.w3.org/1999/XSL/Transform"><z:output method="html"/><z:template match="/"><html><meta name="viewport" content="width=device-width"/><title>弹幕文件 <z:value-of select="/i/metadata/user_name/text()"/></title><style>body{margin:0}h1,h2,p,table{margin-left:5px}table{border-spacing:0}td,th{border:1px solid grey;padding:1px 5px}th{position:sticky;top:0;background:#4098de}tr:hover{background:#d9f4ff}div{overflow:auto;max-height:80vh;max-width:100vw;width:fit-content}</style><h1>弹幕XML文件</h1><p>本文件不支持在 IE 浏览器里预览，请使用 Chrome Firefox Edge 等浏览器。</p><p>文件用法参考文档 <a href="https://rec.danmuji.org/user/danmaku/">https://rec.danmuji.org/user/danmaku/</a></p><table><tr><td>房间号</td><td><z:value-of select="/i/metadata/room_id/text()"/></td></tr><tr><td>主播名</td><td><z:value-of select="/i/metadata/user_name/text()"/></td></tr><tr><td><a href="#d">弹幕</a></td><td>共<z:value-of select="count(/i/d)"/>条记录</td></tr><tr><td><a href="#guard">上船</a></td><td>共<z:value-of select="count(/i/guard)"/>条记录</td></tr><tr><td><a href="#sc">SC</a></td><td>共<z:value-of select="count(/i/sc)"/>条记录</td></tr><tr><td><a href="#gift">礼物</a></td><td>共<z:value-of select="count(/i/gift)"/>条记录</td></tr></table><h2 id="d">弹幕</h2><div id="dm"><table><tr><th>用户名</th><th>出现时间</th><th>用户ID</th><th>弹幕</th><th>参数</th></tr><z:for-each select="/i/d"><tr><td><z:value-of select="@user"/></td><td></td><td></td><td><z:value-of select="."/></td><td><z:value-of select="@p"/></td></tr></z:for-each></table></div><script>Array.from(document.querySelectorAll('#dm tr')).slice(1).map(t=>t.querySelectorAll('td')).forEach(t=>{let p=t[4].textContent.split(','),a=p[0];t[1].textContent=\`\u0024{(Math.floor(a/60/60)+'').padStart(2,0)}:\u0024{(Math.floor(a/60%60)+'').padStart(2,0)}:\u0024{(a%60).toFixed(3).padStart(6,0)}\`;t[2].innerHTML=\`&lt;a target=_blank rel="nofollow noreferrer" "&gt;\u0024{p[6]}&lt;/a&gt;\`})</script><h2 id="guard">舰长购买</h2><div><table><tr><th>用户名</th><th>用户ID</th><th>舰长等级</th><th>购买数量</th><th>出现时间</th></tr><z:for-each select="/i/guard"><tr><td><z:value-of select="@user"/></td><td><a rel="nofollow noreferrer"><z:attribute name="href"><z:text></z:text><z:value-of select="@uid" /></z:attribute><z:value-of select="@uid"/></a></td><td><z:value-of select="@level"/></td><td><z:value-of select="@count"/></td><td><z:value-of select="@ts"/></td></tr></z:for-each></table></div><h2 id="sc">SuperChat 醒目留言</h2><div><table><tr><th>用户名</th><th>用户ID</th><th>内容</th><th>显示时长</th><th>价格</th><th>出现时间</th></tr><z:for-each select="/i/sc"><tr><td><z:value-of select="@user"/></td><td><a rel="nofollow noreferrer"><z:attribute name="href"><z:text></z:text><z:value-of select="@uid" /></z:attribute><z:value-of select="@uid"/></a></td><td><z:value-of select="."/></td><td><z:value-of select="@time"/></td><td><z:value-of select="@price"/></td><td><z:value-of select="@ts"/></td></tr></z:for-each></table></div><h2 id="gift">礼物</h2><div><table><tr><th>用户名</th><th>用户ID</th><th>礼物名</th><th>礼物数量</th><th>出现时间</th></tr><z:for-each select="/i/gift"><tr><td><z:value-of select="@user"/></td><td><span rel="nofollow noreferrer"><z:attribute name="href"></z:attribute><z:value-of select="@uid"/></span></td><td><z:value-of select="@giftname"/></td><td><z:value-of select="@giftcount"/></td><td><z:value-of select="@ts"/></td></tr></z:for-each></table></div></html></z:template></z:stylesheet></RecorderXmlStyle>`;
-            await fs$D.promises.writeFile(savePath, header);
-        }
-        catch (error) {
-            console.error("初始化XML文件失败:", error);
-            isInitialized = false;
-            throw error;
-        }
-    };
-    // 每10秒写入一次数据
-    const scheduleWrite = asyncThrottle(() => writeToFile(), 10e3, {
-        immediateRunWhenEndOfDefer: true,
+    let hasPersistedHeader = false;
+    let danmaNum = 0;
+    let scNum = 0;
+    let guardNum = 0;
+    const interactedUsers = new Set();
+    const getStats = () => ({
+        danmaNum,
+        uniqMember: interactedUsers.size,
+        scNum,
+        guardNum,
     });
-    const writeToFile = async () => {
-        if (isWriting || hasCompleted || data.pendingMessages.length === 0) {
+    const trackInteractedUser = (message) => {
+        const userName = message.sender?.name?.trim();
+        if (!userName)
             return;
+        interactedUsers.add(userName);
+    };
+    const initializeFile = async (content) => {
+        // 这里有个假设，那就是第一次保存必然存在metatdata信息
+        const initialContent = data.header.replace(METADATA_PLACEHOLDER, generateMetadataXml(data.meta));
+        await fs$D.promises.writeFile(savePath, initialContent + content);
+        hasPersistedHeader = true;
+    };
+    const writeToFile = async (force = false) => {
+        if (!force && data.pendingMessages.length === 0) {
+            return Promise.resolve();
         }
-        // 确保文件已初始化
-        await initializeFile();
-        isWriting = true;
+        const messagesToWrite = [...data.pendingMessages];
+        data.pendingMessages = [];
         try {
-            // 获取待写入的消息
-            const messagesToWrite = [...data.pendingMessages];
-            data.pendingMessages = [];
-            // 生成XML内容
             const xmlContent = generateXmlContent(data.meta, messagesToWrite);
-            // 追加写入文件
-            await appendToXmlFile(savePath, xmlContent);
+            if (!hasPersistedHeader) {
+                await initializeFile(xmlContent);
+            }
+            else if (xmlContent) {
+                await appendToXmlFile(savePath, xmlContent);
+            }
         }
         catch (error) {
             console.error("写入XML文件失败:", error);
-            // 如果写入失败，将消息重新加入队列
-            data.pendingMessages = [...data.pendingMessages];
-        }
-        finally {
-            isWriting = false;
+            data.pendingMessages = [...messagesToWrite, ...data.pendingMessages];
         }
     };
+    // 每10秒写入一次数据
+    const writeTimer = setInterval(() => {
+        writeToFile();
+    }, 10e3);
     const addMessage = (message) => {
         if (hasCompleted)
             return;
-        // if (!isInitialized) return;
+        if (message.type === "comment") {
+            danmaNum += 1;
+        }
+        else if (message.type === "super_chat") {
+            scNum += 1;
+        }
+        else if (message.type === "guard") {
+            guardNum += 1;
+        }
+        trackInteractedUser(message);
         data.pendingMessages.push(message);
-        // 确保文件已初始化
-        initializeFile().catch(console.error);
-        scheduleWrite();
     };
     const setMeta = async (meta) => {
         if (hasCompleted)
@@ -186164,30 +186316,31 @@ function createRecordExtraDataController(savePath) {
             ...data.meta,
             ...meta,
         };
-        // 确保文件已初始化，然后立即更新文件中的metadata
-        await initializeFile().catch(console.error);
-        await updateMetadataInFile(savePath, data.meta).catch(console.error);
     };
     const flush = async () => {
         if (hasCompleted)
             return;
         hasCompleted = true;
-        scheduleWrite.cancel();
-        await initializeFile().catch(console.error);
-        // 写入剩余的数据
-        if (data.pendingMessages.length > 0) {
-            await writeToFile();
-        }
-        // 完成XML文件（添加结束标签等）
-        await finalizeXmlFile(savePath);
-        // 清理内存
-        data.pendingMessages = [];
+        writeTimer && clearInterval(writeTimer);
+        try {
+            await writeToFile(true);
+            await appendToXmlFile(savePath, "</i>");
+        }
+        catch (error) {
+            console.error("完成XML文件写入失败:", error);
+        }
+        finally {
+            // 清理内存
+            data.pendingMessages = [];
+            interactedUsers.clear();
+        }
     };
     return {
         data,
         addMessage,
         setMeta,
         flush,
+        getStats,
     };
 }
 /**
@@ -186203,7 +186356,7 @@ function generateXmlContent(metadata, messages) {
         .filter((item) => item.type === "comment")
         .map((ele) => {
         const progress = Math.max((ele.timestamp - metadata.recordStartTimestamp) / 1000, 0);
-        const data = {
+        const attrs = {
             "@@p": "",
             "@@progress": progress,
             "@@mode": String(ele.mode ?? 1),
@@ -186218,18 +186371,18 @@ function generateXmlContent(metadata, messages) {
             "@@uid": String(ele?.sender?.uid),
             "@@timestamp": String(ele.timestamp),
         };
-        data["@@p"] = [
-            data["@@progress"],
-            data["@@mode"],
-            data["@@fontsize"],
-            data["@@color"],
-            data["@@ctime"],
-            data["@@pool"],
-            data["@@midHash"],
-            data["@@uid"],
-            data["@@weight"],
+        attrs["@@p"] = [
+            attrs["@@progress"],
+            attrs["@@mode"],
+            attrs["@@fontsize"],
+            attrs["@@color"],
+            attrs["@@ctime"],
+            attrs["@@pool"],
+            attrs["@@midHash"],
+            attrs["@@uid"],
+            attrs["@@weight"],
         ].join(",");
-        return pick$1(data, ["@@p", "#text", "@@user", "@@uid", "@@timestamp"]);
+        return pick$1(attrs, ["@@p", "#text", "@@user", "@@uid", "@@timestamp"]);
     });
     const gifts = messages
         .filter((item) => item.type === "give_gift")
@@ -186295,55 +186448,22 @@ async function appendToXmlFile(filePath, content) {
         throw error;
     }
 }
-/**
- * 更新XML文件中的metadata
- */
-async function updateMetadataInFile(filePath, metadata) {
-    try {
-        const builder = new fxp.XMLBuilder({
-            ignoreAttributes: false,
-            attributeNamePrefix: "@@",
-            format: true,
-        });
-        // 生成metadata XML
-        const metadataXml = builder.build({
-            metadata: {
-                platform: metadata.platform,
-                video_start_time: metadata.recordStartTimestamp,
-                live_start_time: metadata.liveStartTimestamp,
-                room_title: metadata.title,
-                user_name: metadata.user_name,
-                room_id: metadata.room_id,
-            },
-        });
-        // 读取文件内容
-        const content = await fs$D.promises.readFile(filePath, "utf-8");
-        // 替换占位符为实际的metadata
-        const updatedContent = content.replace("<!--METADATA_PLACEHOLDER-->", metadataXml);
-        // 写回文件
-        await fs$D.promises.writeFile(filePath, updatedContent);
-    }
-    catch (error) {
-        console.error(`更新XML文件metadata失败: ${filePath}`, error);
-        throw error;
-    }
-}
-/**
- * 完成XML文件写入
- */
-async function finalizeXmlFile(filePath) {
-    try {
-        // 读取文件内容
-        const content = await fs$D.promises.readFile(filePath, "utf-8");
-        // 添加结束标签
-        const finalContent = content + "</i>";
-        // 写回文件
-        await fs$D.promises.writeFile(filePath, finalContent);
-    }
-    catch (error) {
-        console.error(`完成XML文件写入失败: ${filePath}`, error);
-        throw error;
-    }
+function generateMetadataXml(metadata) {
+    const builder = new fxp.XMLBuilder({
+        ignoreAttributes: false,
+        attributeNamePrefix: "@@",
+        format: true,
+    });
+    return builder.build({
+        metadata: {
+            platform: metadata.platform,
+            video_start_time: metadata.recordStartTimestamp,
+            live_start_time: metadata.liveStartTimestamp,
+            room_title: metadata.title,
+            user_name: metadata.user_name,
+            room_id: metadata.room_id,
+        },
+    });
 }
 
 class Segment extends EventEmitter$j {
@@ -186362,6 +186482,12 @@ class Segment extends EventEmitter$j {
         this.disableDanma = disableDanma;
         this.videoExt = videoExt;
     }
+    getVideoFileCompletedPayload() {
+        return {
+            filename: this.outputFilePath,
+            stats: this.extraDataController?.getStats(),
+        };
+    }
     async handleSegmentEnd() {
         if (!this.outputVideoFilePath) {
             this.emit("DebugLog", {
@@ -186370,6 +186496,7 @@ class Segment extends EventEmitter$j {
             });
             return;
         }
+        const data = this.getVideoFileCompletedPayload();
         try {
             this.emit("DebugLog", {
                 type: "info",
@@ -186379,7 +186506,7 @@ class Segment extends EventEmitter$j {
                 retry$1(() => fs$E.rename(this.rawRecordingVideoPath, this.outputFilePath), 20, 1000),
                 this.extraDataController?.flush(),
             ]);
-            this.emit("videoFileCompleted", { filename: this.outputFilePath });
+            this.emit("videoFileCompleted", data);
         }
         catch (err) {
             this.emit("DebugLog", {
@@ -186387,7 +186514,7 @@ class Segment extends EventEmitter$j {
                 text: "videoFileCompleted error " + String(err),
             });
             // 虽然重命名失败了，但是也当作完成处理，避免卡住录制流程
-            this.emit("videoFileCompleted", { filename: this.outputFilePath });
+            this.emit("videoFileCompleted", data);
         }
     }
     async onSegmentStart(stderrLine, callBack) {
@@ -186408,11 +186535,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 +186592,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 +186618,7 @@ class StreamManager extends EventEmitter$j {
             });
         }
         else {
+            ensureFolderExist(recordSavePath);
             const extraDataSavePath = `${recordSavePath}.xml`;
             if (!disableDanma) {
                 this.extraDataController = createRecordExtraDataController(extraDataSavePath);
@@ -186520,8 +186664,13 @@ class StreamManager extends EventEmitter$j {
             }
             else {
                 if (this.recordStartTime) {
-                    await this.getExtraDataController()?.flush();
-                    this.emit("videoFileCompleted", { filename: this.videoFilePath });
+                    const stats = this.extraDataController?.getStats();
+                    const extraDataController = this.getExtraDataController();
+                    await extraDataController?.flush();
+                    this.emit("videoFileCompleted", {
+                        filename: this.videoFilePath,
+                        stats: stats,
+                    });
                 }
             }
         }
@@ -186685,7 +186834,7 @@ function createRecorderManager$1(opts) {
                 }
                 this.emit("videoFileCreated", { recorder: recorder.toJSON(), filename, rawFilename });
             });
-            recorder.on("videoFileCompleted", ({ filename }) => this.emit("videoFileCompleted", { recorder: recorder.toJSON(), filename }));
+            recorder.on("videoFileCompleted", ({ filename, stats }) => this.emit("videoFileCompleted", { recorder: recorder.toJSON(), filename, stats }));
             recorder.on("Message", (message) => this.emit("Message", { recorder: recorder.toJSON(), message }));
             recorder.on("Updated", (keys) => this.emit("RecorderUpdated", { recorder: recorder.toJSON(), keys }));
             recorder.on("DebugLog", (log) => this.emit("RecorderDebugLog", { recorder: recorder, ...log }));
@@ -186830,18 +186979,9 @@ function createRecorderManager$1(opts) {
                             }
                         }
                         else {
-                            // 检查该 provider 是否还有 recorder
-                            const hasRecorders = this.recorders.some((r) => r.providerId === providerId);
-                            if (hasRecorders) {
-                                // 继续循环
-                                const timer = setTimeout(checkLoop, providerConfig.autoCheckInterval);
-                                checkLoopTimers.set(providerId, timer);
-                            }
-                            else {
-                                // 没有 recorder 了，停止该 provider 的检查循环
-                                // TODO: 也许不需要删除定时器
-                                checkLoopTimers.delete(providerId);
-                            }
+                            // 即使当前 provider 暂时没有 recorder，也保留轮询，避免后续新增 recorder 时漏掉自动检查。
+                            const timer = setTimeout(checkLoop, providerConfig.autoCheckInterval);
+                            checkLoopTimers.set(providerId, timer);
                         }
                     }
                 };
@@ -186932,6 +187072,9 @@ function genSavePathFromRule(manager, recorder, extData) {
         channelId,
     };
     let savePathRule = manager.savePathRule;
+    if (extData?.extraMs) {
+        savePathRule += "_{ms}";
+    }
     try {
         savePathRule = ejs.render(savePathRule, params);
     }
@@ -187074,8 +187217,8 @@ class mesioDownloader extends EventEmitter$j {
         this.streamManager.on("videoFileCreated", ({ filename, cover, rawFilename, title }) => {
             this.emit("videoFileCreated", { filename, cover, rawFilename, title });
         });
-        this.streamManager.on("videoFileCompleted", ({ filename }) => {
-            this.emit("videoFileCompleted", { filename });
+        this.streamManager.on("videoFileCompleted", (data) => {
+            this.emit("videoFileCompleted", data);
         });
         this.streamManager.on("DebugLog", (data) => {
             this.emit("DebugLog", data);
@@ -187277,8 +187420,8 @@ class BililiveDownloader extends EventEmitter$j {
         this.streamManager.on("videoFileCreated", ({ filename, cover, rawFilename, title }) => {
             this.emit("videoFileCreated", { filename, cover, rawFilename, title });
         });
-        this.streamManager.on("videoFileCompleted", ({ filename }) => {
-            this.emit("videoFileCompleted", { filename });
+        this.streamManager.on("videoFileCompleted", (data) => {
+            this.emit("videoFileCompleted", data);
         });
         this.streamManager.on("DebugLog", (data) => {
             this.emit("DebugLog", data);
@@ -187331,6 +187474,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,
         };
@@ -187503,8 +187651,8 @@ class FFmpegDownloader extends EventEmitter$j {
         this.streamManager.on("videoFileCreated", ({ filename, cover, rawFilename, title }) => {
             this.emit("videoFileCreated", { filename, cover, rawFilename, title });
         });
-        this.streamManager.on("videoFileCompleted", ({ filename }) => {
-            this.emit("videoFileCompleted", { filename });
+        this.streamManager.on("videoFileCompleted", (data) => {
+            this.emit("videoFileCompleted", data);
         });
         this.streamManager.on("DebugLog", (data) => {
             this.emit("DebugLog", data);
@@ -187590,7 +187738,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 +187842,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 +195185,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 +195195,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) {
@@ -195085,8 +195214,8 @@ const checkLiveStatusAndRecord$4 = async function ({ getSavePath, banLiveId, isM
         });
     };
     downloader.on("videoFileCreated", handleVideoCreated);
-    downloader.on("videoFileCompleted", ({ filename }) => {
-        this.emit("videoFileCompleted", { filename });
+    downloader.on("videoFileCompleted", (data) => {
+        this.emit("videoFileCompleted", data);
     });
     downloader.on("DebugLog", (data) => {
         this.emit("DebugLog", data);
@@ -195277,7 +195406,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 +196309,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 +211346,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 +211358,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) {
@@ -211267,8 +211377,8 @@ const checkLiveStatusAndRecord$3 = async function ({ getSavePath, banLiveId, isM
         });
     };
     downloader.on("videoFileCreated", handleVideoCreated);
-    downloader.on("videoFileCompleted", ({ filename }) => {
-        this.emit("videoFileCompleted", { filename });
+    downloader.on("videoFileCompleted", (data) => {
+        this.emit("videoFileCompleted", data);
     });
     downloader.on("DebugLog", (data) => {
         this.emit("DebugLog", data);
@@ -211376,7 +211486,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 +211523,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 +213028,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 +213041,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) {
@@ -212969,8 +213060,8 @@ const checkLiveStatusAndRecord$2 = async function ({ getSavePath, isManualStart,
         });
     };
     downloader.on("videoFileCreated", handleVideoCreated);
-    downloader.on("videoFileCompleted", ({ filename }) => {
-        this.emit("videoFileCompleted", { filename });
+    downloader.on("videoFileCompleted", (data) => {
+        this.emit("videoFileCompleted", data);
     });
     downloader.on("DebugLog", (data) => {
         this.emit("DebugLog", data);
@@ -213052,7 +213143,7 @@ const checkLiveStatusAndRecord$2 = async function ({ getSavePath, isManualStart,
         recorderType: downloader.type,
         url: stream.url,
         downloaderArgs,
-        savePath: savePath,
+        savePath: downloader.videoFilePath,
         stop,
         cut,
     };
@@ -213109,12 +213200,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);
@@ -216585,6 +216670,9 @@ async function getRoomInfoByUserWeb(secUserId, opts = {}) {
     if (res.data.includes("验证码")) {
         throw new Error("需要验证码，请在浏览器中打开链接获取" + url);
     }
+    if (!res.data.includes("抖音号")) {
+        throw new Error("userHTML页面没有正常加载" + String(res.data));
+    }
     if (!res.data.includes("直播中")) {
         return {
             living: false,
@@ -216776,6 +216864,7 @@ async function getRoomInfoByWeb(webRoomId, opts = {}) {
 }
 async function getRoomInfoByMobile(secUserId, opts = {}) {
     if (!secUserId) {
+        console.error(opts);
         throw new Error("Mobile API need secUserId, please set uid field");
     }
     if (typeof secUserId === "number") {
@@ -216792,7 +216881,7 @@ async function getRoomInfoByMobile(secUserId, opts = {}) {
     const res = await requester.get(`https://webcast.amemv.com/webcast/room/reflow/info/`, {
         params,
         headers: {
-            cookie: opts.auth,
+        // cookie: opts.auth,
         },
     });
     // @ts-ignore
@@ -249016,6 +249105,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 +249120,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) {
@@ -249063,8 +249139,8 @@ const checkLiveStatusAndRecord$1 = async function ({ getSavePath, banLiveId, isM
         });
     };
     downloader.on("videoFileCreated", handleVideoCreated);
-    downloader.on("videoFileCompleted", ({ filename }) => {
-        this.emit("videoFileCompleted", { filename });
+    downloader.on("videoFileCompleted", (data) => {
+        this.emit("videoFileCompleted", data);
     });
     downloader.on("DebugLog", (data) => {
         this.emit("DebugLog", data);
@@ -249280,7 +249356,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 +290256,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 +290426,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 +290435,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) {
@@ -290398,8 +290454,8 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         });
     };
     downloader.on("videoFileCreated", handleVideoCreated);
-    downloader.on("videoFileCompleted", ({ filename }) => {
-        this.emit("videoFileCompleted", { filename });
+    downloader.on("videoFileCompleted", (data) => {
+        this.emit("videoFileCompleted", data);
     });
     downloader.on("DebugLog", (data) => {
         this.emit("DebugLog", data);
@@ -290445,7 +290501,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         recorderType: downloader.type,
         url: stream.url,
         downloaderArgs,
-        savePath: savePath,
+        savePath: downloader.videoFilePath,
         stop,
         cut,
     };
@@ -291047,7 +291103,7 @@ async function createRecorderManager(appConfig) {
             return;
         if (recorder.recordHandle) {
             const logFilePath = utils$2.replaceExtName(`${recorder.recordHandle.savePath}_${recorder.id}`, ".recorder.log");
-            fs$k.appendFileSync(logFilePath, log.text + "\n");
+            fs$k.appendFile(logFilePath, log.text + "\n").catch(() => { });
             return;
         }
         else {
@@ -291126,8 +291182,8 @@ async function createRecorderManager(appConfig) {
             platform: recorder.providerId,
         });
     });
-    manager.on("videoFileCompleted", async ({ recorder, filename }) => {
-        logObj.info("Manager videoFileCompleted", { recorder, filename });
+    manager.on("videoFileCompleted", async ({ recorder, filename, stats }) => {
+        logObj.info("Manager videoFileCompleted", { recorder, filename, stats });
         const endTime = new Date();
         const data = recorderConfig.get(recorder.id);
         const title = recorder?.liveInfo?.title;
@@ -291158,7 +291214,16 @@ async function createRecorderManager(appConfig) {
                 video_filename: videoFilename,
                 quick_hash: quickHash,
             });
-            if (xmlFile && (await fs$k.pathExists(xmlFile))) {
+            if (stats) {
+                recordHistory.upadteLive({
+                    video_file: filename,
+                    live_id: liveId,
+                }, {
+                    danma_num: stats.danmaNum,
+                    interact_num: stats.uniqMember,
+                });
+            }
+            else if (xmlFile && (await fs$k.pathExists(xmlFile))) {
                 const { uniqMember, danmaNum } = await danmaReport(xmlFile);
                 recordHistory.upadteLive({
                     video_file: filename,