@lzwme/m3u8-dl 1.3.1 → 1.4.1

package/cjs/index.d.ts

@@ -1,4 +1,5 @@
 export * from './lib/m3u8-download';
 export * from './lib/file-download';
+export * from './lib/getM3u8Urls';
 export * from './lib/parseM3u8';
 export * from './video-parser';

package/cjs/index.js

@@ -16,5 +16,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./lib/m3u8-download"), exports);
 __exportStar(require("./lib/file-download"), exports);
+__exportStar(require("./lib/getM3u8Urls"), exports);
 __exportStar(require("./lib/parseM3u8"), exports);
 __exportStar(require("./video-parser"), exports);

package/cjs/lib/file-download.js

@@ -8,7 +8,7 @@ const format_options_js_1 = require("./format-options.js");
 const utils_js_1 = require("./utils.js");
 async function fileDownload(u, opts) {
     utils_js_1.logger.debug('fileDownload', u, opts);
-    const [url, options] = (0, format_options_js_1.formatOptions)(u, opts);
+    const { url, options } = (0, format_options_js_1.formatOptions)(u, opts);
     const startTime = Date.now();
     const stats = {
         url,

package/cjs/lib/format-options.d.ts

@@ -1,2 +1,6 @@
 import type { M3u8DLOptions } from '../types';
-export declare function formatOptions(url: string, opts: M3u8DLOptions): readonly [string, M3u8DLOptions, string];
+export declare function formatOptions(url: string, opts: M3u8DLOptions): {
+    url: string;
+    options: M3u8DLOptions;
+    urlMd5: string;
+};

package/cjs/lib/format-options.js

@@ -76,5 +76,5 @@ function formatOptions(url, opts) {
         utils_1.logger.updateOptions({ levelType: 'debug' });
         utils_1.logger.debug('[m3u8-DL]options', options, url);
     }
-    return [url, options, urlMd5];
+    return { url, options, urlMd5 };
 }

package/cjs/lib/getM3u8Urls.d.ts

@@ -0,0 +1,3 @@
+import type { OutgoingHttpHeaders } from 'node:http';
+/** 从指定的 url 页面中提取 m3u8 播放地址。deep 指定搜索页面深度 */
+export declare function getM3u8Urls(url: string, headers?: OutgoingHttpHeaders | string, deep?: number, visited?: Set<string>): Promise<Map<string, string>>;

package/cjs/lib/getM3u8Urls.js

@@ -0,0 +1,76 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getM3u8Urls = getM3u8Urls;
+const fe_utils_1 = require("@lzwme/fe-utils");
+const utils_js_1 = require("./utils.js");
+/** 从指定的 url 页面中提取 m3u8 播放地址。deep 指定搜索页面深度 */
+async function getM3u8Urls(url, headers = {}, deep = 2, visited = new Set()) {
+    const req = new fe_utils_1.Request({ headers: { 'content-type': 'text/html; charset=UTF-8', referer: new URL(url).origin, ...(0, utils_js_1.formatHeaders)(headers) } });
+    const { data: html, response } = await req.get(url);
+    const m3u8Urls = new Map();
+    if (!response.statusCode || response.statusCode >= 400) {
+        utils_js_1.logger.error('获取页面失败:', fe_utils_1.color.red(url), response.statusCode, response.statusMessage, html);
+        return m3u8Urls;
+    }
+    // 从 html 中正则匹配提取 m3u8
+    const m3u8Regex = /https?:[^\s'"]+\.m3u8(\?[^\s'"]*)?/gi;
+    // 1. 直接正则匹配 m3u8 地址
+    let match = m3u8Regex.exec(html);
+    const title = (/<title>([^<]+)</.exec(html)?.[1].split('-')[0] || '').replace(/在线播放|详情|介绍|《|》/g, '').trim();
+    while (match) {
+        const href = match[0].replaceAll('\\/', '/');
+        match = m3u8Regex.exec(html);
+        if (!m3u8Urls.has(href))
+            m3u8Urls.set(href, title);
+    }
+    // 找到了多个链接，修改 title 添加序号
+    if (m3u8Urls.size > 3 && !/第.+(集|期)/.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);
+        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].replace(/<[^>]+>/g, '');
+            aMatch = aTagRegex.exec(html);
+            if (!href || visited.has(href) || !href.startsWith(origin))
+                continue;
+            if (!/集|期|HD|高清|抢先|BD/.test(text))
+                continue;
+            subPageUrls.set(href, text);
+            utils_js_1.logger.debug(' > 提取到m3u8链接: ', fe_utils_1.color.gray(href), text);
+        }
+        for (const [href, text] of subPageUrls) {
+            try {
+                visited.add(href);
+                const subUrls = await getM3u8Urls(href, headers, deep - 1, visited);
+                utils_js_1.logger.debug(' > 从子页面提取: ', fe_utils_1.color.gray(href), text, subUrls.size);
+                if (subUrls.size === 0 && m3u8Urls.size === 0) {
+                    failedSubPages++;
+                    if (failedSubPages > 3) {
+                        utils_js_1.logger.warn(`连续查找 ${failedSubPages} 个子页面均未获取到，不再继续`, url, href);
+                        return m3u8Urls;
+                    }
+                }
+                for (const [u, t] of subUrls)
+                    m3u8Urls.set(u, subUrls.size === 1 || /第.+(集|期)/.test(t) ? t : text);
+            }
+            catch (err) {
+                utils_js_1.logger.warn(' > 尝试访问子页面异常: ', fe_utils_1.color.red(href), err.message);
+            }
+        }
+    }
+    return m3u8Urls;
+}
+// logger.updateOptions({ levelType: 'debug' });
+// getM3u8Urls(process.argv.slice(2)[0]).then(d => console.log(d));

package/cjs/lib/m3u8-download.js

@@ -86,9 +86,8 @@ const cache = {
 };
 const tsDlFile = (0, node_path_1.resolve)(__dirname, './ts-download.js');
 exports.workPollPublic = new worker_pool_js_1.WorkerPool(tsDlFile);
-async function m3u8InfoParse(url, options = {}) {
-    let urlMd5 = '';
-    [url, options, urlMd5] = (0, format_options_js_1.formatOptions)(url, options);
+async function m3u8InfoParse(u, o = {}) {
+    const { url, options, urlMd5 } = (0, format_options_js_1.formatOptions)(u, o);
     const ext = (0, utils_js_1.isSupportFfmpeg)() ? '.mp4' : '.ts';
     /** 最终合并转换后的文件路径 */
     let filepath = (0, node_path_1.resolve)(options.saveDir, options.filename);
@@ -194,16 +193,12 @@ async function m3u8Download(url, options = {}) {
         return result;
     }
     if (result.m3u8Info?.tsCount > 0) {
-        const workPoll = new worker_pool_js_1.WorkerPool(tsDlFile);
-        let n = options.threadNum - workPoll.numThreads;
-        if (n > 0)
-            while (n--)
-                workPoll.addNewWorker();
+        const workPoll = new worker_pool_js_1.WorkerPool(tsDlFile, options.threadNum);
         const { m3u8Info } = result;
         const startTime = Date.now();
         const barrier = new fe_utils_1.Barrier();
         /** 本地开始播放最少需要下载的 ts 文件数量 */
-        const playStart = Math.min(options.threadNum + 2, result.m3u8Info.tsCount);
+        const playStart = Math.min(options.threadNum + 2, m3u8Info.tsCount);
         const stats = {
             url,
             startTime,
@@ -301,6 +296,7 @@ async function m3u8Download(url, options = {}) {
             options.onInited(stats, m3u8Info, workPoll);
         runTask(m3u8Info.data);
         await barrier.wait();
+        workPoll.close();
         if (stats.tsFailed > 0) {
             utils_js_1.logger.warn('Download Failed! Please retry!', stats.tsFailed);
         }
@@ -319,5 +315,9 @@ async function m3u8Download(url, options = {}) {
 function m3u8DLStop(url, wp = exports.workPollPublic) {
     if (!wp?.removeTask)
         return 0;
-    return wp.removeTask(task => task.url === url);
+    const count = wp.removeTask(task => task.url === url);
+    // 进行中的任务，最多允许继续下载 10s
+    if (count === 0 && wp !== exports.workPollPublic)
+        setTimeout(() => wp.close(), 10_000);
+    return count;
 }

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/lib/worker_pool.js

@@ -87,6 +87,10 @@ class WorkerPool extends node_events_1.EventEmitter {
             this.numThreads = this.workers.length;
     }
     runTask(task, callback) {
+        if (this.totalNum === 0) {
+            console.error('未初始化 worker 或已销毁');
+            return;
+        }
         if (this.freeWorkers.length === 0) {
             this.tasks.push({ task, callback });
             return;

package/cjs/m3u8-batch-download.js

@@ -38,8 +38,8 @@ async function formatUrls(urls, options) {
                 continue;
             }
         }
-        const [u, o] = (0, format_options_1.formatOptions)(url, options);
-        taskset.set(u, o);
+        const r = (0, format_options_1.formatOptions)(url, options);
+        taskset.set(r.url, r.options);
     }
     return taskset;
 }

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

@@ -42,6 +42,7 @@ const console_log_colors_1 = require("console-log-colors");
 const file_download_js_1 = require("../lib/file-download.js");
 const format_options_js_1 = require("../lib/format-options.js");
 const m3u8_download_js_1 = require("../lib/m3u8-download.js");
+const getM3u8Urls_js_1 = require("../lib/getM3u8Urls.js");
 const utils_js_1 = require("../lib/utils.js");
 const index_js_1 = require("../video-parser/index.js");
 const rootDir = (0, node_path_1.resolve)(__dirname, '../..');
@@ -128,7 +129,7 @@ class DLServer {
             return;
         }
         this.dlCache.forEach(item => {
-            if (item.status === 'done' && item.localVideo && !(0, node_fs_1.existsSync)(item.localVideo)) {
+            if (item.status === 'done' && (!item.localVideo || !(0, node_fs_1.existsSync)(item.localVideo))) {
                 item.status = 'error';
                 item.errmsg = '已删除';
             }
@@ -197,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);
@@ -248,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) {
-        const dlOptions = (0, format_options_js_1.formatOptions)(url, { ...this.cfg.dlOptions, ...options, cacheDir: this.options.cacheDir })[1];
+    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, 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,
@@ -269,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);
@@ -293,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') {
@@ -316,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) {
@@ -337,24 +357,23 @@ class DLServer {
     }
     initRouters() {
         const { app } = this;
-        // health check
         app.get('/healthcheck', (_req, res) => {
             res.json({ message: 'ok', code: 0 });
         });
-        app.post('/config', (req, res) => {
+        app.post('/api/config', (req, res) => {
             const config = req.body;
             this.saveConfig(config);
             res.json({ message: 'Config updated successfully', code: 0 });
         });
-        app.get('/config', (_req, res) => {
+        app.get('/api/config', (_req, res) => {
             res.json({ ...this.cfg.dlOptions, ...this.cfg.webOptions });
         });
         // API to get all download progress
-        app.get('/tasks', (_req, res) => {
+        app.get('/api/tasks', (_req, res) => {
             res.json(Object.fromEntries(this.dlCacheClone()));
         });
         // API to get queue status
-        app.get('/queue/status', (_req, res) => {
+        app.get('/api/queue/status', (_req, res) => {
             const pendingTasks = Array.from(this.dlCache.entries()).filter(([_, item]) => item.status === 'pending');
             const activeTasks = Array.from(this.dlCache.entries()).filter(([_, item]) => item.status === 'resume');
             res.json({
@@ -364,7 +383,7 @@ class DLServer {
             });
         });
         // API to clear queue
-        app.post('/queue/clear', (_req, res) => {
+        app.post('/api/queue/clear', (_req, res) => {
             let count = 0;
             for (const [url, item] of this.dlCache.entries()) {
                 if (item.status === 'pending') {
@@ -377,7 +396,7 @@ class DLServer {
             res.json({ message: `已清空 ${count} 个等待中的下载任务`, code: 0 });
         });
         // API to update task priority
-        app.post('/priority', (req, res) => {
+        app.post('/api/priority', (req, res) => {
             const { url, priority } = req.body;
             const item = this.dlCache.get(url);
             if (!item) {
@@ -389,7 +408,7 @@ class DLServer {
             res.json({ message: '已更新任务优先级', code: 0 });
         });
         // API to start m3u8 download
-        app.post('/download', (req, res) => {
+        app.post('/api/download', (req, res) => {
             const { url, options = {}, list = [] } = req.body;
             try {
                 if (list.length) {
@@ -409,7 +428,7 @@ class DLServer {
             }
         });
         // API to pause download
-        app.post('/pause', (req, res) => {
+        app.post('/api/pause', (req, res) => {
             const { urls, all = false } = req.body;
             const urlsToPause = all ? [...this.dlCache.keys()] : urls;
             const list = [];
@@ -417,17 +436,19 @@ class DLServer {
                 const item = this.dlCache.get(url);
                 if (['resume', 'pending'].includes(item?.status)) {
                     (0, m3u8_download_js_1.m3u8DLStop)(url, item.workPoll);
-                    item.status = item.tsSuccess === item.tsCount ? 'done' : 'pause';
+                    item.status = item.tsSuccess > 0 && item.tsSuccess === item.tsCount ? 'done' : 'pause';
                     const { workPoll, ...tItem } = item;
                     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
-        app.post('/resume', (req, res) => {
+        app.post('/api/resume', (req, res) => {
             const { urls, all = false } = req.body;
             const urlsToResume = all ? [...this.dlCache.keys()] : urls;
             const list = [];
@@ -446,7 +467,7 @@ class DLServer {
             res.json({ message: list.length ? `已恢复 ${list.length} 个下载任务` : '没有找到可恢复的下载任务', code: 0, count: list.length });
         });
         // API to delete download
-        app.post('/delete', (req, res) => {
+        app.post('/api/delete', (req, res) => {
             const { urls, deleteCache = false, deleteVideo = false } = req.body;
             const urlsToDelete = urls;
             const list = [];
@@ -458,20 +479,27 @@ class DLServer {
                     list.push(item.url);
                     if (deleteCache && item.current?.tsOut) {
                         const cacheDir = (0, node_path_1.dirname)(item.current.tsOut);
-                        if ((0, node_fs_1.existsSync)(cacheDir))
+                        if ((0, node_fs_1.existsSync)(cacheDir)) {
                             (0, node_fs_1.rmSync)(cacheDir, { recursive: true });
+                            utils_js_1.logger.debug('删除缓存目录：', cacheDir);
+                        }
                     }
                     if (deleteVideo) {
                         ['.ts', '.mp4'].forEach(ext => {
                             const filepath = (0, node_path_1.resolve)(item.options.saveDir, item.options.filename + ext);
-                            if ((0, node_fs_1.existsSync)(filepath))
+                            if ((0, node_fs_1.existsSync)(filepath)) {
                                 (0, node_fs_1.unlinkSync)(filepath);
+                                utils_js_1.logger.debug('删除文件：', filepath);
+                            }
                         });
                     }
                 }
             }
-            if (list.length)
+            if (list.length) {
                 this.wsSend('delete', list);
+                this.saveCache();
+                this.startNextPending();
+            }
             res.json({ message: `已删除 ${list.length} 个下载任务`, code: 0, count: list.length });
         });
         app.get(/^\/localplay\/(.*)$/, (req, res) => {
@@ -512,13 +540,40 @@ 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, headers } = req.body;
+            if (!url) {
+                res.json({ code: 1001, message: '无效的 url 参数' });
+            }
+            else {
+                (0, getM3u8Urls_js_1.getM3u8Urls)(url, headers)
+                    .then(d => res.json({ code: 0, data: Array.from(d) }))
+                    .catch(err => res.json({ code: 401, message: err.message }));
+            }
+        });
     }
 }
 exports.DLServer = DLServer;

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

@@ -7,7 +7,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta name="apple-mobile-web-app-capable" content="yes">
   <title>M3U8 下载器</title>
-  <link rel="icon" type="image/svg+xml" href="logo.svg">
+  <link rel="icon" type="image/png" href="logo.png">
   <link rel="stylesheet" href="https://s4.zstatic.net/ajax/libs/font-awesome/6.7.2/css/all.min.css"
     integrity="sha512-Evv84Mr4kqVGRNSgIGL/F/aIDqQb7xQ2vcrdIwxfjThSH8CSR7PBEakCr51Ck+w+/U6swU2Im1vVX0SVk9ABhg=="
     crossorigin="anonymous" referrerpolicy="no-referrer" />
@@ -36,7 +36,7 @@
     <div class="sidebar p-4" :class="{ 'show': !sidebarCollapsed }">
       <div class="mb-8">
         <div class="flex items-center mb-4">
-          <img src="logo.svg" alt="M3U8 下载器" class="w-8 h-8 mr-2">
+          <img src="logo.png" alt="M3U8 下载器" class="w-8 h-8 mr-2">
           <h1 class="text-xl font-bold text-gray-800">M3U8 下载器</h1>
         </div>
         <button @click="showNewDownloadDialog"
@@ -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'"
@@ -521,7 +521,7 @@ services:
       alert(msg, p) {
         p = typeof msg === 'object' ? msg : Object.assign({ text: msg }, p);
         if (!p.toast) p.allowOutsideClick = false;
-        return Swal.fire(Object.assign({ icon: 'info', showConfirmButton: false, showCloseButton: true }, p));
+        return Swal.fire(Object.assign({ icon: 'info', showConfirmButton: false, showCloseButton: true, confirmButtonText: '确定', cancelButtonText: '关闭' }, p));
       },
       confirm(msg, p) {
         return this.alert(msg, { showConfirmButton: true, showCancelButton: true, showCloseButton: true, confirmButtonText: '确认', cancelButtonText: '取消' });
@@ -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') {
@@ -790,7 +791,7 @@ services:
         },
         /** 获取配置 */
         fetchConfig: async function () {
-          const config = await T.get('/config');
+          const config = await T.get('/api/config');
           if (config.code) {
             console.error('获取配置失败:', config);
             T.alert('获取配置失败: ' + config.message, { icon: 'error' });
@@ -803,7 +804,7 @@ services:
         },
         /** 更新配置 */
         updateConfig: async function () {
-          const result = await T.post('/config', this.config);
+          const result = await T.post('/api/config', this.config);
           T.toast(result.message || '配置已更新', { icon: result.code ? 'error' : 'success' });
         },
         updateLocalConfig: async function () {
@@ -824,24 +825,37 @@ services:
           }
         },
         /** 显示新建下载弹窗 */
-        showNewDownloadDialog: function () {
+        showNewDownloadDialog() {
           Swal.fire({
             title: '新建下载',
-            width: '800px',
+            width: '900px',
             html: `
               <div class="text-left">
-                <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>
+                <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="">
+                  <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">
+                      提取
+                    </button>
+                  </div>
+                </div>
 
                 <div class="mt-4">
-                  <label class="block text-sm font-bold text-gray-700 mb-1">视频名称（可选）</label>
-                  <input id="filename" class="w-full p-2 border rounded-lg focus:border-blue-500" placeholder="请输入视频名称">
-                  <p class="mt-1 text-sm text-gray-500">若输入多个链接，将依次以"视频名称+第N集"命名</p>
+                  <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>
                 </div>
 
                 <div class="mt-4">
+                  <div class="flex flex-row gap-2 items-center">
+                    <label class="block text-sm font-bold text-gray-700 mb-1">视频名称</label>
+                    <input id="filename" 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">若输入多个链接，将依次以"视频名称+第N集"命名</p>
+                </div>
+
+                <div class="mt-4 flex flex-row gap-2 items-center">
                   <label class="block text-sm font-bold text-gray-700 mb-1">保存位置</label>
-                  <input id="saveDir" class="w-full p-2 border rounded-lg focus:ring-blue-500" placeholder="请输入保存路径" value="${this.config.saveDir || ''}">
+                  <input id="saveDir" class="flex-1 p-2 border rounded-lg focus:ring-blue-500" placeholder="请输入保存路径" value="${this.config.saveDir || ''}">
                 </div>
 
                 <div class="mt-4">
@@ -851,7 +865,7 @@ services:
 
                 <div class="mt-4">
                   <label class="block text-sm font-bold text-gray-700 mb-1">自定义请求头</label>
-                  <textarea id="headers" class="w-full p-2 border rounded-lg focus:ring-blue-500" rows="4" placeholder="每行一个请求头（微博视频必须设置 Cookie），格式：Key: Value&#10;例如：&#10;Referer: https://example.com&#10;Cookie: token=123"></textarea>
+                  <textarea id="headers" class="w-full p-2 border rounded-lg focus:ring-blue-500" rows="3" placeholder="每行一个（微博视频须设置 Cookie），格式：Key: Value。例如：&#10;Referer: https://example.com&#10;Cookie: token=123"></textarea>
                 </div>
               </div>
             `,
@@ -864,8 +878,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) {
@@ -886,9 +900,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,
@@ -897,15 +916,40 @@ services:
           }).then((result) => {
             if (result.isConfirmed) this.startBatchDownload(result.value);
           });
+
+          setTimeout(() => {
+            const btn = document.getElementById('getM3u8UrlsBtn');
+            if (!btn) return;
+
+            btn.addEventListener('click', async () => {
+              const url = document.getElementById('playUrl').value.trim();
+              if (!/^https?:/.test(url)) {
+                return Swal.showValidationMessage('请输入正确的 URL 地址');
+              }
+
+              btn.setAttribute('disabled', 'disabled');
+              btn.innerText = '解析中...';
+
+              T.post('/api/getM3u8Urls', { url, headers: document.getElementById('headers').value.trim() }).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} 个地址`);
+                }
+
+                btn.removeAttribute('disabled');
+                btn.innerText = '提取';
+              });
+            });
+          }, 500);
         },
         /** 批量下载 */
         startBatchDownload: async function (list) {
           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('/download', { list });
+            const r = await T.post('/api/download', { list });
             if (!r.code) T.toast(r.message || '批量下载已开始');
             this.forceUpdate();
           } catch (error) {
@@ -917,7 +961,7 @@ services:
         pauseDownload: async function (urls) {
           if (!urls) urls = this.selectedTasks;
           if (typeof urls === 'string') urls = [urls];
-          const r = await T.post(`/pause`, { urls, all: urls[0] === 'all' });
+          const r = await T.post('/api/pause', { urls, all: urls[0] === 'all' });
           if (!r.code) T.toast(r.message || '已暂停下载');
           if (urls === this.selectedTasks) this.selectedTasks = [];
         },
@@ -925,7 +969,7 @@ services:
         resumeDownload: async function (urls) {
           if (!urls) urls = this.selectedTasks;
           if (typeof urls === 'string') urls = [urls];
-          const r = await T.post(`/resume`, { urls, all: urls[0] === 'all' });
+          const r = await T.post('/api/resume', { urls, all: urls[0] === 'all' });
           if (!r.code) T.toast(r.message || '已恢复下载');
           if (urls === this.selectedTasks) this.selectedTasks = [];
         },
@@ -965,7 +1009,7 @@ services:
             });
 
             if (result.isConfirmed) {
-              const r = await T.post(`/delete`, {
+              const r = await T.post('/api/delete', {
                 urls,
                 deleteCache: result.value.deleteCache,
                 deleteVideo: result.value.deleteVideo
@@ -984,28 +1028,30 @@ services:
           }
         },
         getTasks: async function () {
-          this.tasks = await T.get('/tasks');
+          this.tasks = await T.get('/api/tasks');
         },
         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>`
           };
-          Swal.fire({
+          T.alert({
             title: '任务详情',
             width: 1000,
+            icon: '',
             html: [
               '<div class="flex-col full-width text-left">',
               Object.entries(taskInfo).filter(d => d[1]).map(
@@ -1018,7 +1064,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,
@@ -1054,12 +1101,12 @@ services:
         },
         // 更新任务优先级
         updatePriority: async function (url, priority) {
-          const r = await T.post('/priority', { url, priority: parseInt(priority) });
+          const r = await T.post('/api/priority', { url, priority: parseInt(priority) });
           T.toast(r.message || '已更新优先级');
         },
         // 获取队列状态
         getQueueStatus: async function () {
-          const status = await T.get('/queue/status');
+          const status = await T.get('/api/queue/status');
           if (status?.maxConcurrent) this.queueStatus = status;
         },
         // 清空下载队列
@@ -1075,7 +1122,7 @@ services:
           });
 
           if (result.isConfirmed) {
-            const r = await T.post('/queue/clear');
+            const r = await T.post('/api/queue/clear');
             T.toast(r.message || '已清空下载队列');
             this.getQueueStatus();
           }

package/client/style.css

@@ -1,3 +1,11 @@
+::placeholder {
+  font-size: 14px;
+}
+
+.swal2-html-container textarea, input {
+  font-size: 16px !important;
+}
+
 #app {
   max-width: 1400px;
   margin: auto;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lzwme/m3u8-dl",
-  "version": "1.3.1",
+  "version": "1.4.1",
   "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.0",
-    "@eslint/js": "^9.29.0",
+    "@biomejs/biome": "^2.1.1",
+    "@eslint/js": "^9.30.1",
     "@lzwme/fed-lint-helper": "^2.6.6",
     "@types/express": "^5.0.3",
     "@types/m3u8-parser": "^7.2.2",
-    "@types/node": "^24.0.3",
+    "@types/node": "^24.0.12",
     "@types/ws": "^8.18.1",
-    "@typescript-eslint/eslint-plugin": "^8.34.1",
-    "@typescript-eslint/parser": "^8.34.1",
-    "eslint": "^9.29.0",
+    "@typescript-eslint/eslint-plugin": "^8.36.0",
+    "@typescript-eslint/parser": "^8.36.0",
+    "eslint": "^9.30.1",
     "eslint-config-prettier": "^10.1.5",
-    "eslint-plugin-prettier": "^5.5.0",
+    "eslint-plugin-prettier": "^5.5.1",
     "express": "^5.1.0",
     "husky": "^9.1.7",
-    "prettier": "^3.5.3",
+    "prettier": "^3.6.2",
     "standard-version": "^9.5.0",
     "typescript": "^5.8.3",
-    "typescript-eslint": "^8.34.1",
-    "ws": "^8.18.2"
+    "typescript-eslint": "^8.36.0",
+    "ws": "^8.18.3"
   },
   "dependencies": {
     "@lzwme/fe-utils": "^1.9.0",

package/client/logo.svg

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <!-- 背景圆形 -->
-  <circle cx="256" cy="256" r="240" fill="#1890ff" opacity="0.1"/>
-
-  <!-- 下载箭头 -->
-  <path d="M256 128v192M208 256l48 48 48-48" stroke="#1890ff" stroke-width="24" stroke-linecap="round" stroke-linejoin="round"/>
-
-  <!-- M3U8 文字 -->
-  <text x="256" y="384" font-family="Arial, sans-serif" font-size="64" font-weight="bold" fill="#1890ff" text-anchor="middle">M3U8</text>
-
-  <!-- 速度线条 -->
-  <path d="M128 192c32-32 64-32 96 0s64 32 96 0" stroke="#1890ff" stroke-width="16" stroke-linecap="round" opacity="0.6"/>
-  <path d="M128 224c32-32 64-32 96 0s64 32 96 0" stroke="#1890ff" stroke-width="16" stroke-linecap="round" opacity="0.4"/>
-  <path d="M128 256c32-32 64-32 96 0s64 32 96 0" stroke="#1890ff" stroke-width="16" stroke-linecap="round" opacity="0.2"/>
-</svg>