@lzwme/m3u8-dl 0.0.3 → 0.0.4

package/cjs/lib/m3u8-convert.js

@@ -11,13 +11,15 @@ async function m3u8Convert(options, data) {
     let ffmpegSupport = (0, utils_1.isSupportFfmpeg)();
     let filepath = (0, node_path_1.resolve)(options.saveDir, options.filename);
     if (!ffmpegSupport)
-        filepath = filepath.replace('.mp4', '.ts');
+        filepath = filepath.replace(/\.mp4$/, '.ts');
     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));
     if (ffmpegSupport) {
         const inputFilePath = (0, node_path_1.resolve)(options.cacheDir, 'input.txt');
-        const filesAllArr = data.map(d => (0, node_path_1.resolve)(d.tsOut)).filter(d => (0, node_fs_1.existsSync)(d));
+        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 '));
         const cmd = `ffmpeg -y -f concat -safe 0 -i ${inputFilePath} -acodec copy -vcodec copy -absf aac_adtstoasc ${filepath}`;
         utils_1.logger.debug('[convert to mp4]cmd:', (0, console_log_colors_1.cyan)(cmd));
@@ -26,12 +28,13 @@ async function m3u8Convert(options, data) {
         if (r.error)
             utils_1.logger.error('Conversion to mp4 failed. Please confirm that `ffmpeg` is installed!', r.stderr);
     }
-    else {
+    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))));
     }
-    if ((0, node_fs_1.existsSync)(filepath)) {
-        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));
-    }
+    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));
     return filepath;
 }
 exports.m3u8Convert = m3u8Convert;

package/cjs/lib/m3u8-download.js

@@ -45,8 +45,6 @@ async function formatOptions(url, opts) {
         options.filename += '.mp4';
     if (!options.cacheDir)
         options.cacheDir = `cache/${urlMd5}`;
-    if (!(0, node_fs_1.existsSync)(options.cacheDir))
-        await node_fs_1.promises.mkdir(options.cacheDir, { recursive: true });
     if (options.headers)
         utils_1.request.setHeaders(options.headers);
     if (options.debug) {
@@ -75,6 +73,8 @@ async function m3u8InfoParse(url, options = {}) {
 }
 async function preDownLoad(url, options) {
     const result = await m3u8InfoParse(url, options);
+    if (!result.m3u8Info)
+        return;
     for (const info of result.m3u8Info.data) {
         if (!exports.workPoll.freeNum)
             return;
@@ -172,7 +172,7 @@ async function m3u8Download(url, options = {}) {
         await barrier.wait();
         if (stats.tsFailed === 0) {
             result.filepath = await (0, m3u8_convert_1.m3u8Convert)(options, m3u8Info.data);
-            if ((0, node_fs_1.existsSync)(options.cacheDir) && options.delCache)
+            if (result.filepath && (0, node_fs_1.existsSync)(options.cacheDir) && options.delCache)
                 (0, fe_utils_1.rmrfAsync)(options.cacheDir);
         }
         else

package/cjs/lib/ts-download.js

@@ -3,7 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.tsDownload = void 0;
 const node_crypto_1 = require("node:crypto");
 const node_fs_1 = require("node:fs");
+const node_path_1 = require("node:path");
 const node_worker_threads_1 = require("node:worker_threads");
+const fe_utils_1 = require("@lzwme/fe-utils");
 const utils_1 = require("./utils");
 async function tsDownload(info, cryptoInfo) {
     try {
@@ -13,6 +15,7 @@ async function tsDownload(info, cryptoInfo) {
         if (r.response.statusCode === 200) {
             utils_1.logger.debug('\n', info);
             const data = cryptoInfo.key ? aesDecrypt(r.buffer, cryptoInfo) : r.buffer;
+            (0, fe_utils_1.mkdirp)((0, node_path_1.dirname)(info.tsOut));
             await node_fs_1.promises.writeFile(info.tsOut, data);
             info.tsSize = r.buffer.byteLength;
             return true;

package/cjs/m3u8-batch-download.js

@@ -41,7 +41,10 @@ async function m3u8BatchDownload(urls, options) {
             if (key) {
                 const o = { ...tasks.get(key) };
                 tasks.delete(key);
-                o.onProgress = (finished, total) => {
+                const p = o.onProgress;
+                o.onProgress = (finished, total, info) => {
+                    if (p)
+                        p(finished, total, info);
                     if (!preDLing && keyNext && tasks.size && m3u8_download_1.workPoll.freeNum > 1 && total - finished < options.threadNum) {
                         utils_1.logger.debug('\n[预下载下一集]', 'freeNum:', m3u8_download_1.workPoll.freeNum, 'totalNum:', m3u8_download_1.workPoll.totalNum, 'totalTask:', m3u8_download_1.workPoll.totalTask, tasks.size);
                         preDLing = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lzwme/m3u8-dl",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "Batch download of m3u8 files and convert to mp4",
   "main": "cjs/index.js",
   "types": "cjs/index.d.ts",
@@ -44,11 +44,11 @@
     "registry": "https://registry.npmjs.com"
   },
   "devDependencies": {
-    "@lzwme/fed-lint-helper": "^2.3.1",
-    "@types/node": "^18.16.3",
-    "@typescript-eslint/eslint-plugin": "^5.59.2",
-    "@typescript-eslint/parser": "^5.59.2",
-    "eslint": "^8.39.0",
+    "@lzwme/fed-lint-helper": "^2.3.2",
+    "@types/node": "^20.2.0",
+    "@typescript-eslint/eslint-plugin": "^5.59.6",
+    "@typescript-eslint/parser": "^5.59.6",
+    "eslint": "^8.40.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-prettier": "^4.2.1",
     "husky": "^8.0.3",
@@ -61,7 +61,7 @@
     "commander": "^10.0.1",
     "console-log-colors": "^0.4.0",
     "enquirer": "^2.3.6",
-    "m3u8-parser": "^6.0.0"
+    "m3u8-parser": "^6.1.0"
   },
   "files": [
     "cjs",