@lzwme/m3u8-dl 1.1.2 → 1.2.0

package/README.MD

@@ -128,13 +128,13 @@ for (const filepath of fileList) {
 
 ```bash
 # docker pull ghcr.io/lzwme/m3u8-dl:latest
-docker pull lzwme/m3u8dl-dl:latest
+docker pull renxia/m3u8dl-dl:latest
 
 docker run --rm -it \
   -v ./cache:/app/cache \
   -v ./downloads:/app/downloads \
   -p 6600:6600 \
-  lzwme/m3u8dl-server:latest
+  renxia/m3u8dl-dl:latest
 ```
 
 也可以基于 [docker-compose.yml](./docker/docker-compose.yml) 部署：

package/cjs/cli.js

@@ -66,6 +66,7 @@ commander_1.program
     .option('--no-del-cache', `下载成功后是否删除临时文件。默认为 true。保存临时文件可以在重复下载时识别缓存`)
     .option('--no-convert', '下载成功后，是否不合并转换为 mp4 文件。默认为 true。')
     .option('-H, --headers <headers>', `自定义请求头。格式为 key1=value1\nkey2=value2`)
+    .option('-T, --type <type>', `指定下载类型。默认根据URL自动识别，如果是批量下载多个不同 URL 类型，请不要设置。可选值：m3u8, file, parser`)
     .action(async (urls) => {
     const options = getOptions();
     utils_js_1.logger.debug(urls, options);

package/cjs/index.d.ts

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

package/cjs/index.js

@@ -15,4 +15,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/parseM3u8"), exports);
+__exportStar(require("./video-parser"), exports);

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

@@ -0,0 +1,2 @@
+import type { M3u8DLOptions, M3u8DLResult } from '../types';
+export declare function fileDownload(url: string, options: M3u8DLOptions): Promise<M3u8DLResult>;

package/cjs/lib/file-download.js

@@ -0,0 +1,81 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fileDownload = fileDownload;
+const node_path_1 = require("node:path");
+const fe_utils_1 = require("@lzwme/fe-utils");
+const console_log_colors_1 = require("console-log-colors");
+const utils_js_1 = require("./utils.js");
+const format_options_js_1 = require("./format-options.js");
+async function fileDownload(url, options) {
+    utils_js_1.logger.debug('fileDownload', url, options);
+    [url, options] = (0, format_options_js_1.formatOptions)(url, options);
+    const startTime = Date.now();
+    const stats = {
+        url,
+        startTime,
+        progress: 0,
+        tsSuccess: 0,
+        tsFailed: 0,
+        tsCount: 0,
+        duration: 0,
+        durationDownloaded: 0,
+        downloadedSize: 0,
+        avgSpeed: 0,
+        avgSpeedDesc: '0B/s',
+        speed: 0,
+        speedDesc: '0B/s',
+        remainingTime: 0,
+        filename: options.filename,
+        localVideo: (0, node_path_1.resolve)(options.saveDir, options.filename),
+    };
+    utils_js_1.logger.debug('开始下载', (0, console_log_colors_1.gray)(url), (0, console_log_colors_1.cyan)(stats.localVideo));
+    if (options.onInited)
+        options.onInited(stats, null, null);
+    try {
+        const r = await (0, fe_utils_1.download)({
+            url,
+            filepath: stats.localVideo,
+            paralelism: options.threadNum,
+            force: options.force,
+            requestOptions: {
+                headers: {
+                    referer: url,
+                    ...(0, utils_js_1.formatHeaders)(options.headers),
+                },
+                rejectUnauthorized: false,
+            },
+            onProgress: info => {
+                stats.progress = +info.percent.toFixed(2);
+                stats.size = info.size;
+                stats.downloadedSize = info.downloaded;
+                stats.speed = info.speed;
+                stats.speedDesc = (0, fe_utils_1.formatByteSize)(stats.speed) + '/s';
+                stats.remainingTime = Math.round((info.size - info.downloaded) / stats.speed);
+                if (options.showProgress) {
+                    const processBar = info.percent === -1 ? '' : '='.repeat(Math.floor(stats.progress * 0.2)).padEnd(20, '-');
+                    utils_js_1.logger.logInline(`${stats.progress}% [${(0, console_log_colors_1.greenBright)(processBar)}] ` +
+                        `${(0, console_log_colors_1.blueBright)((0, fe_utils_1.formatByteSize)(stats.downloadedSize))} ${(0, console_log_colors_1.yellowBright)((0, fe_utils_1.formatTimeCost)(startTime))} ${(0, console_log_colors_1.magentaBright)(stats.speedDesc)} ` +
+                        (stats.progress === 100 ? '\n' : stats.remainingTime ? `${(0, console_log_colors_1.cyan)((0, fe_utils_1.formatTimeCost)(Date.now() - stats.remainingTime))}` : ''));
+                }
+                if (options.onProgress) {
+                    return options.onProgress(info.downloaded, info.size, null, stats);
+                }
+            },
+        });
+        stats.endTime = Date.now();
+        return {
+            errmsg: r.filepath ? '下载完成' : '下载失败',
+            ...r,
+            stats,
+        };
+    }
+    catch (error) {
+        utils_js_1.logger.error('下载失败', error.message, (0, console_log_colors_1.gray)(url));
+        stats.errmsg = error.message;
+        return {
+            isExist: false,
+            errmsg: '下载失败: ' + error.message,
+            stats,
+        };
+    }
+}

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

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

package/cjs/lib/format-options.js

@@ -0,0 +1,80 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.formatOptions = formatOptions;
+const node_os_1 = require("node:os");
+const node_path_1 = require("node:path");
+const fe_utils_1 = require("@lzwme/fe-utils");
+const utils_1 = require("./utils");
+const video_parser_1 = require("../video-parser");
+const fileSupportExtList = [
+    '.mp4',
+    '.mkv',
+    '.avi',
+    '.mov',
+    '.wmv',
+    '.ts',
+    '.exe',
+    '.zip',
+    '.rar',
+    '.pdf',
+    '.doc',
+    '.docx',
+    '.xls',
+    '.xlsx',
+    '.ppt',
+    '.pptx',
+];
+function formatOptions(url, opts) {
+    const options = {
+        delCache: !opts.debug,
+        saveDir: process.cwd(),
+        showProgress: true,
+        ...opts,
+    };
+    let ext = options.filename ? (0, node_path_1.extname)(options.filename) : '';
+    if (!options.type) {
+        if (video_parser_1.VideoParser.getPlatform(url).platform !== 'unknown') {
+            options.type = 'parser';
+        }
+        else {
+            options.type = 'm3u8';
+            if (!url.includes('.m3u8')) {
+                const e = fileSupportExtList.find(d => url.includes(d));
+                if (e) {
+                    options.type = 'file';
+                    ext = e;
+                }
+            }
+        }
+    }
+    let [u, n] = url.split(/[|$]+/);
+    if (n && n.startsWith('http'))
+        [u, n] = [n, u];
+    url = u;
+    if (n) {
+        if (!options.filename)
+            options.filename = n;
+        else
+            options.filename = `${options.filename.replace(/\.(ts|mp4)$/, '')}-${n}${ext}`;
+    }
+    const urlMd5 = (0, fe_utils_1.md5)(url, false);
+    if (!options.filename) {
+        if (ext && url.includes(ext))
+            options.filename = (0, node_path_1.basename)(url.split(ext)[0]) + ext;
+        else
+            options.filename = urlMd5 + ext;
+    }
+    if (!(0, node_path_1.extname)(options.filename) && options.type !== 'file')
+        options.filename += ext || '.mp4';
+    if (!options.cacheDir)
+        options.cacheDir = `cache`;
+    if (options.headers)
+        options.headers = (0, utils_1.formatHeaders)(options.headers);
+    if (!options.threadNum || +options.threadNum <= 0)
+        options.threadNum = Math.min((0, node_os_1.cpus)().length * 2, 8);
+    if (options.debug) {
+        utils_1.logger.updateOptions({ levelType: 'debug' });
+        utils_1.logger.debug('[m3u8-DL]options', options, url);
+    }
+    return [url, options, urlMd5];
+}

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

@@ -1,5 +1,4 @@
-import { parseM3U8 } from './parseM3u8.js';
-import type { M3u8DLOptions, M3u8WorkerPool } from '../types/m3u8.js';
+import type { M3u8DLOptions, M3u8DLResult, M3u8WorkerPool } from '../types/m3u8.js';
 /** 下载队列管理 */
 export declare class DownloadQueue {
     private queue;
@@ -23,12 +22,5 @@ export declare class DownloadQueue {
 export declare const downloadQueue: DownloadQueue;
 export declare const workPollPublic: M3u8WorkerPool;
 export declare function preDownLoad(url: string, options: M3u8DLOptions, wp?: M3u8WorkerPool): Promise<void>;
-export declare function m3u8Download(url: string, options?: M3u8DLOptions): Promise<{
-    filepath?: string;
-    error?: Error;
-} | {
-    options: M3u8DLOptions;
-    m3u8Info: Awaited<ReturnType<typeof parseM3U8>> | null;
-    filepath: string;
-}>;
+export declare function m3u8Download(url: string, options?: M3u8DLOptions): Promise<M3u8DLResult>;
 export declare function m3u8DLStop(url: string, wp?: M3u8WorkerPool): number;

package/cjs/lib/m3u8-download.js

@@ -10,6 +10,7 @@ const fe_utils_1 = require("@lzwme/fe-utils");
 const helper_1 = require("@lzwme/fe-utils/cjs/common/helper");
 const console_log_colors_1 = require("console-log-colors");
 const utils_js_1 = require("./utils.js");
+const format_options_js_1 = require("./format-options.js");
 const worker_pool_js_1 = require("./worker_pool.js");
 const parseM3u8_js_1 = require("./parseM3u8.js");
 const m3u8_convert_js_1 = require("./m3u8-convert.js");
@@ -43,11 +44,12 @@ class DownloadQueue {
         try {
             const { maxDownloads, ...options } = next.options;
             const result = await m3u8Download(next.url, options);
-            next.options.onComplete?.({ filepath: result.filepath });
+            next.options.onComplete?.(result);
         }
         catch (error) {
             next.options.onComplete?.({
-                error: error instanceof Error ? error : new Error(error ? JSON.stringify(error) : 'Unknown error'),
+                errmsg: error instanceof Error ? error.message : error ? JSON.stringify(error) : 'Unknown error',
+                options: next.options,
             });
         }
         finally {
@@ -85,7 +87,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 = {}) {
-    [url, options] = (0, utils_js_1.formatOptions)(url, options);
+    let urlMd5 = '';
+    [url, options, urlMd5] = (0, format_options_js_1.formatOptions)(url, options);
     const ext = (0, utils_js_1.isSupportFfmpeg)() ? '.mp4' : '.ts';
     /** 最终合并转换后的文件路径 */
     let filepath = (0, node_path_1.resolve)(options.saveDir, options.filename);
@@ -98,7 +101,7 @@ async function m3u8InfoParse(url, options = {}) {
     }
     if (!options.force && (0, node_fs_1.existsSync)(filepath))
         return result;
-    const m3u8Info = await (0, parseM3u8_js_1.parseM3U8)(url, (0, node_path_1.resolve)(options.cacheDir, (0, fe_utils_1.md5)(url, false)), options.headers).catch(e => utils_js_1.logger.error('[parseM3U8][failed]', e));
+    const m3u8Info = await (0, parseM3u8_js_1.parseM3U8)(url, (0, node_path_1.resolve)(options.cacheDir, urlMd5), options.headers).catch(e => utils_js_1.logger.error('[parseM3U8][failed]', e));
     if (m3u8Info && m3u8Info?.tsCount > 0)
         result.m3u8Info = m3u8Info;
     return result;
@@ -142,8 +145,10 @@ async function m3u8Download(url, options = {}) {
         return new Promise(resolve => {
             const newOptions = {
                 ...options,
-                onComplete: (result) => {
-                    resolve(result);
+                onComplete: r => {
+                    if (options.onComplete)
+                        options.onComplete(r);
+                    resolve(r);
                 },
             };
             exports.downloadQueue.add(url, newOptions, options.priority || 0);
@@ -155,6 +160,7 @@ async function m3u8Download(url, options = {}) {
     options = result.options;
     if (!options.force && (0, node_fs_1.existsSync)(result.filepath) && !result.m3u8Info) {
         utils_js_1.logger.info('file already exist:', result.filepath);
+        result.isExist = true;
         return result;
     }
     if (result.m3u8Info?.tsCount > 0) {
@@ -261,6 +267,7 @@ async function m3u8Download(url, options = {}) {
         if (options.showProgress) {
             console.info(`\nTotal segments: ${(0, console_log_colors_1.cyan)(m3u8Info.tsCount)}, duration: ${(0, console_log_colors_1.green)(m3u8Info.duration + 'sec')}.`, `Parallel jobs: ${(0, console_log_colors_1.magenta)(options.threadNum)}`);
         }
+        result.stats = stats;
         (0, local_play_js_1.toLocalM3u8)(m3u8Info.data, options.filename);
         if (options.onInited)
             options.onInited(stats, m3u8Info, workPoll);

package/cjs/lib/utils.d.ts

@@ -1,7 +1,6 @@
 import type { IncomingHttpHeaders } from 'node:http';
 import { Stats } from 'node:fs';
 import { NLogger, Request } from '@lzwme/fe-utils';
-import { M3u8DLOptions } from '../types';
 export declare const request: Request;
 export declare const getRetry: <T = string>(url: string, headers?: IncomingHttpHeaders, retries?: number) => Promise<{
     data: T;
@@ -19,4 +18,3 @@ export declare function getLocation(url: string, method?: string): Promise<strin
  * 如果 headers 是字符串，会先将其解析为对象；如果 headers 为空，则返回空对象。
  */
 export declare function formatHeaders(headers: string | IncomingHttpHeaders): Record<string, string>;
-export declare function formatOptions(url: string, opts: M3u8DLOptions): readonly [string, M3u8DLOptions];

package/cjs/lib/utils.js

@@ -5,8 +5,6 @@ exports.isSupportFfmpeg = isSupportFfmpeg;
 exports.findFiles = findFiles;
 exports.getLocation = getLocation;
 exports.formatHeaders = formatHeaders;
-exports.formatOptions = formatOptions;
-const node_os_1 = require("node:os");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const fe_utils_1 = require("@lzwme/fe-utils");
@@ -68,38 +66,3 @@ function formatHeaders(headers) {
         return {};
     return (0, fe_utils_1.toLowcaseKeyObject)(headers);
 }
-function formatOptions(url, opts) {
-    const options = {
-        delCache: !opts.debug,
-        saveDir: process.cwd(),
-        showProgress: true,
-        ...opts,
-    };
-    if (!url.startsWith('http')) {
-        url = url.replace(/\$+/, '|').replace(/\|\|+/, '|');
-        if (url.includes('|')) {
-            const r = url.split('|');
-            url = r[1];
-            if (!options.filename)
-                options.filename = r[0];
-            else
-                options.filename = `${options.filename.replace(/\.(ts|mp4)$/, '')}-${r[0]}`;
-        }
-    }
-    const urlMd5 = (0, fe_utils_1.md5)(url, false);
-    if (!options.threadNum || +options.threadNum <= 0)
-        options.threadNum = Math.min((0, node_os_1.cpus)().length * 2, 8);
-    if (!options.filename)
-        options.filename = urlMd5;
-    if (!options.filename.endsWith('.mp4'))
-        options.filename += '.mp4';
-    if (!options.cacheDir)
-        options.cacheDir = `cache`;
-    if (options.headers)
-        options.headers = formatHeaders(options.headers);
-    if (options.debug) {
-        exports.logger.updateOptions({ levelType: 'debug' });
-        exports.logger.debug('[m3u8-DL]options', options, url);
-    }
-    return [url, options];
-}

package/cjs/m3u8-batch-download.js

@@ -5,7 +5,7 @@ exports.m3u8BatchDownload = m3u8BatchDownload;
  * @Author: renxia lzwy0820@qq.com
  * @Date: 2024-07-30 08:57:58
  * @LastEditors: renxia
- * @LastEditTime: 2025-05-09 16:59:23
+ * @LastEditTime: 2025-05-19 17:03:50
  * @FilePath: \m3u8-dl\src\m3u8-batch-download.ts
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -15,9 +15,11 @@ const m3u8_download_1 = require("./lib/m3u8-download");
 const utils_1 = require("./lib/utils");
 const video_parser_1 = require("./video-parser");
 const console_log_colors_1 = require("console-log-colors");
+const file_download_1 = require("./lib/file-download");
+const format_options_1 = require("./lib/format-options");
 async function formatUrls(urls, options) {
     const taskset = new Map();
-    for (const url of urls) {
+    for (let url of urls) {
         if (!url)
             continue;
         if ((0, node_fs_1.existsSync)(url)) {
@@ -40,6 +42,7 @@ async function formatUrls(urls, options) {
                 continue;
             }
         }
+        [url, options] = (0, format_options_1.formatOptions)(url, options);
         taskset.set(url, options);
     }
     return taskset;
@@ -49,50 +52,52 @@ async function m3u8BatchDownload(urls, options) {
     let workPoll;
     return new Promise(rs => {
         let preDLing = false;
+        const afterDownload = (r, url) => {
+            const success = r.filepath && (0, node_fs_1.existsSync)(r.filepath);
+            if (success) {
+                if (r.isExist)
+                    utils_1.logger.info('文件已存在：', (0, console_log_colors_1.gray)(r.filepath));
+                utils_1.logger.debug('下载完成：', (0, console_log_colors_1.gray)(url), (0, console_log_colors_1.gray)(r.filepath));
+            }
+            else {
+                utils_1.logger.error('下载失败：', (0, console_log_colors_1.red)(r.errmsg || '未知错误'), (0, console_log_colors_1.gray)(url));
+            }
+            if (tasks.size === 0)
+                rs(r.filepath && (0, node_fs_1.existsSync)(r.filepath));
+            else
+                run();
+        };
         const run = () => {
             const [url, urlNext] = [...tasks.keys()];
             if (url) {
-                const o = { ...tasks.get(url) };
+                const o = tasks.get(url);
                 const onProgress = o.onProgress;
-                const useVideoParser = video_parser_1.VideoParser.getPlatform(url) !== null;
                 tasks.delete(url);
                 o.onInited = (s, _i, wp) => {
                     if (workPoll)
                         workPoll = wp;
-                    if (useVideoParser) {
+                    if (o.type === 'parser') {
                         utils_1.logger.info('视频解析完成：', s.filename, (0, console_log_colors_1.gray)(s.url));
                     }
                 };
                 o.onProgress = (finished, total, info, stats) => {
                     if (onProgress)
                         onProgress(finished, total, info, stats);
-                    if (!useVideoParser && !preDLing && urlNext && tasks.size && workPoll.freeNum > 1 && total - finished < options.threadNum) {
+                    if (o.type === 'm3u8' && !preDLing && urlNext && tasks.size && workPoll.freeNum > 1 && total - finished < options.threadNum) {
                         utils_1.logger.debug('\n[预下载下一集]', 'freeNum:', workPoll.freeNum, 'totalNum:', workPoll.totalNum, 'totalTask:', workPoll.totalTask, tasks.size);
                         preDLing = true;
                         (0, m3u8_download_1.preDownLoad)(urlNext, options, workPoll).then(() => (preDLing = false));
                     }
                 };
-                if (useVideoParser) {
+                if (o.type === 'parser') {
                     const vp = new video_parser_1.VideoParser();
-                    vp.download(url, o).then(r => {
-                        if (r.code !== 0) {
-                            utils_1.logger.error('下载失败：', (0, console_log_colors_1.red)(r.message), (0, console_log_colors_1.gray)(url));
-                        }
-                        else {
-                            if (r.data?.isExist)
-                                utils_1.logger.info('文件已存在：', (0, console_log_colors_1.gray)(r.data.filepath));
-                            utils_1.logger.debug('下载完成：', (0, console_log_colors_1.gray)(url), (0, console_log_colors_1.gray)(r.data.filepath));
-                        }
-                        if (tasks.size === 0) {
-                            rs(r.data.filepath && (0, node_fs_1.existsSync)(r.data.filepath));
-                        }
-                        else {
-                            run();
-                        }
-                    });
+                    vp.download(url, o).then(r => afterDownload(r, url));
+                }
+                else if (o.type === 'file') {
+                    (0, file_download_1.fileDownload)(url, o).then(r => afterDownload(r, url));
                 }
                 else {
-                    (0, m3u8_download_1.m3u8Download)(url, o).then(r => (tasks.size === 0 ? rs((0, node_fs_1.existsSync)(r.filepath)) : run()));
+                    (0, m3u8_download_1.m3u8Download)(url, o).then(r => afterDownload(r, url));
                 }
             }
         };

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

@@ -11,7 +11,10 @@ interface DLServerOptions {
 }
 interface CacheItem extends Partial<M3u8DLProgressStats> {
     url: string;
+    /** 用户设置的参数 */
     options: M3u8DLOptions;
+    /** 格式化后实际下载使用的参数 */
+    dlOptions?: M3u8DLOptions;
     status: 'pause' | 'resume' | 'done' | 'pending' | 'error';
     current?: TsItemInfo;
     workPoll?: M3u8WorkerPool;

package/cjs/server/download-server.js

@@ -34,11 +34,6 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DLServer = void 0;
-/*
- * @Author: renxia lzwy0820@qq.com
- * @Date: 2025-05-07 21:03:09
- * @LastEditors: renxia
- */
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const fe_utils_1 = require("@lzwme/fe-utils");
@@ -46,6 +41,8 @@ const m3u8_download_js_1 = require("../lib/m3u8-download.js");
 const utils_js_1 = require("../lib/utils.js");
 const index_js_1 = require("../video-parser/index.js");
 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");
 class DLServer {
     app = null;
     wss = null;
@@ -74,6 +71,7 @@ class DLServer {
         dlOptions: {
             debug: process.env.DS_DEBUG == '1',
             saveDir: process.env.DS_SAVE_DIR || './downloads',
+            threadNum: 4,
         },
     };
     /** 下载任务缓存 */
@@ -175,11 +173,10 @@ class DLServer {
         const { default: express } = await Promise.resolve().then(() => __importStar(require('express')));
         const { WebSocketServer } = await Promise.resolve().then(() => __importStar(require('ws')));
         const app = (this.app = express());
-        const server = app.listen(this.options.port, () => utils_js_1.logger.info(`Server running on port ${this.options.port}`));
+        const server = app.listen(this.options.port, () => utils_js_1.logger.info(`Server running on port ${(0, console_log_colors_1.green)(this.options.port)}`));
         const wss = (this.wss = new WebSocketServer({ server }));
         app.use(express.json());
         app.use(express.static((0, node_path_1.resolve)(__dirname, '../../client')));
-        // headers
         app.use((req, res, next) => {
             res.setHeader('Access-Control-Allow-Origin', '*');
             res.setHeader('Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE');
@@ -213,28 +210,15 @@ class DLServer {
             }
             ws.send(JSON.stringify({ type: 'serverInfo', data: this.serverInfo }));
             ws.send(JSON.stringify({ type: 'tasks', data: Object.fromEntries(this.dlCacheClone()) }));
-            // ws.on('message', (message, _isBinary) => {
-            //   logger.info('Received message from client:', (message as Buffer).toString('utf8'));
-            // });
-        });
-        wss.on('close', () => {
-            utils_js_1.logger.info('WebSocket server closed');
-        });
-        wss.on('error', err => {
-            utils_js_1.logger.error('WebSocket server error:', err);
-        });
-        wss.on('listening', () => {
-            utils_js_1.logger.info(`WebSocket server listening on port ${this.options.port}`);
         });
+        wss.on('close', () => utils_js_1.logger.info('WebSocket server closed'));
+        wss.on('error', err => utils_js_1.logger.error('WebSocket server error:', err));
+        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 cacheItem = this.dlCache.get(url);
-        const dlOptions = {
-            ...this.cfg.dlOptions,
-            ...options,
-            cacheDir: this.options.cacheDir,
-        };
+        const dlOptions = (0, format_options_js_1.formatOptions)(url, { ...this.cfg.dlOptions, ...options, cacheDir: this.options.cacheDir })[1];
         utils_js_1.logger.debug('startDownload', url, dlOptions, cacheItem?.status);
         if (cacheItem && cacheItem?.status === 'resume')
             return cacheItem.options;
@@ -242,12 +226,11 @@ class DLServer {
             if (cacheItem)
                 cacheItem.status = 'pending';
             else
-                this.dlCache.set(url, { options: dlOptions, status: 'pending', url });
+                this.dlCache.set(url, { options, dlOptions, status: 'pending', url });
             return cacheItem?.options || dlOptions;
         }
         let workPoll = cacheItem?.workPoll;
-        const useVideoParser = index_js_1.VideoParser.getPlatform(url) !== null;
-        const defaultItem = { options: dlOptions, status: 'resume', url };
+        const defaultItem = { options, dlOptions, status: 'resume', url };
         const opts = {
             ...dlOptions,
             showProgress: dlOptions.debug || this.options.debug,
@@ -259,20 +242,21 @@ class DLServer {
                 this.dlCache.set(url, item);
                 this.saveCache();
                 this.wsSend('progress', url);
+                return status !== 'pause';
             },
         };
-        const afterDownload = ({ filepath = '', errmsg = '' }) => {
+        const afterDownload = (r, url) => {
             const item = this.dlCache.get(url) || defaultItem;
-            if (filepath && (0, node_fs_1.existsSync)(filepath)) {
-                item.localVideo = filepath;
-                item.downloadedSize = (0, node_fs_1.statSync)(filepath).size;
+            if (r.filepath && (0, node_fs_1.existsSync)(r.filepath)) {
+                item.localVideo = r.filepath;
+                item.downloadedSize = (0, node_fs_1.statSync)(r.filepath).size;
             }
-            else if (!errmsg && opts.convert !== false)
-                errmsg = '下载失败';
+            else if (!r.errmsg && opts.convert !== false)
+                r.errmsg = '下载失败';
             item.endTime = Date.now();
-            item.status = errmsg ? 'error' : 'done';
-            item.errmsg = errmsg;
-            utils_js_1.logger.info('Download complete:', item.status, (0, console_log_colors_1.red)(item.errmsg), (0, console_log_colors_1.gray)(url), (0, console_log_colors_1.cyan)(filepath));
+            item.errmsg = r.errmsg;
+            item.status = r.errmsg ? 'error' : 'done';
+            utils_js_1.logger.info('Download complete:', item.status, (0, console_log_colors_1.red)(r.errmsg), (0, console_log_colors_1.gray)(url), (0, console_log_colors_1.cyan)(r.filepath));
             this.dlCache.set(url, item);
             this.wsSend('progress', url);
             this.saveCache();
@@ -288,21 +272,19 @@ class DLServer {
         if (cacheItem)
             cacheItem.status = 'resume';
         try {
-            if (useVideoParser) {
+            if (dlOptions.type === 'parser') {
                 const vp = new index_js_1.VideoParser();
-                vp.download(url, opts).then(r => {
-                    afterDownload({ filepath: r.data?.filepath, errmsg: r.code ? r.message : '' });
-                });
+                vp.download(url, opts).then(r => afterDownload(r, url));
+            }
+            else if (dlOptions.type === 'file') {
+                (0, file_download_js_1.fileDownload)(url, opts).then(r => afterDownload(r, url));
             }
             else {
-                (0, m3u8_download_js_1.m3u8Download)(url, opts).then(r => {
-                    const errmsg = 'error' in r ? r.error.cause || r.error.message : '';
-                    afterDownload({ filepath: r.filepath, errmsg });
-                });
+                (0, m3u8_download_js_1.m3u8Download)(url, opts).then(r => afterDownload(r, url));
             }
         }
         catch (error) {
-            afterDownload({ filepath: '', errmsg: error.message });
+            afterDownload({ filepath: '', errmsg: error.message }, url);
             utils_js_1.logger.error('下载失败:', error);
         }
         return dlOptions;
@@ -315,8 +297,10 @@ class DLServer {
             const item = this.dlCache.get(data);
             if (item) {
                 const { workPoll, ...stats } = item;
-                data = { ...stats, url: data };
+                data = [{ ...stats, url: data }];
             }
+            else
+                return;
         }
         // 广播进度信息给所有客户端
         this.wss.clients.forEach(client => {
@@ -330,13 +314,11 @@ class DLServer {
         app.get('/healthcheck', (_req, res) => {
             res.json({ message: 'ok', code: 0 });
         });
-        // API to set default config
         app.post('/config', (req, res) => {
             const config = req.body;
             this.saveConfig(config);
             res.json({ message: 'Config updated successfully', code: 0 });
         });
-        // API to get default config
         app.get('/config', (_req, res) => {
             res.json({ ...this.cfg.dlOptions, ...this.cfg.webOptions });
         });
@@ -405,9 +387,9 @@ class DLServer {
             const urlsToPause = all ? [...this.dlCache.keys()] : urls;
             const list = [];
             for (const url of urlsToPause) {
-                const item = this.dlCache.get(url);
-                if (item?.status === 'resume') {
-                    (0, m3u8_download_js_1.m3u8DLStop)(url, item.workPoll);
+                const { workPoll, ...item } = this.dlCache.get(url);
+                if (['resume', 'pending'].includes(item?.status)) {
+                    (0, m3u8_download_js_1.m3u8DLStop)(url, workPoll);
                     item.status = item.tsSuccess === item.tsCount ? 'done' : 'pause';
                     list.push(item);
                 }
@@ -425,15 +407,15 @@ class DLServer {
                 const item = this.dlCache.get(url);
                 if (['pause', 'error'].includes(item?.status)) {
                     this.startDownload(url, item.options);
-                    list.push(item);
+                    const { workPoll, ...t } = item;
+                    list.push(t);
                 }
                 else
                     console.log(item?.status, url);
             }
-            const count = list.length;
-            if (count)
+            if (list.length)
                 this.wsSend('progress', list);
-            res.json({ message: count ? `已恢复 ${count} 个下载任务` : '没有找到可恢复的下载任务', code: count ? 0 : 1 });
+            res.json({ message: list.length ? `已恢复 ${list.length} 个下载任务` : '没有找到可恢复的下载任务', code: 0, count: list.length });
         });
         // API to delete download
         app.post('/delete', (req, res) => {
@@ -445,6 +427,7 @@ class DLServer {
                 if (item) {
                     (0, m3u8_download_js_1.m3u8DLStop)(url, item.workPoll);
                     this.dlCache.delete(url);
+                    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))
@@ -457,13 +440,11 @@ class DLServer {
                                 (0, node_fs_1.unlinkSync)(filepath);
                         });
                     }
-                    list.push(item);
                 }
             }
-            const count = list.length;
-            if (count)
-                this.wsSend('progress', list);
-            res.json({ message: `已删除 ${count} 个下载任务`, code: 0, count });
+            if (list.length)
+                this.wsSend('delete', list);
+            res.json({ message: `已删除 ${list.length} 个下载任务`, code: 0, count: list.length });
         });
         app.get(/^\/localplay\/(.*)$/, (req, res) => {
             let filepath = decodeURIComponent(req.params[0]);

package/cjs/types/m3u8.d.ts

@@ -1,4 +1,4 @@
-import type { AnyObject } from '@lzwme/fe-utils';
+import type { AnyObject, DownloadResult } from '@lzwme/fe-utils';
 import type { IncomingHttpHeaders } from 'node:http';
 import type { WorkerPool } from '../lib/worker_pool';
 export interface TsItemInfo {
@@ -100,12 +100,9 @@ export interface M3u8DLOptions {
     /** 当初始化完成、下载开始时回调 */
     onInited?: (stats: M3u8DLProgressStats, m3u8Info: M3u8Info, workPoll: M3u8WorkerPool) => void;
     /** 每当 ts 文件下载完成时回调，可用于自定义进度控制 */
-    onProgress?: (finished: number, total: number, currentInfo: TsItemInfo, stats: M3u8DLProgressStats) => void;
+    onProgress?: (finished: number, total: number, currentInfo: TsItemInfo, stats: M3u8DLProgressStats) => void | boolean;
     /** 下载完成时回调，主要用于内部多任务管理 */
-    onComplete?: (result: {
-        error?: Error;
-        filepath?: string;
-    }) => void;
+    onComplete?: (result: M3u8DLResult) => void;
     /** 并发下载线程数。取决于服务器限制，过多可能会容易下载失败。一般建议不超过 8 个。默认为 cpu数 * 2，但不超过 8 */
     threadNum?: number;
     /** 最大并发下载任务数 */
@@ -128,6 +125,21 @@ export interface M3u8DLOptions {
     play?: boolean;
     /** 下载完毕后，是否合并转换为 mp4 或 ts 文件。默认为 true */
     convert?: boolean;
+    /**
+     * 下载类型。默认自动识别
+     * - 'm3u8'：下载 m3u8 文件
+     * - 'file'：下载普通文件
+     * - 'parser'：下载 VideoParser 支持解析的平台视频文件
+     */
+    type?: 'm3u8' | 'file' | 'parser';
+}
+export interface M3u8DLResult extends Partial<DownloadResult> {
+    /** 下载进度统计 */
+    stats?: M3u8DLProgressStats;
+    /** 下载选项 */
+    options?: M3u8DLOptions;
+    /** m3u8 文件信息 */
+    m3u8Info?: M3u8Info;
 }
 export interface WorkerTaskInfo {
     /** m3u8 文件地址 */

package/cjs/types/video-parser.d.ts

@@ -1,12 +1,12 @@
 export interface VideoInfo {
-    author: string;
-    uid: string;
-    avatar: string;
-    like: number;
-    time: number;
-    title: string;
-    cover: string;
     url: string;
+    title: string;
+    author?: string;
+    avatar?: string;
+    time?: number;
+    cover?: string;
+    uid?: string;
+    like?: number;
     /** 来源页面 */
     referer?: string;
     music?: {

package/cjs/video-parser/index.d.ts

@@ -1,14 +1,11 @@
-import { type DownloadResult } from '@lzwme/fe-utils';
-import type { ApiResponse, M3u8DLOptions, M3u8DLProgressStats, VideoInfo } from '../types';
+import type { ApiResponse, M3u8DLOptions, M3u8DLResult, VideoInfo } from '../types';
 export declare class VideoParser {
     private static readonly platforms;
     /**
      * 解析视频 URL
      */
     parse(url: string, headers?: Record<string, string>): Promise<ApiResponse<VideoInfo>>;
-    download(url: string, options: M3u8DLOptions): Promise<ApiResponse<DownloadResult> & {
-        stats?: M3u8DLProgressStats;
-    }>;
+    download(url: string, options: M3u8DLOptions): Promise<M3u8DLResult>;
     /**
      * 根据 URL 获取平台标识
      */

package/cjs/video-parser/index.js

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.VideoParser = void 0;
 const url_1 = require("url");
 const node_path_1 = require("node:path");
-const fe_utils_1 = require("@lzwme/fe-utils");
-const console_log_colors_1 = require("console-log-colors");
 const douyin_parser_1 = require("./parsers/douyin-parser");
 const pipixia_parser_1 = require("./parsers/pipixia-parser");
 const weibo_parser_1 = require("./parsers/weibo-parser");
+const base_parser_1 = require("./parsers/base-parser");
 const utils_1 = require("../lib/utils");
+const file_download_1 = require("../lib/file-download");
 class VideoParser {
     static platforms = {
         pipixia: {
@@ -23,6 +23,10 @@ class VideoParser {
             class: weibo_parser_1.WeiboParser,
             domains: ['weibo.com'],
         },
+        unknown: {
+            class: base_parser_1.BaseParser,
+            domains: ['**'],
+        },
     };
     /**
      * 解析视频 URL
@@ -38,83 +42,19 @@ class VideoParser {
         const info = await this.parse(url);
         utils_1.logger.debug('解析视频信息', info);
         if (info.code || !info.data?.url)
-            return { code: 1, ...info, data: null };
+            return { errmsg: info.message || '解析视频信息失败', options };
         if (!options.filename && info.data.title) {
             options.filename = info.data.title.replaceAll(/[\s\\/:*?"<>|]/g, '_');
         }
-        [url, options] = (0, utils_1.formatOptions)(info.data.url, options);
+        if (!options.type)
+            options.type = 'parser';
         if (!(0, node_path_1.extname)(options.filename))
             options.filename += '.mp4';
-        const startTime = Date.now();
-        const stats = {
-            url,
-            startTime,
-            progress: 0,
-            tsSuccess: 0,
-            tsFailed: 0,
-            tsCount: 0,
-            duration: 0,
-            durationDownloaded: 0,
-            downloadedSize: 0,
-            avgSpeed: 0,
-            avgSpeedDesc: '0B/s',
-            speed: 0,
-            speedDesc: '0B/s',
-            remainingTime: 0,
-            filename: options.filename,
-            localVideo: (0, node_path_1.resolve)(options.saveDir, options.filename),
+        options.headers = {
+            referer: info.data.referer || info.data.url,
+            ...(0, utils_1.formatHeaders)(options.headers),
         };
-        utils_1.logger.debug('开始下载', (0, console_log_colors_1.gray)(url), (0, console_log_colors_1.cyan)(stats.localVideo));
-        if (options.onInited)
-            options.onInited(stats, null, null);
-        try {
-            const r = await (0, fe_utils_1.download)({
-                url,
-                filepath: stats.localVideo,
-                paralelism: options.threadNum,
-                force: options.force,
-                requestOptions: {
-                    headers: {
-                        referer: info.data.referer || info.data.url,
-                        ...(0, utils_1.formatHeaders)(options.headers),
-                    },
-                    rejectUnauthorized: false,
-                },
-                onProgress: info => {
-                    stats.progress = +info.percent.toFixed(2);
-                    stats.size = info.size;
-                    stats.downloadedSize = info.downloaded;
-                    stats.speed = info.speed;
-                    stats.speedDesc = (0, fe_utils_1.formatByteSize)(stats.speed) + '/s';
-                    stats.remainingTime = Math.round((info.size - info.downloaded) / stats.speed);
-                    if (options.showProgress) {
-                        const processBar = info.percent === -1 ? '' : '='.repeat(Math.floor(stats.progress * 0.2)).padEnd(20, '-');
-                        utils_1.logger.logInline(`${stats.progress}% [${(0, console_log_colors_1.greenBright)(processBar)}] ` +
-                            `${(0, console_log_colors_1.blueBright)((0, fe_utils_1.formatByteSize)(stats.downloadedSize))} ${(0, console_log_colors_1.yellowBright)((0, fe_utils_1.formatTimeCost)(startTime))} ${(0, console_log_colors_1.magentaBright)(stats.speedDesc)} ` +
-                            (stats.progress === 100 ? '\n' : stats.remainingTime ? `${(0, console_log_colors_1.cyan)((0, fe_utils_1.formatTimeCost)(Date.now() - stats.remainingTime))}` : ''));
-                    }
-                    if (options.onProgress) {
-                        options.onProgress(info.downloaded, info.size, null, stats);
-                    }
-                },
-            });
-            stats.endTime = Date.now();
-            return {
-                code: r.filepath ? 0 : 201,
-                message: r.filepath ? '下载完成' : '下载失败',
-                data: r,
-                stats,
-            };
-        }
-        catch (error) {
-            utils_1.logger.error('下载失败', error.message, (0, console_log_colors_1.gray)(url));
-            stats.errmsg = error.message;
-            return {
-                code: 201,
-                message: '下载失败: ' + error.message,
-                stats,
-            };
-        }
+        return (0, file_download_1.fileDownload)(url, options);
     }
     /**
      * 根据 URL 获取平台标识
@@ -129,12 +69,12 @@ class VideoParser {
                     return { url, platform };
                 }
             }
+            return { url, platform: 'unknown' };
         }
         catch (error) {
             console.error('解析 URL 失败', url, error);
             return null;
         }
-        return null;
     }
     /**
      * 获取所有支持的平台列表

package/cjs/video-parser/parsers/base-parser.d.ts

@@ -2,5 +2,5 @@ import type { ApiResponse, VideoInfo } from '../../types';
 export declare abstract class BaseParser {
     protected static success<T>(data: T): ApiResponse<T>;
     protected static error(code: number, message: string): ApiResponse<null>;
-    static parse(_url: string, _headers?: Record<string, string>): Promise<ApiResponse<VideoInfo>>;
+    static parse(url: string, headers?: Record<string, string>): Promise<ApiResponse<VideoInfo>>;
 }

package/cjs/video-parser/parsers/base-parser.js

@@ -3,21 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseParser = void 0;
 class BaseParser {
     static success(data) {
-        return {
-            code: 0,
-            message: 'success',
-            data,
-        };
+        return { code: 0, message: 'success', data };
     }
     static error(code, message) {
-        return {
-            code,
-            message,
-            data: null,
-        };
+        return { code, message, data: null };
     }
-    static parse(_url, _headers = {}) {
-        return Promise.resolve(this.success(null));
+    static parse(url, headers = {}) {
+        return Promise.resolve(this.success({ url, title: '', referer: headers.referer }));
     }
 }
 exports.BaseParser = BaseParser;

package/client/index.html

@@ -426,7 +426,7 @@ services:
                   <div class="flex items-center">
                     <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"
-                      :aria-label="'选择任务：' + (task.localVideo || task.filename || task.url)">
+                      title="'选择任务：' + (task.localVideo || task.filename || task.url)">
                     <h3 class="font-bold text-green-600 truncate" :title="task.url">
                       {{ task.localVideo || task.filename || task.url }}
                     </h3>
@@ -601,7 +601,7 @@ services:
     };
 
     Vue.prototype.T = T;
-    new Vue({
+    window.APP = new Vue({
       el: '#app',
       data: {
         ws: null,
@@ -691,9 +691,12 @@ services:
         forceUpdate: function () {
           const now = Date.now();
           if (now - this.forceUpdateTime > 500) {
-            this.$forceUpdate();
             this.forceUpdateTime = now;
-          } else this.forceUpdate();
+            this.$forceUpdate();
+          } else {
+            if (this.forceUpdateTimeout) clearTimeout(this.forceUpdateTimeout);
+            this.forceUpdateTimeout = setTimeout(() => this.forceUpdate(), 500);
+          }
         },
         wsConnect: function (reconnectDelay = 3000) {
           if (this.ws && this.ws.readyState === WebSocket.OPEN) {
@@ -716,9 +719,15 @@ services:
                 if (!Array.isArray(data)) data = [data];
                 this.$nextTick(() => {
                   data.forEach(item => item.url && (this.tasks[item.url] = item));
-                  // this.forceUpdate();
+                  this.forceUpdate();
                 });
                 break;
+              case 'delete':
+                if (Array.isArray(data)) {
+                  data.forEach(url => delete this.tasks[url]);
+                  this.forceUpdate();
+                }
+                break;
               case 'queueStatus':
                 this.queueStatus = data;
                 break;
@@ -928,7 +937,7 @@ services:
         },
         /** 边下边播 */
         localPlay: function (task) {
-          const url = location.origin + '/localplay/' + encodeURIComponent(task.localVideo || task.localM3u8);
+          const url = location.origin + '/localplay/' + (task.localVideo || task.localM3u8);
           console.log(task);
           // return window.open(`./play.html?url=${encodeURIComponent(url)}`);
           Swal.fire({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lzwme/m3u8-dl",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "description": "Batch download of m3u8 files and convert to mp4",
   "main": "cjs/index.js",
   "types": "cjs/index.d.ts",