@lzwme/m3u8-dl 0.0.9 → 1.0.0

package/README.MD

@@ -25,6 +25,7 @@
 - 支持常见的 AES 加密视频流解密。
 - 自动转换为 mp4。**需全局安装 [ffmpeg](https://ffmpeg.org/download.html)**
 - `[NEW!]`支持指定采集站标准 API，以命令行交互的方式搜索和下载。
+- `[NEW!]` 新增下载中心，支持启动为 webui 服务方式进行下载管理
 
 ## 安装(Install)
 
@@ -91,6 +92,34 @@ m3u8dl s -u https://jyzyapi.com/provide/vod/
 
 **声明：** 以上仅作示例，请自行搜索查找可用的采集站 API。本工具仅用作技术研究学习，不提供任何具体资源类信息。
 
+### 命令行方式启动 webui
+
+```bash
+# 安装 server 需要的依赖
+npm i -g express ws
+# 启动 server
+m3u8dl server -p 6600
+```
+
+然后浏览器访问： http://localhost:6600
+
+![](examples/img/m3u8dl-server-webui.jpg)
+
+## 基于 Docker 部署
+
+基于 docker 命令：
+
+```bash
+docker run
+```
+
+基于 `docker-compose.yml`：
+
+```bash
+m3u8dl:
+
+```
+
 ### API 调用
 
 ```ts

package/cjs/cli.js

@@ -1,4 +1,37 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 const node_path_1 = require("node:path");
 const commander_1 = require("commander");
@@ -9,7 +42,7 @@ const m3u8_batch_download_1 = require("./m3u8-batch-download");
 const video_search_js_1 = require("./lib/video-search.js");
 const pkg = (0, fe_utils_1.readJsonFileSync)((0, node_path_1.resolve)(__dirname, '../package.json'));
 process.on('unhandledRejection', (r, p) => {
-    console.log('[退出][unhandledRejection]', r, p);
+    utils_js_1.logger.info('[退出][unhandledRejection]', r, p);
     process.exit();
 });
 process.on('SIGINT', signal => {
@@ -30,22 +63,35 @@ commander_1.program
     .option('-C, --cache-dir <dirpath>', `临时文件保存目录。默认为 cache`)
     .option('-S, --save-dir <dirpath>', `下载文件保存的路径。默认为当前目录`)
     .option('--no-del-cache', `下载成功后是否删除临时文件。默认为 true。保存临时文件可以在重复下载时识别缓存`)
+    .option('--no-convert', '下载成功后，是否不合并转换为 mp4 文件。默认为 true。')
     .action(async (urls) => {
     const options = getOptions();
     utils_js_1.logger.debug(urls, options);
     if (options.progress != null)
         options.showProgress = options.progress;
+    delete options.progress;
     if (urls.length > 0) {
         await (0, m3u8_batch_download_1.m3u8BatchDownload)(urls, options);
     }
     else
         commander_1.program.help();
 });
+commander_1.program
+    .command('server')
+    .description('启动下载中心web服务')
+    .option('-P, --port <port>', '指定web服务端口。默认为6600')
+    .action((options) => {
+    const opts = Object.assign(getOptions(), options);
+    Promise.resolve().then(() => __importStar(require('./server/download-server.js'))).then(m => {
+        new m.DLServer({ port: opts.port || 6600, debug: opts.debug });
+    });
+});
 commander_1.program
     .command('search [keyword]')
     .alias('s')
     .option('-u,--url <api...>', '影视搜索的接口地址(m3u8采集站标准接口)')
-    .option('-R,--remote-config-url <url>', '自定义远程配置加载地址。默认从主仓库配置读取')
+    .option('-d, --apidir <dirpath>', '指定自定义视频搜索 api 所在的目录或具体路径')
+    // .option('-R,--remote-config-url <url>', '自定义远程配置加载地址。默认从主仓库配置读取')
     .description('m3u8视频在线搜索与下载')
     .action(async (keyword, options) => {
     await (0, video_search_js_1.VideoSerachAndDL)(keyword, options, getOptions());

package/cjs/lib/local-play.d.ts

@@ -1,10 +1,10 @@
-import { M3u8DLOptions, TsItemInfo } from '../types/m3u8';
+import type { TsItemInfo } from '../types/m3u8.js';
 /**
  * 边下边看
  */
-export declare function localPlay(m3u8Info: TsItemInfo[], options: M3u8DLOptions): Promise<{
+export declare function localPlay(m3u8Info: TsItemInfo[]): Promise<{
     port: number;
     origin: string;
     server: import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>;
 }>;
-export declare function toLocalM3u8(m3u8Info: TsItemInfo[], filepath: string, host?: string): Promise<void>;
+export declare function toLocalM3u8(m3u8Info: TsItemInfo[], m3u8FilePath?: string, host?: string): string;

package/cjs/lib/local-play.js

@@ -7,24 +7,30 @@ const console_log_colors_1 = require("console-log-colors");
 const node_fs_1 = require("node:fs");
 const node_http_1 = require("node:http");
 const node_path_1 = require("node:path");
-const utils_1 = require("./utils");
+const utils_js_1 = require("./utils.js");
 /**
  * 边下边看
  */
-async function localPlay(m3u8Info, options) {
+async function localPlay(m3u8Info) {
     if (!m3u8Info?.length)
         return null;
     const cacheDir = (0, node_path_1.dirname)(m3u8Info[0].tsOut);
     const cacheDirname = (0, node_path_1.basename)(cacheDir);
+    const cacheFilepath = toLocalM3u8(m3u8Info);
+    const filename = (0, node_path_1.basename)(cacheFilepath);
     const info = await createLocalServer((0, node_path_1.dirname)(cacheDir));
-    const filename = (0, node_path_1.basename)(options.filename).slice(0, options.filename.lastIndexOf('.')) + `.m3u8`;
-    await toLocalM3u8(m3u8Info, (0, node_path_1.resolve)(cacheDir, filename), `/${cacheDirname}`);
     const playUrl = `https://lzw.me/x/m3u8-player?url=${encodeURIComponent(`${info.origin}/${cacheDirname}/${filename}`)}`;
     const cmd = `${process.platform === 'win32' ? 'start' : 'open'} ${playUrl}`;
     (0, fe_utils_1.execSync)(cmd);
     return info;
 }
-async function toLocalM3u8(m3u8Info, filepath, host = '') {
+function toLocalM3u8(m3u8Info, m3u8FilePath = '', host = '') {
+    const cacheDir = (0, node_path_1.dirname)(m3u8Info[0].tsOut);
+    const cacheDirname = (0, node_path_1.basename)(cacheDir);
+    if (!m3u8FilePath)
+        m3u8FilePath = (0, node_path_1.resolve)(cacheDir, `${cacheDirname}.m3u8`);
+    if ((0, node_fs_1.existsSync)(m3u8FilePath))
+        return m3u8FilePath;
     const m3u8ContentList = [
         `#EXTM3U`,
         `#EXT-X-VERSION:3`,
@@ -33,13 +39,21 @@ async function toLocalM3u8(m3u8Info, filepath, host = '') {
         `#EXT-X-MEDIA-SEQUENCE:0`,
         // `#EXT-X-KEY:METHOD=AES-128,URI="/api/aes/enc.key"`,
     ];
+    if (host && !host.endsWith('/'))
+        host += '/';
     m3u8Info.forEach(d => {
         if (d.tsOut)
-            m3u8ContentList.push(`#EXTINF:${Number(d.duration).toFixed(6)},`, `${host}/${(0, node_path_1.basename)(d.tsOut)}`);
+            m3u8ContentList.push(`#EXTINF:${Number(d.duration).toFixed(6)},`, `${host}${(0, node_path_1.basename)(d.tsOut)}`);
     });
     m3u8ContentList.push(`#EXT-X-ENDLIST`);
     const m3u8Content = m3u8ContentList.join('\n');
-    await node_fs_1.promises.writeFile(filepath, m3u8Content, 'utf8');
+    const ext = (0, node_path_1.extname)(m3u8FilePath);
+    if (ext !== '.m3u8')
+        m3u8FilePath = m3u8FilePath.replace(ext, '') + '.m3u8';
+    m3u8FilePath = (0, node_path_1.resolve)(cacheDir, m3u8FilePath);
+    (0, fe_utils_1.mkdirp)(cacheDir);
+    (0, node_fs_1.writeFileSync)(m3u8FilePath, m3u8Content, 'utf8');
+    return m3u8FilePath;
 }
 async function createLocalServer(baseDir) {
     baseDir = (0, node_path_1.resolve)(baseDir);
@@ -47,7 +61,7 @@ async function createLocalServer(baseDir) {
     const origin = `http://localhost:${port}`;
     const server = (0, node_http_1.createServer)((req, res) => {
         const filename = (0, node_path_1.join)(baseDir, decodeURIComponent(req.url));
-        utils_1.logger.debug('[req]', req.url, filename);
+        utils_js_1.logger.debug('[req]', req.url, filename);
         if ((0, node_fs_1.existsSync)(filename)) {
             const stats = (0, node_fs_1.statSync)(filename);
             const ext = (0, node_path_1.extname)(filename);
@@ -66,8 +80,8 @@ async function createLocalServer(baseDir) {
                 return;
             }
             else if (stats.isDirectory()) {
-                const html = (0, node_fs_1.readdirSync)(filename).map(filepath => {
-                    const rpath = (0, node_path_1.resolve)(filename, filepath).replace(baseDir, '');
+                const html = (0, node_fs_1.readdirSync)(filename).map(fname => {
+                    const rpath = (0, node_path_1.resolve)(filename, fname).replace(baseDir, '');
                     return `<li><a href="${rpath}">${rpath}</a></li>`;
                 });
                 res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
@@ -79,7 +93,7 @@ async function createLocalServer(baseDir) {
         res.end('Not found');
     }).listen(port, () => {
         console.log();
-        utils_1.logger.info('Created Local Server:', console_log_colors_1.color.greenBright(origin));
+        utils_js_1.logger.info('Created Local Server:', console_log_colors_1.color.greenBright(origin));
     });
     return { port, origin, server };
 }

package/cjs/lib/m3u8-convert.js

@@ -14,18 +14,20 @@ async function m3u8Convert(options, data) {
     if (!options.force && (0, node_fs_1.existsSync)(filepath))
         return filepath;
     utils_1.logger.info(`Starting ${ffmpegSupport ? 'convert to mp4' : 'merge into ts'} file:`, (0, console_log_colors_1.greenBright)(filepath));
+    (0, fe_utils_1.mkdirp)((0, node_path_1.dirname)(filepath));
     if (ffmpegSupport) {
         const inputFilePath = (0, node_path_1.resolve)(options.cacheDir, 'input.txt');
         let filesAllArr = data.map(d => (0, node_path_1.resolve)(d.tsOut)).filter(d => (0, node_fs_1.existsSync)(d));
         if (process.platform === 'win32')
             filesAllArr = filesAllArr.map(d => d.replaceAll('\\', '/'));
-        await node_fs_1.promises.writeFile(inputFilePath, 'ffconcat version 1.0\nfile ' + filesAllArr.join('\nfile '));
+        (0, node_fs_1.writeFileSync)(inputFilePath, 'ffconcat version 1.0\nfile ' + filesAllArr.join('\nfile '));
         let headersString = '';
         if (options.headers) {
             for (const [key, value] of Object.entries(options.headers)) {
                 headersString += `-headers "${key}: ${String(value)}" `;
             }
         }
+        // ffmpeg -i nz.ts -c copy -map 0:v -map 0:a -bsf:a aac_adtstoasc nz.mp4
         const cmd = `ffmpeg -y -f concat -safe 0 -i ${inputFilePath} -acodec copy -vcodec copy -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);
@@ -35,7 +37,13 @@ async function m3u8Convert(options, data) {
     }
     if (!ffmpegSupport) {
         filepath = filepath.replace(/\.mp4$/, '.ts');
-        await node_fs_1.promises.writeFile(filepath, Buffer.concat(data.map(d => (0, node_fs_1.readFileSync)(d.tsOut))));
+        const filteWriteStream = (0, node_fs_1.createWriteStream)(filepath);
+        for (const d of data) {
+            const err = await new Promise(rs => filteWriteStream.write((0, node_fs_1.readFileSync)(d.tsOut), e => rs(e)));
+            if (err)
+                utils_1.logger.error(`Write file failed: ${d.tsOut}`, err);
+        }
+        filteWriteStream.end();
     }
     if (!(0, node_fs_1.existsSync)(filepath))
         return '';

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

@@ -1,13 +1,32 @@
-import { WorkerPool } from './worker_pool';
-import { parseM3U8 } from './parseM3u8';
-import type { M3u8DLOptions, TsItemInfo, WorkerTaskInfo } from '../types/m3u8';
-export declare const workPoll: WorkerPool<WorkerTaskInfo, {
-    success: boolean;
-    info: TsItemInfo;
-}>;
-export declare function preDownLoad(url: string, options: M3u8DLOptions): Promise<void>;
+import { parseM3U8 } from './parseM3u8.js';
+import type { M3u8DLOptions, M3u8WorkerPool } from '../types/m3u8.js';
+export declare class DownloadQueue {
+    private queue;
+    private activeDownloads;
+    private _maxConcurrent;
+    constructor(maxConcurrent?: number);
+    get maxConcurrent(): number;
+    set maxConcurrent(value: number);
+    add(url: string, options: M3u8DLOptions, priority?: number): void;
+    private processQueue;
+    pause(url: string): void;
+    resume(url: string, options: M3u8DLOptions, priority?: number): void;
+    clear(): void;
+    getStatus(): {
+        queueLength: number;
+        activeDownloads: string[];
+        maxConcurrent: number;
+    };
+}
+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 m3u8DLStop(url: string, wp?: M3u8WorkerPool): number;