@lzwme/m3u8-dl 1.4.2 → 1.5.0

package/cjs/cli.js

@@ -65,6 +65,7 @@ commander_1.program
     .option('-S, --save-dir <dirpath>', '下载文件保存的路径。默认为当前目录')
     .option('--no-del-cache', '下载成功后是否删除临时文件。默认为 true。保存临时文件可以在重复下载时识别缓存')
     .option('--no-convert', '下载成功后，是否不合并转换为 mp4 文件。默认为 true。')
+    .option('--use-global-ffmpeg', '是否使用系统安装的 ffmpeg 而不是内置的 ffmpeg-static')
     .option('-H, --headers <headers>', '自定义请求头。格式为 key1=value1\nkey2=value2')
     .option('-T, --type <type>', '指定下载类型。默认根据URL自动识别，如果是批量下载多个不同 URL 类型，请不要设置。可选值：m3u8, file, parser')
     .option('-I, --ignore-segments <time-segments>', '忽略的视频片段，用-分割起始时间点，多个用逗号分隔。如：0-10,20-30')

package/cjs/lib/m3u8-convert.js

@@ -1,13 +1,19 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m3u8Convert = m3u8Convert;
 const node_fs_1 = require("node:fs");
 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 ffmpeg_static_1 = __importDefault(require("ffmpeg-static"));
 const utils_1 = require("./utils");
 async function m3u8Convert(options, data) {
-    let ffmpegSupport = (0, utils_1.isSupportFfmpeg)();
+    const useGlobal = options.useGlobalFfmpeg || false;
+    const ffmpegBin = useGlobal ? 'ffmpeg' : ffmpeg_static_1.default;
+    let ffmpegSupport = (0, utils_1.isSupportFfmpeg)(ffmpegBin);
     let filepath = (0, node_path_1.resolve)(options.saveDir, options.filename);
     if (!ffmpegSupport)
         filepath = filepath.replace(/\.mp4$/, '.ts');
@@ -28,13 +34,13 @@ async function m3u8Convert(options, data) {
             }
         }
         // ffmpeg -i nz.ts -c copy -map 0:v -map 0:a -bsf:a aac_adtstoasc nz.mp4
-        // const cmd = `ffmpeg -async 1 -y -f concat -safe 0 -i "${ffconcatFile}" -acodec copy -vcodec copy -bsf:a aac_adtstoasc ${headersString} "${filepath}"`;
-        const cmd = `ffmpeg -async 1 -y -f concat -safe 0 -i "${ffconcatFile}" -c:v copy -c:a copy -movflags +faststart -fflags +genpts -bsf:a aac_adtstoasc ${headersString} "${filepath}"`;
+        // const cmd = `"${ffmpegBin}" -async 1 -y -f concat -safe 0 -i "${ffconcatFile}" -acodec copy -vcodec copy -bsf:a aac_adtstoasc ${headersString} "${filepath}"`;
+        const cmd = `"${ffmpegBin}" -async 1 -y -f concat -safe 0 -i "${ffconcatFile}" -c:v copy -c:a copy -movflags +faststart -fflags +genpts -bsf:a aac_adtstoasc ${headersString} "${filepath}"`;
         utils_1.logger.debug('[convert to mp4]cmd:', (0, console_log_colors_1.cyan)(cmd));
         const r = (0, fe_utils_1.execSync)(cmd);
         ffmpegSupport = !r.error;
         if (r.error)
-            utils_1.logger.error('Conversion to mp4 failed. Please confirm that `ffmpeg` is installed!', r.stderr);
+            utils_1.logger.error(`Conversion to mp4 failed. Please confirm that \`${useGlobal ? 'ffmpeg' : 'ffmpeg-static'}\` is ${useGlobal ? 'installed' : 'available'}!`, r.stderr);
         else
             (0, node_fs_1.unlinkSync)(ffconcatFile);
     }

package/cjs/lib/m3u8-download.js

@@ -1,4 +1,7 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.workPollPublic = exports.downloadQueue = exports.DownloadQueue = void 0;
 exports.preDownLoad = preDownLoad;
@@ -9,6 +12,7 @@ const node_path_1 = require("node:path");
 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 ffmpeg_static_1 = __importDefault(require("ffmpeg-static"));
 const format_options_js_1 = require("./format-options.js");
 const local_play_js_1 = require("./local-play.js");
 const m3u8_convert_js_1 = require("./m3u8-convert.js");
@@ -87,8 +91,9 @@ 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(u, o = {}) {
+    const ffmpegBin = o.useGlobalFfmpeg ? 'ffmpeg' : ffmpeg_static_1.default;
+    const ext = (0, utils_js_1.isSupportFfmpeg)(ffmpegBin) ? '.mp4' : '.ts';
     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);
     if (!filepath.endsWith(ext))

package/cjs/lib/utils.d.ts

@@ -9,7 +9,7 @@ export declare const getRetry: <T = string>(url: string, headers?: OutgoingHttpH
     response: import("http").IncomingMessage;
 }>;
 export declare const logger: NLogger;
-export declare function isSupportFfmpeg(): boolean;
+export declare function isSupportFfmpeg(ffmpegBin: string): boolean;
 export declare function findFiles(apidir?: string, validate?: (filepath: string, stat: Stats) => boolean): string[];
 /** 获取重定向后的 URL */
 export declare function getLocation(url: string, method?: string): Promise<string>;

package/cjs/lib/utils.js

@@ -24,9 +24,9 @@ const getRetry = (url, headers, retries = 3) => (0, fe_utils_1.retry)(() => expo
 exports.getRetry = getRetry;
 exports.logger = fe_utils_1.NLogger.getLogger('[M3U8-DL]', { color: fe_utils_1.color });
 let _isSupportFfmpeg = null;
-function isSupportFfmpeg() {
+function isSupportFfmpeg(ffmpegBin) {
     if (null == _isSupportFfmpeg)
-        _isSupportFfmpeg = (0, fe_utils_1.execSync)('ffmpeg -version').stderr === '';
+        _isSupportFfmpeg = (0, fe_utils_1.execSync)(`${ffmpegBin} -version`).stderr === '';
     return _isSupportFfmpeg;
 }
 function findFiles(apidir, validate) {

package/cjs/server/download-server.js

@@ -537,21 +537,13 @@ class DLServer {
                         'Access-Control-Allow-Headers': '*',
                         'Access-Control-Allow-Methods': 'POST, GET, OPTIONS',
                         'Access-Control-Allow-Origin': '*',
+                        'Access-Control-Allow-Credentials': 'true',
                         '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);
                     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);
+                        res.send((0, node_fs_1.readFileSync)(filepath));
                         utils_js_1.logger.debug('[Localplay]file sent:', (0, console_log_colors_1.gray)(filepath), 'Size:', stats.size, 'bytes');
                     }
                     else {

package/cjs/types/m3u8.d.ts

@@ -140,6 +140,8 @@ export interface M3u8DLOptions {
      * - 'parser'：下载 VideoParser 支持解析的平台视频文件
      */
     type?: 'm3u8' | 'file' | 'parser';
+    /** 是否使用系统安装的 ffmpeg 而不是内置的 ffmpeg-static。默认为 false */
+    useGlobalFfmpeg?: boolean;
 }
 export interface M3u8DLResult extends Partial<DownloadResult> {
     /** 下载进度统计 */

package/client/index.html

@@ -744,7 +744,7 @@ services:
             this.ws.close();
           }
 
-          const ws = new WebSocket(`ws://${location.host}/ws?token=${this.token}`);
+          const ws = new WebSocket(`${location.protocol === 'https:' ? 'wss' : 'ws'}://${location.host}/ws?token=${this.token}`);
           this.ws = ws;
           ws.onmessage = (e) => {
             let { type, data } = T.safeJSONParse(e.data);
@@ -832,7 +832,7 @@ services:
             html: `
               <div class="text-left">
                 <div class="flex flex-row gap-4">
-                  <input type="text" id="playUrl" placeholder="[实验性]输入列表页或播放页地址，提取m3u8链接" autocomplete="off" id="urlInput" class="flex-1 border border-gray-300 rounded px-3 py-2 focus:outline-none focus:ring-2 focus:ring-blue-400" value="">
+                  <input type="text" id="playUrl" placeholder="[实验性]输入视频播放页地址，尝试提取m3u8下载链接" autocomplete="off" id="urlInput" class="flex-1 border border-gray-300 rounded px-3 py-2 focus:outline-none focus:ring-2 focus:ring-blue-400" value="">
                   <div class="flex flex-row gap-1">
                     <button type="button" id="getM3u8UrlsBtn" class="player-btn px-2 py-1 bg-blue-600 text-white rounded hover:bg-blue-700 focus:outline-none">
                       提取
@@ -840,13 +840,6 @@ services:
                   </div>
                 </div>
 
-                <div class="mt-4">
-                  <div class="flex flex-row gap-2 items-center">
-                    <input id="subUrlRegex" class="flex-1 p-2 border rounded-lg focus:border-blue-500" placeholder="[实验性](可选)播放页链接特征规则">
-                  </div>
-                  <p class="ml-2 mt-1 text-sm text-gray-500">用于从视频列表页准确识别播放地址。如：<code>play/845-1-</code></p>
-                </div>
-
                 <div class="mt-4">
                   <label class="block text-sm font-bold text-gray-700 mb-1">视频链接（每行一个，支持m3u8地址及抖音、微博、皮皮虾视频分享链接）</label>
                   <textarea id="downloadUrls" class="w-full p-2 border rounded-lg focus:ring-blue-500" rows="3" placeholder="格式： URL | 名称(可选)、名称 | URL"></textarea>
@@ -937,9 +930,7 @@ services:
               btn.setAttribute('disabled', 'disabled');
               btn.innerText = '解析中...';
 
-              const headers = document.getElementById('headers').value.trim();
-              const subUrlRegex = document.getElementById('subUrlRegex').value.trim();
-              T.post('/api/getM3u8Urls', { url, headers, subUrlRegex }).then(r => {
+              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} 个地址`);
@@ -1073,11 +1064,10 @@ services:
         },
         /** 边下边播 */
         localPlay: function (task) {
-          const filepath = task.localVideo || task.localM3u8;
-          const url = location.origin + `/localplay/${encodeURIComponent(filepath)}`;
+          const url = location.origin + `/localplay/${encodeURIComponent(task.localVideo || '') || task.localM3u8}`;
           console.log(task);
           Swal.fire({
-            title: task?.options.filename || task.url,
+            title: task.options?.filename || task.url,
             width: '1000px',
             padding: 0,
             allowOutsideClick: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lzwme/m3u8-dl",
-  "version": "1.4.2",
+  "version": "1.5.0",
   "description": "Batch download of m3u8 files and convert to mp4",
   "main": "cjs/index.js",
   "types": "cjs/index.d.ts",
@@ -44,24 +44,24 @@
     "registry": "https://registry.npmjs.com"
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.1.2",
-    "@eslint/js": "^9.31.0",
+    "@biomejs/biome": "^2.2.2",
+    "@eslint/js": "^9.34.0",
     "@lzwme/fed-lint-helper": "^2.6.6",
     "@types/express": "^5.0.3",
-    "@types/m3u8-parser": "^7.2.2",
-    "@types/node": "^24.0.15",
+    "@types/m3u8-parser": "^7.2.3",
+    "@types/node": "^24.3.0",
     "@types/ws": "^8.18.1",
-    "@typescript-eslint/eslint-plugin": "^8.37.0",
-    "@typescript-eslint/parser": "^8.37.0",
-    "eslint": "^9.31.0",
+    "@typescript-eslint/eslint-plugin": "^8.41.0",
+    "@typescript-eslint/parser": "^8.41.0",
+    "eslint": "^9.34.0",
     "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-prettier": "^5.5.3",
+    "eslint-plugin-prettier": "^5.5.4",
     "express": "^5.1.0",
     "husky": "^9.1.7",
     "prettier": "^3.6.2",
     "standard-version": "^9.5.0",
-    "typescript": "^5.8.3",
-    "typescript-eslint": "^8.37.0",
+    "typescript": "^5.9.2",
+    "typescript-eslint": "^8.41.0",
     "ws": "^8.18.3"
   },
   "dependencies": {
@@ -69,6 +69,7 @@
     "commander": "^14.0.0",
     "console-log-colors": "^0.5.0",
     "enquirer": "^2.4.1",
+    "ffmpeg-static": "^5.2.0",
     "m3u8-parser": "^7.2.0"
   },
   "files": [