@lzwme/m3u8-dl 0.0.7 → 0.0.9

package/cjs/cli.js

@@ -29,7 +29,7 @@ commander_1.program
     .option('-p, --play', `是否边下边看`)
     .option('-C, --cache-dir <dirpath>', `临时文件保存目录。默认为 cache`)
     .option('-S, --save-dir <dirpath>', `下载文件保存的路径。默认为当前目录`)
-    .option('--no-del-cache', `下载成功后是否删除临时文件。默认为 true。保存临时文件可以在重复下载时识别缓存`, true)
+    .option('--no-del-cache', `下载成功后是否删除临时文件。默认为 true。保存临时文件可以在重复下载时识别缓存`)
     .action(async (urls) => {
     const options = getOptions();
     utils_js_1.logger.debug(urls, options);
@@ -48,7 +48,7 @@ commander_1.program
     .option('-R,--remote-config-url <url>', '自定义远程配置加载地址。默认从主仓库配置读取')
     .description('m3u8视频在线搜索与下载')
     .action(async (keyword, options) => {
-    (0, video_search_js_1.VideoSerachAndDL)(keyword, options, getOptions());
+    await (0, video_search_js_1.VideoSerachAndDL)(keyword, options, getOptions());
 });
 commander_1.program.parse(process.argv);
 function getOptions() {

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

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { M3u8DLOptions, TsItemInfo } from '../types/m3u8';
 /**
  * 边下边看

package/cjs/lib/local-play.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toLocalM3u8 = exports.localPlay = void 0;
+exports.localPlay = localPlay;
+exports.toLocalM3u8 = toLocalM3u8;
 const fe_utils_1 = require("@lzwme/fe-utils");
 const console_log_colors_1 = require("console-log-colors");
 const node_fs_1 = require("node:fs");
@@ -14,15 +15,15 @@ async function localPlay(m3u8Info, options) {
     if (!m3u8Info?.length)
         return null;
     const cacheDir = (0, node_path_1.dirname)(m3u8Info[0].tsOut);
-    const info = await createLocalServer(cacheDir);
+    const cacheDirname = (0, node_path_1.basename)(cacheDir);
+    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), info.origin);
-    const playUrl = `https://lzw.me/x/m3u8-player?url=${encodeURIComponent(`${info.origin}/${filename}`)}`;
+    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;
 }
-exports.localPlay = localPlay;
 async function toLocalM3u8(m3u8Info, filepath, host = '') {
     const m3u8ContentList = [
         `#EXTM3U`,
@@ -40,8 +41,8 @@ async function toLocalM3u8(m3u8Info, filepath, host = '') {
     const m3u8Content = m3u8ContentList.join('\n');
     await node_fs_1.promises.writeFile(filepath, m3u8Content, 'utf8');
 }
-exports.toLocalM3u8 = toLocalM3u8;
 async function createLocalServer(baseDir) {
+    baseDir = (0, node_path_1.resolve)(baseDir);
     const port = await (0, fe_utils_1.findFreePort)();
     const origin = `http://localhost:${port}`;
     const server = (0, node_http_1.createServer)((req, res) => {
@@ -64,6 +65,15 @@ async function createLocalServer(baseDir) {
                 (0, node_fs_1.createReadStream)(filename).pipe(res);
                 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, '');
+                    return `<li><a href="${rpath}">${rpath}</a></li>`;
+                });
+                res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
+                res.end(`<ol>${html.join('')}</ol>`);
+                return;
+            }
         }
         res.writeHead(404, { 'Content-Type': 'text/plain; charset=utf-8' });
         res.end('Not found');

package/cjs/lib/m3u8-convert.js

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.m3u8Convert = void 0;
+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 utils_1 = require("./utils");
-const helper_1 = require("@lzwme/fe-utils/cjs/common/helper");
 async function m3u8Convert(options, data) {
     let ffmpegSupport = (0, utils_1.isSupportFfmpeg)();
     let filepath = (0, node_path_1.resolve)(options.saveDir, options.filename);
@@ -21,7 +20,13 @@ async function m3u8Convert(options, data) {
         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 '));
-        const cmd = `ffmpeg -y -f concat -safe 0 -i ${inputFilePath} -acodec copy -vcodec copy -absf aac_adtstoasc "${filepath}"`;
+        let headersString = '';
+        if (options.headers) {
+            for (const [key, value] of Object.entries(options.headers)) {
+                headersString += `-headers "${key}: ${String(value)}" `;
+            }
+        }
+        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);
         ffmpegSupport = !r.error;
@@ -34,7 +39,6 @@ async function m3u8Convert(options, data) {
     }
     if (!(0, node_fs_1.existsSync)(filepath))
         return '';
-    utils_1.logger.info(`File saved[${(0, console_log_colors_1.magentaBright)((0, helper_1.formatByteSize)((0, node_fs_1.statSync)(filepath).size))}]:`, (0, console_log_colors_1.greenBright)(filepath));
+    utils_1.logger.info(`File saved[${(0, console_log_colors_1.magentaBright)((0, fe_utils_1.formatByteSize)((0, node_fs_1.statSync)(filepath).size))}]:`, (0, console_log_colors_1.greenBright)(filepath));
     return filepath;
 }
-exports.m3u8Convert = m3u8Convert;

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

@@ -1,4 +1,5 @@
 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;
@@ -7,12 +8,6 @@ export declare const workPoll: WorkerPool<WorkerTaskInfo, {
 export declare function preDownLoad(url: string, options: M3u8DLOptions): Promise<void>;
 export declare function m3u8Download(url: string, options?: M3u8DLOptions): Promise<{
     options: M3u8DLOptions;
-    m3u8Info: {
-        manifest: any;
-        tsCount: number;
-        durationSecond: number;
-        data: TsItemInfo[];
-        crypto: import("../types/m3u8").M3u8Crypto;
-    };
+    m3u8Info: Awaited<ReturnType<typeof parseM3U8>> | null;
     filepath: string;
 }>;

package/cjs/lib/m3u8-download.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.m3u8Download = exports.preDownLoad = exports.workPoll = void 0;
+exports.workPoll = void 0;
+exports.preDownLoad = preDownLoad;
+exports.m3u8Download = m3u8Download;
 const node_path_1 = require("node:path");
 const node_fs_1 = require("node:fs");
 const node_os_1 = require("node:os");
@@ -18,7 +20,7 @@ const cache = {
 };
 const tsDlFile = (0, node_path_1.resolve)(__dirname, './ts-download.js');
 exports.workPoll = new worker_pool_1.WorkerPool(tsDlFile);
-async function formatOptions(url, opts) {
+function formatOptions(url, opts) {
     const options = {
         delCache: !opts.debug,
         saveDir: process.cwd(),
@@ -54,7 +56,7 @@ async function formatOptions(url, opts) {
     return [url, options];
 }
 async function m3u8InfoParse(url, options = {}) {
-    [url, options] = await formatOptions(url, options);
+    [url, options] = formatOptions(url, options);
     const ext = (0, utils_1.isSupportFfmpeg)() ? '.mp4' : '.ts';
     let filepath = (0, node_path_1.resolve)(options.saveDir, options.filename);
     if (!filepath.endsWith(ext))
@@ -86,7 +88,6 @@ async function preDownLoad(url, options) {
         }
     }
 }
-exports.preDownLoad = preDownLoad;
 async function m3u8Download(url, options = {}) {
     utils_1.logger.info('Starting download for', (0, console_log_colors_1.cyanBright)(url));
     const result = await m3u8InfoParse(url, options);
@@ -181,4 +182,3 @@ async function m3u8Download(url, options = {}) {
     utils_1.logger.debug('Done!', url, result.m3u8Info);
     return result;
 }
-exports.m3u8Download = m3u8Download;

package/cjs/lib/parseM3u8.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseM3U8 = void 0;
+exports.parseM3U8 = parseM3U8;
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const m3u8_parser_1 = require("m3u8-parser");
@@ -54,8 +54,9 @@ async function parseM3U8(content, url = process.cwd(), cacheDir = './cache') {
     if (tsKeyInfo?.uri) {
         if (tsKeyInfo.method)
             result.crypto.method = tsKeyInfo.method.toUpperCase();
-        if (tsKeyInfo.iv)
-            result.crypto.iv = new Uint8Array(Buffer.from(tsKeyInfo.iv));
+        if (tsKeyInfo.iv) {
+            result.crypto.iv = typeof tsKeyInfo.iv === 'string' ? new Uint8Array(Buffer.from(tsKeyInfo.iv)) : tsKeyInfo.iv;
+        }
         result.crypto.uri = tsKeyInfo.uri.includes('://') ? tsKeyInfo.uri : new URL(tsKeyInfo.uri, url).toString();
     }
     if (result.crypto.uri !== '') {
@@ -77,5 +78,4 @@ async function parseM3U8(content, url = process.cwd(), cacheDir = './cache') {
     result.durationSecond = +Number(result.durationSecond).toFixed(2);
     return result;
 }
-exports.parseM3U8 = parseM3U8;
 // parseM3U8('', 't.m3u8').then(d => console.log(d));

package/cjs/lib/ts-download.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tsDownload = void 0;
+exports.tsDownload = tsDownload;
 const node_crypto_1 = require("node:crypto");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
@@ -27,10 +27,15 @@ async function tsDownload(info, cryptoInfo) {
     }
     return false;
 }
-exports.tsDownload = tsDownload;
 function aesDecrypt(data, cryptoInfo) {
-    const decipher = (0, node_crypto_1.createDecipheriv)((cryptoInfo.method + '-cbc').toLocaleLowerCase(), cryptoInfo.key, cryptoInfo.iv);
-    return Buffer.concat([decipher.update(Buffer.isBuffer(data) ? data : Buffer.from(data)), decipher.final()]);
+    try {
+        const decipher = (0, node_crypto_1.createDecipheriv)((cryptoInfo.method + '-cbc').toLocaleLowerCase(), cryptoInfo.key, cryptoInfo.iv);
+        return Buffer.concat([decipher.update(Buffer.isBuffer(data) ? data : Buffer.from(data)), decipher.final()]);
+    }
+    catch (err) {
+        console.log('aesDecrypt err:', err);
+        throw err;
+    }
 }
 if (!node_worker_threads_1.isMainThread && node_worker_threads_1.parentPort) {
     node_worker_threads_1.parentPort.on('message', (data) => {

package/cjs/lib/utils.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import { NLogger, Request } from '@lzwme/fe-utils';
 export declare const request: Request;
 export declare const getRetry: <T = string>(url: string, retries?: number) => Promise<{

package/cjs/lib/utils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isSupportFfmpeg = exports.logger = exports.getRetry = exports.request = void 0;
+exports.logger = exports.getRetry = exports.request = void 0;
+exports.isSupportFfmpeg = isSupportFfmpeg;
 const fe_utils_1 = require("@lzwme/fe-utils");
 exports.request = new fe_utils_1.Request('', {
     'content-type': 'application/x-www-form-urlencoded; charset=UTF-8',
@@ -22,4 +23,3 @@ function isSupportFfmpeg() {
         _isSupportFfmpeg = (0, fe_utils_1.execSync)('ffmpeg -version').stderr === '';
     return _isSupportFfmpeg;
 }
-exports.isSupportFfmpeg = isSupportFfmpeg;

package/cjs/lib/video-search.d.ts

@@ -25,13 +25,13 @@ export declare class VideoSearch {
     apiMap: Map<string, {
         url: string;
         desc?: string;
-        enable?: boolean | 0 | 1; /** 播放地址缓存 */
+        enable?: 0 | 1 | boolean;
         remote?: boolean;
     }>;
     get api(): {
         url: string;
         desc?: string;
-        enable?: boolean | 0 | 1; /** 播放地址缓存 */
+        enable?: 0 | 1 | boolean;
         remote?: boolean;
     }[];
     constructor(options?: VSOptions);
@@ -39,13 +39,13 @@ export declare class VideoSearch {
     search(wd: string, api?: {
         url: string;
         desc?: string;
-        enable?: boolean | 0 | 1; /** 播放地址缓存 */
+        enable?: 0 | 1 | boolean;
         remote?: boolean;
     }): Promise<VideoSearchResult>;
     getVideoList(ids: number | string | (number | string)[], api?: {
         url: string;
         desc?: string;
-        enable?: boolean | 0 | 1; /** 播放地址缓存 */
+        enable?: 0 | 1 | boolean;
         remote?: boolean;
     }): Promise<VideoListResult>;
     private formatUrl;

package/cjs/lib/video-search.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VideoSerachAndDL = exports.VideoSearch = void 0;
+exports.VideoSearch = void 0;
+exports.VideoSerachAndDL = VideoSerachAndDL;
 const fe_utils_1 = require("@lzwme/fe-utils");
 const storage_js_1 = require("./storage.js");
 const utils_js_1 = require("./utils.js");
@@ -41,7 +42,7 @@ class VideoSearch {
     async updateOptions(options) {
         const cache = storage_js_1.stor.get();
         const apis = [...(cache.api || []), ...options.api];
-        await this.formatUrl(apis);
+        this.formatUrl(apis);
         if (options.api?.length)
             storage_js_1.stor.set({ api: apis });
         (cache.api || []).forEach(url => {
@@ -258,4 +259,3 @@ async function VideoSerachAndDL(keyword, options, baseOpts) {
         return VideoSerachAndDL(keyword, options, baseOpts);
     }
 }
-exports.VideoSerachAndDL = VideoSerachAndDL;

package/cjs/lib/worker_pool.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { EventEmitter } from 'node:events';
 export declare class WorkerPool<T = unknown, R = unknown> extends EventEmitter {
     private processorFile;

package/cjs/m3u8-batch-download.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.m3u8BatchDownload = void 0;
+exports.m3u8BatchDownload = m3u8BatchDownload;
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const m3u8_download_1 = require("./lib/m3u8-download");
@@ -38,7 +38,7 @@ async function m3u8BatchDownload(urls, options) {
     const tasks = await formatUrls(urls, options);
     return new Promise(rs => {
         let preDLing = false;
-        const run = async () => {
+        const run = () => {
             const [key, keyNext] = [...tasks.keys()];
             if (key) {
                 const o = { ...tasks.get(key) };
@@ -63,4 +63,3 @@ async function m3u8BatchDownload(urls, options) {
         return d;
     });
 }
-exports.m3u8BatchDownload = m3u8BatchDownload;

package/cjs/types/m3u8.d.ts

@@ -1,6 +1,3 @@
-/// <reference path="../../global.d.ts" />
-/// <reference types="node" />
-/// <reference types="node" />
 import type { IncomingHttpHeaders } from 'node:http';
 export interface TsItemInfo {
     /** ts 文件次序 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lzwme/m3u8-dl",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "description": "Batch download of m3u8 files and convert to mp4",
   "main": "cjs/index.js",
   "types": "cjs/index.d.ts",
@@ -12,7 +12,7 @@
     "url": "https://lzw.me"
   },
   "scripts": {
-    "prepare": "husky install",
+    "prepare": "husky || true",
     "dev": "npm run watch",
     "watch": "npm run build -- -- -w",
     "lint": "flh --eslint --tscheck --prettier",
@@ -35,7 +35,6 @@
     "download",
     "ffmpeg"
   ],
-  "packageManager": "pnpm@8.0.0",
   "engines": {
     "node": ">=14.18"
   },
@@ -44,22 +43,24 @@
     "registry": "https://registry.npmjs.com"
   },
   "devDependencies": {
-    "@lzwme/fed-lint-helper": "^2.5.2",
-    "@types/node": "^20.11.20",
-    "@typescript-eslint/eslint-plugin": "^7.0.2",
-    "@typescript-eslint/parser": "^7.0.2",
-    "eslint": "^8.56.0",
+    "@eslint/js": "^9.8.0",
+    "@lzwme/fed-lint-helper": "^2.6.2",
+    "@types/node": "^22.0.0",
+    "@typescript-eslint/eslint-plugin": "^7.18.0",
+    "@typescript-eslint/parser": "^7.18.0",
+    "eslint": "^9.8.0",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-prettier": "^5.1.3",
-    "husky": "^9.0.11",
-    "prettier": "^3.2.5",
+    "eslint-plugin-prettier": "^5.2.1",
+    "husky": "^9.1.4",
+    "prettier": "^3.3.3",
     "standard-version": "^9.5.0",
-    "typescript": "^5.3.3"
+    "typescript": "^5.5.4",
+    "typescript-eslint": "^7.18.0"
   },
   "dependencies": {
-    "@lzwme/fe-utils": "^1.6.0",
-    "commander": "^12.0.0",
-    "console-log-colors": "^0.4.0",
+    "@lzwme/fe-utils": "^1.7.5",
+    "commander": "^12.1.0",
+    "console-log-colors": "^0.5.0",
     "enquirer": "^2.4.1",
     "m3u8-parser": "^7.1.0"
   },