@lzwme/m3u8-dl 1.4.0 → 1.4.2

package/cjs/lib/file-download.js

@@ -39,7 +39,7 @@ async function fileDownload(u, opts) {
             force: options.force,
             requestOptions: {
                 headers: {
-                    referer: url,
+                    referer: new URL(url).origin,
                     ...(0, utils_js_1.formatHeaders)(options.headers),
                 },
                 rejectUnauthorized: false,

package/cjs/lib/getM3u8Urls.d.ts

@@ -1,2 +1,11 @@
+import type { OutgoingHttpHeaders } from 'node:http';
+export interface GetM3u8UrlsOption {
+    url: string;
+    /** 播放子页面 URL 特征规则 */
+    subUrlRegex?: string | RegExp;
+    headers?: OutgoingHttpHeaders | string;
+    deep?: number;
+    visited?: Set<string>;
+}
 /** 从指定的 url 页面中提取 m3u8 播放地址。deep 指定搜索页面深度 */
-export declare function getM3u8Urls(url: string, deep?: number, visited?: Set<string>): Promise<Map<string, string>>;
+export declare function getM3u8Urls(opts: GetM3u8UrlsOption): Promise<Map<string, string>>;

package/cjs/lib/getM3u8Urls.js

@@ -3,41 +3,98 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getM3u8Urls = getM3u8Urls;
 const fe_utils_1 = require("@lzwme/fe-utils");
 const utils_js_1 = require("./utils.js");
+function getFormatTitle(text) {
+    if (typeof text !== 'string' || !text)
+        return '';
+    if (/^\d+$/.test(text))
+        return text;
+    const match = /第(\d+)(集|期)/.exec(text);
+    if (match)
+        return match[0];
+    return '';
+}
 /** 从指定的 url 页面中提取 m3u8 播放地址。deep 指定搜索页面深度 */
-async function getM3u8Urls(url, deep = 2, visited = new Set()) {
-    const req = new fe_utils_1.ReqFetch({ headers: { 'content-type': 'text/html; charset=UTF-8' }, reqOptions: {} });
-    const { data: html } = await req.get(url);
-    // 从 html 中正则匹配提取 m3u8
+async function getM3u8Urls(opts) {
+    const options = { headers: {}, deep: 1, visited: new Set(), ...opts };
+    const baseUrl = new URL(options.url).origin;
+    const req = new fe_utils_1.Request({
+        headers: { 'content-type': 'text/html; charset=UTF-8', referer: baseUrl, ...(0, utils_js_1.formatHeaders)(options.headers) },
+        reqOptions: { rejectUnauthorized: false },
+    });
+    const { data: html, response } = await req.get(options.url);
     const m3u8Urls = new Map();
-    const m3u8Regex = /https?:[^\s'"]+\.m3u8(\?[^\s'"]*)?/gi;
+    if (!response.statusCode || response.statusCode >= 400) {
+        utils_js_1.logger.error('获取页面失败:', fe_utils_1.color.red(options.url), response.statusCode, response.statusMessage, html);
+        return m3u8Urls;
+    }
+    // 从 html 中正则匹配提取 m3u8
+    const m3u8Regex = /https?:[^\s'":]+\.(m3u8|mp4)(\?[^\s'"]*)?/gi;
     // 1. 直接正则匹配 m3u8 地址
     let match = m3u8Regex.exec(html);
+    const title = (/<title>([^<]+)</.exec(html)?.[1].split('-')[0] || '').replace(/在线播放|在线观看|详情|介绍|《|》/g, '').trim();
     while (match) {
-        const title = (/<title>([^<]+)</.exec(html)?.[1].split('-')[0] || '').replace(/在线播放|《|》/g, '');
         const href = match[0].replaceAll('\\/', '/');
-        if (!m3u8Urls.has(href))
-            m3u8Urls.set(href, title);
         match = m3u8Regex.exec(html);
+        if (!m3u8Urls.has(href))
+            m3u8Urls.set(href, getFormatTitle(title) || title);
+    }
+    // 找到了多个链接，修改 title 添加序号
+    if (m3u8Urls.size > 3 && !/第\d+(集|期)/.test(title)) {
+        let idx = 1;
+        for (const [key] of m3u8Urls) {
+            m3u8Urls.set(key, `${title}第${String(++idx).padStart(2, '0')}集`);
+        }
     }
     // 2. 若未找到且深度大于 0，则获取所有 a 标签的 href 并递归查找
-    if (m3u8Urls.size === 0 && deep > 0) {
-        utils_js_1.logger.debug('未获取到 m3u8 地址', fe_utils_1.color.gray(url), html.length);
-        visited.add(url);
+    if (m3u8Urls.size === 0 && options.deep > 0) {
+        utils_js_1.logger.debug('未获取到 m3u8 地址', fe_utils_1.color.gray(options.url), html.length);
+        options.visited.add(options.url);
         const aTagRegex = /<a\s+[^>]*href=["']([^"']+)["'][^>]*>(.*?)<\/a>/gi;
         let aMatch = aTagRegex.exec(html);
-        const origin = new URL(url).origin;
+        const subPageUrls = new Map();
+        let failedSubPages = 0;
         while (aMatch) {
-            const href = aMatch[1] ? new URL(aMatch[1], origin).toString() : '';
-            const text = aMatch[2];
+            const href = aMatch[1] ? new URL(aMatch[1], baseUrl).toString() : '';
+            const text = aMatch[2].replace(/<[^>]+>/g, '');
             aMatch = aTagRegex.exec(html);
-            if (!href || visited.has(href) || !href.startsWith(origin) || !/集|HD|高清|播放/.test(text))
+            if (!href || options.visited.has(href) || !href.startsWith(baseUrl))
                 continue;
-            visited.add(href);
+            if (options.subUrlRegex) {
+                if (typeof options.subUrlRegex === 'string') {
+                    options.subUrlRegex = new RegExp(options.subUrlRegex.replaceAll(/\*+/g, '.+'));
+                }
+                if (!options.subUrlRegex.test(href))
+                    continue;
+            }
+            else if (!/集|期|HD|高清|抢先|BD/.test(text))
+                continue;
+            subPageUrls.set(href, text);
+            utils_js_1.logger.debug(' > 提取到子页面: ', fe_utils_1.color.gray(href), text);
+        }
+        for (const [href, text] of subPageUrls) {
             try {
-                const subUrls = await getM3u8Urls(href, deep - 1, visited);
-                utils_js_1.logger.debug(' > 从子页面提取: ', fe_utils_1.color.gray(href), text, subUrls.size);
-                for (const [u, t] of subUrls)
-                    m3u8Urls.set(u, t || text);
+                options.visited.add(href);
+                const subUrls = await getM3u8Urls({ ...options, url: href, deep: options.deep - 1 });
+                utils_js_1.logger.debug(' > 从子页面提取: ', fe_utils_1.color.gray(href), text, subUrls);
+                if (subUrls.size === 0 && m3u8Urls.size === 0) {
+                    failedSubPages++;
+                    if (failedSubPages > 3) {
+                        utils_js_1.logger.warn(`连续查找 ${failedSubPages} 个子页面均未获取到，不再继续`, options.url, href);
+                        return m3u8Urls;
+                    }
+                }
+                for (const [u, t] of subUrls) {
+                    let stitle = t;
+                    for (const s of [text, t, m3u8Urls.get(u) || '']) {
+                        const ft = getFormatTitle(s);
+                        if (ft) {
+                            stitle = ft;
+                            break;
+                        }
+                    }
+                    utils_js_1.logger.debug(' > m3u8地址: ', fe_utils_1.color.gray(u), fe_utils_1.color.green(stitle));
+                    m3u8Urls.set(u, stitle.trim());
+                }
             }
             catch (err) {
                 utils_js_1.logger.warn(' > 尝试访问子页面异常: ', fe_utils_1.color.red(href), err.message);

package/cjs/lib/parseM3u8.d.ts

@@ -1,8 +1,8 @@
-import type { IncomingHttpHeaders } from 'node:http';
+import type { OutgoingHttpHeaders } from 'node:http';
 import type { M3u8Info } from '../types/m3u8';
 /**
  * 解析 m3u8 文件
  * @param content m3u8 文件的内容，可为 http 远程地址、本地文件路径
  * @param cacheDir 缓存文件保存目录
  */
-export declare function parseM3U8(content: string, cacheDir?: string, headers?: IncomingHttpHeaders): Promise<M3u8Info>;
+export declare function parseM3U8(content: string, cacheDir?: string, headers?: OutgoingHttpHeaders | string): Promise<M3u8Info>;

package/cjs/lib/parseM3u8.js

@@ -15,7 +15,7 @@ async function parseM3U8(content, cacheDir = './cache', headers) {
     let url = process.cwd();
     if (content.startsWith('http')) {
         url = content;
-        content = (await (0, utils_1.getRetry)(url)).data;
+        content = (await (0, utils_1.getRetry)(url, headers)).data;
     }
     else if (!content.includes('\n') && (0, node_fs_1.existsSync)(content)) {
         url = (0, node_path_1.resolve)(process.cwd(), content);

package/cjs/lib/ts-download.d.ts

@@ -1,3 +1,3 @@
-import type { IncomingHttpHeaders } from 'node:http';
+import type { OutgoingHttpHeaders } from 'node:http';
 import type { M3u8Crypto, TsItemInfo } from '../types/m3u8';
-export declare function tsDownload(info: TsItemInfo, cryptoInfo: M3u8Crypto, headers?: IncomingHttpHeaders): Promise<boolean>;
+export declare function tsDownload(info: TsItemInfo, cryptoInfo: M3u8Crypto, headers?: OutgoingHttpHeaders | string): Promise<boolean>;

package/cjs/lib/ts-download.js

@@ -43,10 +43,7 @@ if (!node_worker_threads_1.isMainThread && node_worker_threads_1.parentPort) {
         const startTime = Date.now();
         if (data.options.debug)
             utils_js_1.logger.updateOptions({ levelType: 'debug' });
-        let headers = data.options?.headers;
-        if (headers)
-            headers = (0, utils_js_1.formatHeaders)(headers);
-        tsDownload(data.info, data.crypto, headers).then(success => {
+        tsDownload(data.info, data.crypto, data.options?.headers).then(success => {
             node_worker_threads_1.parentPort.postMessage({ success, info: data.info, timeCost: Date.now() - startTime });
         });
     });

package/cjs/lib/utils.d.ts

@@ -1,11 +1,11 @@
 import { type Stats } from 'node:fs';
-import type { IncomingHttpHeaders } from 'node:http';
+import type { OutgoingHttpHeaders } from 'node:http';
 import { NLogger, Request } from '@lzwme/fe-utils';
 export declare const request: Request;
-export declare const getRetry: <T = string>(url: string, headers?: IncomingHttpHeaders, retries?: number) => Promise<{
+export declare const getRetry: <T = string>(url: string, headers?: OutgoingHttpHeaders | string, retries?: number) => Promise<{
     data: T;
     buffer: Buffer;
-    headers: IncomingHttpHeaders;
+    headers: import("http").IncomingHttpHeaders;
     response: import("http").IncomingMessage;
 }>;
 export declare const logger: NLogger;
@@ -17,4 +17,4 @@ export declare function getLocation(url: string, method?: string): Promise<strin
  * 将传入的 headers 转换为统一的小写键对象格式
  * 如果 headers 是字符串，会先将其解析为对象；如果 headers 为空，则返回空对象。
  */
-export declare function formatHeaders(headers: string | IncomingHttpHeaders): Record<string, string>;
+export declare function formatHeaders(headers: string | OutgoingHttpHeaders): Record<string, string>;

package/cjs/lib/utils.js

@@ -13,7 +13,7 @@ exports.request = new fe_utils_1.Request({
     reqOptions: { rejectUnauthorized: false },
 });
 // process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
-const getRetry = (url, headers, retries = 3) => (0, fe_utils_1.retry)(() => exports.request.get(url, null, headers, { rejectUnauthorized: false }), 1000, retries, r => {
+const getRetry = (url, headers, retries = 3) => (0, fe_utils_1.retry)(() => exports.request.get(url, null, formatHeaders(headers), { rejectUnauthorized: false }), 1000, retries, r => {
     if (r.response.statusCode !== 200) {
         console.log();
         exports.logger.warn(`[retry][${url}][${r.response.statusCode}]`, r.response.statusMessage || r.data);
@@ -59,10 +59,9 @@ async function getLocation(url, method = 'HEAD') {
  * 如果 headers 是字符串，会先将其解析为对象；如果 headers 为空，则返回空对象。
  */
 function formatHeaders(headers) {
-    if (typeof headers === 'string') {
-        headers = Object.fromEntries(headers.split('\n').map(line => line.split(':').map(d => d.trim())));
-    }
-    else if (!headers)
+    if (!headers)
         return {};
+    if (typeof headers === 'string')
+        headers = Object.fromEntries(headers.split('\n').map(line => line.split(':').map(d => d.trim())));
     return (0, fe_utils_1.toLowcaseKeyObject)(headers);
 }

package/cjs/server/download-server.d.ts

@@ -45,6 +45,7 @@ export declare class DLServer {
     saveConfig(config: M3u8DLOptions, configPath?: string): void;
     private createApp;
     private startDownload;
+    startNextPending(): void;
     private wsSend;
     private initRouters;
 }

package/cjs/server/download-server.js

@@ -55,7 +55,7 @@ class DLServer {
         cacheDir: process.env.DS_CACHE_DIR || (0, node_path_1.resolve)((0, node_os_1.homedir)(), '.m3u8-dl/cache'),
         token: process.env.DS_SECRET || process.env.DS_TOKEN || '',
         debug: process.env.DS_DEBUG === '1',
-        limitFileAccess: !['0', 'false'].includes(process.env.DS_LIMTE_FILE_ACCESS),
+        limitFileAccess: ['1', 'true'].includes(process.env.DS_LIMTE_FILE_ACCESS),
     };
     serverInfo = {
         version: '',
@@ -198,7 +198,7 @@ class DLServer {
                 if ((0, node_fs_1.existsSync)((0, node_path_1.resolve)(rootDir, 'client/local/cdn'))) {
                     indexHtml = indexHtml
                         .replaceAll('https://s4.zstatic.net/ajax/libs', 'local/cdn')
-                        .replaceAll(/integrity=.+\n/g, '')
+                        .replaceAll(/integrity="[^"]+"\n?/g, '')
                         .replace('https://cdn.tailwindcss.com/3.4.16', 'local/cdn/tailwindcss/3.4.16/tailwindcss.min.js');
                 }
                 res.setHeader('content-type', 'text/html').send(indexHtml);
@@ -249,19 +249,34 @@ class DLServer {
         wss.on('listening', () => utils_js_1.logger.info(`WebSocket server listening on port ${(0, console_log_colors_1.green)(this.options.port)}`));
         return { app, wss };
     }
-    startDownload(url, options) {
+    async startDownload(url, options) {
+        if (!url)
+            return utils_js_1.logger.error('[satartDownload]Invalid URL:', url);
+        if (url.endsWith('.html')) {
+            const item = Array.from(await (0, getM3u8Urls_js_1.getM3u8Urls)({ url, headers: options.headers }))[0];
+            if (!item)
+                return utils_js_1.logger.error('[startDownload]不是有效(包含)M3U8的地址:', url);
+            url = item[0];
+            if (!options.filename)
+                options.filename = item[1];
+        }
         const { options: dlOptions } = (0, format_options_js_1.formatOptions)(url, { ...this.cfg.dlOptions, ...options, cacheDir: this.options.cacheDir });
         const cacheItem = this.dlCache.get(url) || { options, dlOptions, status: 'pending', url };
         utils_js_1.logger.debug('startDownload', url, dlOptions, cacheItem.status);
         if (cacheItem.status === 'resume')
-            return cacheItem.options;
+            return;
         if (cacheItem.localVideo && !(0, node_fs_1.existsSync)(cacheItem.localVideo))
             delete cacheItem.localVideo;
+        if (cacheItem.endTime)
+            delete cacheItem.endTime;
         cacheItem.status = this.downloading >= this.cfg.webOptions.maxDownloads ? 'pending' : 'resume';
+        // pending 优先级靠后
+        if (cacheItem.status === 'pending' && this.dlCache.has(url))
+            this.dlCache.delete(url);
         this.dlCache.set(url, cacheItem);
         this.wsSend('progress', url);
         if (cacheItem.status === 'pending')
-            return cacheItem.options;
+            return;
         let workPoll = cacheItem.workPoll;
         const opts = {
             ...dlOptions,
@@ -270,7 +285,9 @@ class DLServer {
                 workPoll = wp;
             },
             onProgress: (_finished, _total, current, stats) => {
-                const item = this.dlCache.get(url) || cacheItem;
+                const item = this.dlCache.get(url);
+                if (!item)
+                    return false; // 已删除
                 const status = item.status || 'resume';
                 Object.assign(item, { ...stats, current, options: dlOptions, status, workPoll, url });
                 this.dlCache.set(url, item);
@@ -294,12 +311,7 @@ class DLServer {
             this.dlCache.set(url, item);
             this.wsSend('progress', url);
             this.saveCache();
-            // 找到一个 pending 的任务，开始下载
-            const nextItem = this.dlCache.entries().find(([_url, d]) => d.status === 'pending');
-            if (nextItem) {
-                this.startDownload(nextItem[0], nextItem[1].options);
-                this.wsSend('progress', nextItem[0]);
-            }
+            this.startNextPending();
         };
         try {
             if (dlOptions.type === 'parser') {
@@ -317,7 +329,14 @@ class DLServer {
             afterDownload({ filepath: '', errmsg: error.message }, url);
             utils_js_1.logger.error('下载失败:', error);
         }
-        return dlOptions;
+    }
+    startNextPending() {
+        // 找到一个 pending 的任务，开始下载
+        const nextItem = this.dlCache.entries().find(([_url, d]) => d.status === 'pending');
+        if (nextItem) {
+            this.startDownload(nextItem[0], nextItem[1].options);
+            this.wsSend('progress', nextItem[0]);
+        }
     }
     wsSend(type = 'progress', data) {
         if (type === 'tasks' && !data) {
@@ -422,8 +441,10 @@ class DLServer {
                     list.push(tItem);
                 }
             }
-            if (list.length)
+            if (list.length) {
                 this.wsSend('progress', list);
+                this.startNextPending();
+            }
             res.json({ message: `已暂停 ${list.length} 个下载任务`, code: 0, count: list.length });
         });
         // API to resume download
@@ -477,6 +498,7 @@ class DLServer {
             if (list.length) {
                 this.wsSend('delete', list);
                 this.saveCache();
+                this.startNextPending();
             }
             res.json({ message: `已删除 ${list.length} 个下载任务`, code: 0, count: list.length });
         });
@@ -518,20 +540,36 @@ class DLServer {
                         'Content-Length': String(stats.size),
                         'Content-Type': ext === 'ts' ? 'video/mp2t' : ext === 'm3u8' ? 'application/vnd.apple.mpegurl' : ext === 'mp4' ? 'video/mp4' : 'text/plain',
                     });
-                    res.setHeaders(headers).sendFile(filepath);
+                    res.setHeaders(headers);
+                    if (ext === 'm3u8' || ('ts' === ext && stats.size < 1024 * 1024 * 3)) {
+                        let content = (0, node_fs_1.readFileSync)(filepath);
+                        if (ext === 'm3u8') {
+                            const baseDirName = (0, node_path_1.basename)(filepath, '.m3u8');
+                            content = content
+                                .toString('utf8')
+                                .split('\n')
+                                .map(line => (line.endsWith('.ts') && !line.includes('/') ? `${baseDirName}/${line}` : line))
+                                .join('\n');
+                        }
+                        res.send(content);
+                        utils_js_1.logger.debug('[Localplay]file sent:', (0, console_log_colors_1.gray)(filepath), 'Size:', stats.size, 'bytes');
+                    }
+                    else {
+                        res.sendFile(filepath);
+                    }
                     return;
                 }
             }
-            utils_js_1.logger.error('Localplay file not found:', filepath);
+            utils_js_1.logger.error('[Localplay]file not found:', (0, console_log_colors_1.red)(filepath));
             res.status(404).send({ message: 'Not Found', code: 404 });
         });
         app.post('/api/getM3u8Urls', (req, res) => {
-            const url = req.body.url;
+            const { url, headers, subUrlRegex } = req.body;
             if (!url) {
                 res.json({ code: 1001, message: '无效的 url 参数' });
             }
             else {
-                (0, getM3u8Urls_js_1.getM3u8Urls)(url)
+                (0, getM3u8Urls_js_1.getM3u8Urls)({ url, headers, subUrlRegex })
                     .then(d => res.json({ code: 0, data: Array.from(d) }))
                     .catch(err => res.json({ code: 401, message: err.message }));
             }

package/cjs/video-parser/index.js

@@ -73,7 +73,7 @@ class VideoParser {
         }
         catch (error) {
             console.error('解析 URL 失败', url, error);
-            return null;
+            return { url, platform: 'unknown' };
         }
     }
     /**

package/client/index.html

@@ -170,9 +170,9 @@
                     <input type="checkbox" :checked="selectedTasks.includes(task.url)"
                       @change="toggleTaskSelection(task.url)"
                       class="form-checkbox h-5 w-5 text-blue-500 rounded focus:ring-blue-500 mr-2"
-                      :title="'选择任务：' + (task.localVideo || task.filename || task.url)">
+                      :title="'选择任务：' + task.showName">
                     <h3 class="font-bold text-green-600 truncate max-w-[calc(100vw-100px)]" :title="task.url">
-                      {{ task.filename || task.localVideo || task.url }}
+                      {{ task.showName }}
                     </h3>
                     <div class="absolute right-1 top-1 text-xs rounded overflow-hidden">
                       <span v-if="task.status === 'pending'"
@@ -662,7 +662,7 @@ services:
           if (this.searchQuery) {
             const query = this.searchQuery.toLowerCase();
             tasks = tasks.filter(task => {
-              const filename = (task.localVideo || task.filename || task.url).toLowerCase();
+              const filename = (task.localVideo || task.filename || task.dlOptions?.filename || task.url).toLowerCase();
               return filename.includes(query) || task.url.toLowerCase().includes(query);
             });
           }
@@ -674,7 +674,7 @@ services:
 
           // 排序：resume > pending > pause > error > done
           const statusOrder = { resume: 0, pending: 1, pause: 2, error: 3, done: 4 };
-          tasks.sort((a, b) => (statusOrder[a.status] - statusOrder[b.status]) || (a.status === 'done' ? (b.filename - a.filename) : (b.endTime - a.endTime)));
+          tasks.sort((a, b) => (statusOrder[a.status] - statusOrder[b.status]) || (a.status === 'done' ? (b.filename - a.filename) : ((a.startTime || 0) - (b.startTime || 0))));
 
           // 更新 queueStatus
           const queueStatus = {
@@ -683,6 +683,7 @@ services:
             maxConcurrent: this.config.maxDownloads,
           };
           tasks.forEach(task => {
+            task.showName = task.filename || task.dlOptions?.filename || task.localVideo || task.url;
             if (task.status === 'pending') {
               queueStatus.queueLength++;
             } else if (task.status === 'resume') {
@@ -824,14 +825,14 @@ services:
           }
         },
         /** 显示新建下载弹窗 */
-        showNewDownloadDialog: function () {
+        showNewDownloadDialog() {
           Swal.fire({
             title: '新建下载',
-            width: '800px',
+            width: '900px',
             html: `
               <div class="text-left">
                 <div class="flex flex-row gap-4">
-                  <input type="text" id="playUrl" placeholder="输入视频播放页地址，尝试提取m3u8下载链接" autocomplete="off" id="urlInput" class="flex-1 border border-gray-300 rounded px-3 py-2 focus:outline-none focus:ring-2 focus:ring-blue-400" value="">
+                  <input type="text" id="playUrl" placeholder="[实验性]输入列表页或播放页地址，提取m3u8链接" autocomplete="off" id="urlInput" class="flex-1 border border-gray-300 rounded px-3 py-2 focus:outline-none focus:ring-2 focus:ring-blue-400" value="">
                   <div class="flex flex-row gap-1">
                     <button type="button" id="getM3u8UrlsBtn" class="player-btn px-2 py-1 bg-blue-600 text-white rounded hover:bg-blue-700 focus:outline-none">
                       提取
@@ -839,6 +840,13 @@ services:
                   </div>
                 </div>
 
+                <div class="mt-4">
+                  <div class="flex flex-row gap-2 items-center">
+                    <input id="subUrlRegex" class="flex-1 p-2 border rounded-lg focus:border-blue-500" placeholder="[实验性](可选)播放页链接特征规则">
+                  </div>
+                  <p class="ml-2 mt-1 text-sm text-gray-500">用于从视频列表页准确识别播放地址。如：<code>play/845-1-</code></p>
+                </div>
+
                 <div class="mt-4">
                   <label class="block text-sm font-bold text-gray-700 mb-1">视频链接（每行一个，支持m3u8地址及抖音、微博、皮皮虾视频分享链接）</label>
                   <textarea id="downloadUrls" class="w-full p-2 border rounded-lg focus:ring-blue-500" rows="3" placeholder="格式： URL | 名称(可选)、名称 | URL"></textarea>
@@ -877,8 +885,8 @@ services:
             preConfirm: () => {
               const urlsText = document.getElementById('downloadUrls').value.trim();
               const filename = document.getElementById('filename').value.trim();
-              const saveDir = document.getElementById('saveDir').value.trim();
-              const headersText = document.getElementById('headers').value.trim();
+              let saveDir = document.getElementById('saveDir').value.trim();
+              const headers = document.getElementById('headers').value.trim();
               const ignoreSegments = document.getElementById('ignoreSegments').value.trim();
 
               if (!urlsText) {
@@ -899,9 +907,14 @@ services:
                 return false;
               }
 
+              if (urls.length > 1 && filename && !saveDir.includes(filename)) {
+                if (!saveDir) saveDir = this.config.saveDir;
+                saveDir = saveDir.replace(/\/?$/, '') + '/' + filename;
+              }
+
               return urls.map((item, idx) => ({
                 url: item.url,
-                filename: item.name || (filename ? `${filename}第${idx + 1}集` : ''),
+                filename: item.name || (filename ? `${filename}${urls.length > 1 ? `第${idx + 1}集` : ''}` : ''),
                 saveDir,
                 headers,
                 ignoreSegments,
@@ -924,7 +937,9 @@ services:
               btn.setAttribute('disabled', 'disabled');
               btn.innerText = '解析中...';
 
-              T.post('/api/getM3u8Urls', { url }).then(r => {
+              const headers = document.getElementById('headers').value.trim();
+              const subUrlRegex = document.getElementById('subUrlRegex').value.trim();
+              T.post('/api/getM3u8Urls', { url, headers, subUrlRegex }).then(r => {
                 if (Array.isArray(r.data)) {
                   document.getElementById('downloadUrls').value = r.data.map(d => d.join(' | ')).join('\n');
                   T.toast(r.message || `解析完成！获取到 ${r.data.length} 个地址`);
@@ -941,7 +956,7 @@ services:
           try {
             list.forEach(async (item, idx) => {
               Object.entries(item).forEach(([key, value]) => !value && delete item[key]);
-              this.tasks[item.url] = { status: 'resume', progress: 0, speed: 0, remainingTime: 0, size: 0 };
+              if (!/\.html?$/.test(item.url)) this.tasks[item.url] = { status: 'resume', progress: 0, speed: 0, remainingTime: 0, size: 0 };
             });
             const r = await T.post('/api/download', { list });
             if (!r.code) T.toast(r.message || '批量下载已开始');
@@ -1026,19 +1041,20 @@ services:
         },
         showTaskDetail(task) {
           console.log(task);
+          const isResume = task.status === 'resume';
           const taskInfo = {
             名称: task.filename || task.localVideo,
             状态: T.taskStatus[task.status] || task.status,
-            大小: `${T.formatSize(task.downloadedSize)} / ${task.size ? T.formatSize(task.size) : ''}`,
-            分片: `<span class=text-green-600>${task.tsSuccess}</span> / <span class=text-red-500>${task.tsFailed}</span> / ${task.tsCount}`,
-            进度: `${task.progress}%`,
-            平均速度: `${task.avgSpeedDesc}/s`,
+            大小: `${T.formatSize(task.downloadedSize || 0)} / ${task.size ? T.formatSize(task.size) : ''}`,
+            分片: task.tsCount ? `<span class=text-green-600>${task.tsSuccess}</span> / <span class=text-red-500>${task.tsFailed}</span> / ${task.tsCount}` : '-',
+            进度: `${task.progress || '-'}%`,
+            平均速度: `${task.avgSpeedDesc || '-'}/s`,
             并发线程: task.threadNum,
             下载地址: task.url,
             保存位置: task.localVideo || task.options?.saveDir,
-            开始时间: new Date(task.startTime).toLocaleString(),
-            结束时间: task.endTime && new Date(task.endTime).toLocaleString(),
-            预估还需: !task.endTime && task.remainingTime && T.formatTimeCost(task.remainingTime),
+            开始时间: task.startTime && new Date(task.startTime).toLocaleString(),
+            结束时间: !isResume && task.endTime && new Date(task.endTime).toLocaleString(),
+            预估还需: isResume && task.remainingTime && T.formatTimeCost(task.remainingTime),
             相关信息: task.errmsg && `<span class=text-red-600>${task.errmsg}</span>`
           };
           T.alert({
@@ -1057,7 +1073,8 @@ services:
         },
         /** 边下边播 */
         localPlay: function (task) {
-          const url = location.origin + '/localplay/' + (task.localVideo || task.localM3u8);
+          const filepath = task.localVideo || task.localM3u8;
+          const url = location.origin + `/localplay/${encodeURIComponent(filepath)}`;
           console.log(task);
           Swal.fire({
             title: task?.options.filename || task.url,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lzwme/m3u8-dl",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "description": "Batch download of m3u8 files and convert to mp4",
   "main": "cjs/index.js",
   "types": "cjs/index.d.ts",
@@ -44,25 +44,25 @@
     "registry": "https://registry.npmjs.com"
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.0.6",
-    "@eslint/js": "^9.29.0",
+    "@biomejs/biome": "^2.1.2",
+    "@eslint/js": "^9.31.0",
     "@lzwme/fed-lint-helper": "^2.6.6",
     "@types/express": "^5.0.3",
     "@types/m3u8-parser": "^7.2.2",
-    "@types/node": "^24.0.4",
+    "@types/node": "^24.0.15",
     "@types/ws": "^8.18.1",
-    "@typescript-eslint/eslint-plugin": "^8.35.0",
-    "@typescript-eslint/parser": "^8.35.0",
-    "eslint": "^9.29.0",
-    "eslint-config-prettier": "^10.1.5",
-    "eslint-plugin-prettier": "^5.5.1",
+    "@typescript-eslint/eslint-plugin": "^8.37.0",
+    "@typescript-eslint/parser": "^8.37.0",
+    "eslint": "^9.31.0",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-prettier": "^5.5.3",
     "express": "^5.1.0",
     "husky": "^9.1.7",
     "prettier": "^3.6.2",
     "standard-version": "^9.5.0",
     "typescript": "^5.8.3",
-    "typescript-eslint": "^8.35.0",
-    "ws": "^8.18.2"
+    "typescript-eslint": "^8.37.0",
+    "ws": "^8.18.3"
   },
   "dependencies": {
     "@lzwme/fe-utils": "^1.9.0",