@lzwme/m3u8-dl 0.0.9 → 0.0.10

package/cjs/cli.js

@@ -30,6 +30,7 @@ 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);
@@ -45,7 +46,8 @@ 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

@@ -7,4 +7,4 @@ export declare function localPlay(m3u8Info: TsItemInfo[], options: M3u8DLOptions
     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

@@ -18,13 +18,15 @@ async function localPlay(m3u8Info, options) {
     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), `/${cacheDirname}`);
+    const cacheFilepath = (0, node_path_1.resolve)(cacheDir, filename);
+    if (!(0, node_fs_1.existsSync)(cacheFilepath))
+        toLocalM3u8(m3u8Info, cacheFilepath);
     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 m3u8ContentList = [
         `#EXTM3U`,
         `#EXT-X-VERSION:3`,
@@ -33,13 +35,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)((0, node_path_1.dirname)(m3u8Info[0].tsOut), m3u8FilePath);
+    (0, fe_utils_1.mkdirp)((0, node_path_1.dirname)(m3u8FilePath));
+    (0, node_fs_1.writeFileSync)(m3u8FilePath, m3u8Content, 'utf8');
+    return m3u8FilePath;
 }
 async function createLocalServer(baseDir) {
     baseDir = (0, node_path_1.resolve)(baseDir);
@@ -66,8 +76,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' });

package/cjs/lib/m3u8-convert.js

@@ -19,7 +19,7 @@ async function m3u8Convert(options, data) {
         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)) {
@@ -35,7 +35,14 @@ 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);
+        }
     }
     if (!(0, node_fs_1.existsSync)(filepath))
         return '';

package/cjs/lib/m3u8-download.js

@@ -58,6 +58,7 @@ function formatOptions(url, opts) {
 async function m3u8InfoParse(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))
         filepath += ext;
@@ -68,7 +69,7 @@ async function m3u8InfoParse(url, options = {}) {
     }
     if (!options.force && (0, node_fs_1.existsSync)(filepath))
         return result;
-    const m3u8Info = await (0, parseM3u8_1.parseM3U8)('', url, options.cacheDir).catch(e => utils_1.logger.error('[parseM3U8][failed]', e));
+    const m3u8Info = await (0, parseM3u8_1.parseM3U8)(url, options.cacheDir).catch(e => utils_1.logger.error('[parseM3U8][failed]', e));
     if (m3u8Info && m3u8Info?.tsCount > 0)
         result.m3u8Info = m3u8Info;
     return result;
@@ -170,11 +171,14 @@ async function m3u8Download(url, options = {}) {
             console.info(`\nTotal segments: ${(0, console_log_colors_1.cyan)(m3u8Info.tsCount)}, duration: ${(0, console_log_colors_1.green)(m3u8Info.durationSecond + 'sec')}.`, `Parallel jobs: ${(0, console_log_colors_1.magenta)(options.threadNum)}`);
         }
         runTask(m3u8Info.data);
+        (0, local_play_1.toLocalM3u8)(m3u8Info.data, options.filename);
         await barrier.wait();
         if (stats.tsFailed === 0) {
-            result.filepath = await (0, m3u8_convert_1.m3u8Convert)(options, m3u8Info.data);
-            if (result.filepath && (0, node_fs_1.existsSync)(options.cacheDir) && options.delCache)
-                (0, fe_utils_1.rmrfAsync)(options.cacheDir);
+            if (options.convert !== false) {
+                result.filepath = await (0, m3u8_convert_1.m3u8Convert)(options, m3u8Info.data);
+                if (result.filepath && (0, node_fs_1.existsSync)(options.cacheDir) && options.delCache)
+                    (0, fe_utils_1.rmrfAsync)(options.cacheDir);
+            }
         }
         else
             utils_1.logger.warn('Download Failed! Please retry!', stats.tsFailed);

package/cjs/lib/parseM3u8.d.ts

@@ -1,5 +1,10 @@
 import type { M3u8Crypto, TsItemInfo } from '../types/m3u8';
-export declare function parseM3U8(content: string, url?: string, cacheDir?: string): Promise<{
+/**
+ * 解析 m3u8 文件
+ * @param content m3u8 文件的内容，可为 http 远程地址、本地文件路径
+ * @param cacheDir 缓存文件保存目录
+ */
+export declare function parseM3U8(content: string, cacheDir?: string): Promise<{
     manifest: any;
     /** ts 文件数量 */
     tsCount: number;

package/cjs/lib/parseM3u8.js

@@ -3,17 +3,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseM3U8 = parseM3U8;
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
+const fe_utils_1 = require("@lzwme/fe-utils");
 const m3u8_parser_1 = require("m3u8-parser");
 const utils_1 = require("./utils");
-async function parseM3U8(content, url = process.cwd(), cacheDir = './cache') {
-    if (!content && url) {
-        if (!url.startsWith('http') && (0, node_fs_1.existsSync)(url)) {
-            url = (0, node_path_1.resolve)(process.cwd(), url);
-            content = await node_fs_1.promises.readFile(url, 'utf8');
-        }
-        else {
-            content = (await (0, utils_1.getRetry)(url)).data;
-        }
+/**
+ * 解析 m3u8 文件
+ * @param content m3u8 文件的内容，可为 http 远程地址、本地文件路径
+ * @param cacheDir 缓存文件保存目录
+ */
+async function parseM3U8(content, cacheDir = './cache') {
+    let url = process.cwd();
+    if (content.startsWith('http')) {
+        url = content;
+        content = (await (0, utils_1.getRetry)(url)).data;
+    }
+    else if (!content.includes('\n') && (0, node_fs_1.existsSync)(content)) {
+        url = (0, node_path_1.resolve)(process.cwd(), content);
+        content = await node_fs_1.promises.readFile(url, 'utf8');
     }
     if (!content) {
         utils_1.logger.error('获取播放列表为空！', url);
@@ -71,7 +77,7 @@ async function parseM3U8(content, url = process.cwd(), cacheDir = './cache') {
             duration: tsList[i].duration,
             timeline: tsList[i].timeline,
             uri: tsList[i].uri,
-            tsOut: `${cacheDir}/${i}-${(0, node_path_1.basename)(tsList[i].uri).replace(/\.ts\?.+/, '.ts')}`,
+            tsOut: `${cacheDir}/${(0, fe_utils_1.md5)(tsList[i].uri)}.ts`,
         });
         result.durationSecond += tsList[i].duration;
     }

package/cjs/lib/search-api/ApiManage.d.ts

@@ -0,0 +1,30 @@
+import type { SearchApi, VideoSearchResult } from '../../types';
+export declare const apiManage: {
+    api: Map<string | number, SearchApi>;
+    current: SearchApi;
+    load(apidir?: string, force?: boolean): void;
+    /** 添加 API 到列表中 */
+    add(sApi: SearchApi | {
+        api: string;
+        desc?: string;
+        enable?: boolean;
+        key?: string | number;
+    }, force?: boolean): void;
+    /** API 有效性校验 */
+    validate(sApi: SearchApi, desc?: string): sApi is SearchApi;
+    /** 选择一个 API */
+    select(): Promise<void>;
+    search(wd: string, api?: SearchApi): Promise<{
+        api_key: number | string;
+        vod_id: number;
+        vod_name: string;
+        vod_en?: string;
+        vod_time?: string;
+        vod_remarks?: string;
+        vod_play_from?: string;
+        vod_play_url: string;
+        type_name?: string;
+        type_id?: number;
+    }[]>;
+    detail(info: VideoSearchResult["list"][0]): Promise<import("../../types").VideoDetailsResult>;
+};

package/cjs/lib/search-api/ApiManage.js

@@ -0,0 +1,90 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.apiManage = void 0;
+const enquirer_1 = require("enquirer");
+const utils_1 = require("../utils");
+const CommSearchApi_1 = require("./CommSearchApi");
+exports.apiManage = {
+    api: new Map(),
+    current: null,
+    load(apidir, force = false) {
+        const files = (0, utils_1.findFiles)(apidir, (filepath, s) => !s.isFile() || /\.c?js/.test(filepath));
+        for (const filepath of files) {
+            /* eslint-disable @typescript-eslint/no-var-requires */
+            const sApi = require(filepath);
+            this.add(sApi.default || sApi, force);
+        }
+    },
+    /** 添加 API 到列表中 */
+    add(sApi, force = false) {
+        if (Array.isArray(sApi))
+            return sApi.forEach(d => this.add(d));
+        if (sApi.api?.startsWith('http') && !('search' in sApi))
+            sApi = new CommSearchApi_1.CommSearchApi(sApi);
+        if (this.validate(sApi) && (force || !this.api.has(sApi.key))) {
+            this.api.set(sApi.key, sApi);
+            utils_1.logger.debug('添加Api:', sApi.desc || sApi.key);
+        }
+    },
+    /** API 有效性校验 */
+    validate(sApi, desc) {
+        if (!sApi)
+            return false;
+        const requiredKeys = ['enable', 'key', 'search', 'detail'];
+        if (!sApi.key)
+            sApi.key = sApi.desc;
+        for (const key of requiredKeys) {
+            if (!(key in sApi)) {
+                utils_1.logger.warn(`【API校验不通过】${desc} 缺少关键属性 ${key}`);
+                return false;
+            }
+            if ((key === 'search' || key === 'detail') && typeof sApi[key] !== 'function')
+                return false;
+        }
+        return sApi.enable !== false;
+    },
+    /** 选择一个 API */
+    async select() {
+        if (!this.api.size) {
+            utils_1.logger.error('没有可用的 API，请配置或指定 url、apidir 参数');
+            process.exit(-1);
+        }
+        if (this.api.size === 1) {
+            this.current = [...this.api.values()][0];
+            return;
+        }
+        const apis = [...this.api.values()];
+        const v = await (0, enquirer_1.prompt)({
+            type: 'select',
+            name: 'k',
+            message: '请选择 API 站点',
+            choices: apis.map(d => ({ name: String(d.key), message: d.desc })),
+            validate: value => value.length >= 1,
+        });
+        this.current = apis.find(d => String(d.key) === v.k);
+    },
+    async search(wd, api) {
+        const result = [];
+        try {
+            if (api)
+                return (await api.search(wd)).list;
+            for (api of this.api.values()) {
+                const r = await api.search(wd);
+                if (Array.isArray(r.list)) {
+                    r.list.forEach(d => {
+                        d.api_key = api.key;
+                        result.push(d);
+                    });
+                }
+            }
+        }
+        catch (error) {
+            utils_1.logger.error('搜索失败！', error.message);
+        }
+        return result;
+    },
+    detail(info) {
+        const api = this.api.get(info.api_key) || this.current;
+        return api.detail(info.vod_id);
+    },
+};

package/cjs/lib/search-api/CommSearchApi.d.ts

@@ -0,0 +1,44 @@
+import type { SearchApi, VideoDetailsResult, VideoSearchResult } from '../../types';
+import { type M3u8StorConfig } from '../storage.js';
+export interface VSOptions {
+    /** 采集站地址 */
+    api?: string;
+    /** 站点描述 */
+    desc?: string;
+    /** 是否启用 */
+    enable?: 0 | 1 | boolean;
+}
+/**
+ * 基于采集站点 API 的通用搜索
+ * @example
+ * ```ts
+ * const v = new CommSearchApi({ api: 'https://api.xinlangapi.com/xinlangapi.php/provide/vod/' });
+ * v.search('三体')
+ *   .then(d => {
+ *     console.log(d.total, d.list);
+ *     return v.getVideoList(d.list[0].vod_id);
+ *   })
+ *   .then(d => {
+ *     console.log('detail:', d.total, d.list[0]);
+ *   });
+ * ```
+ */
+export declare class CommSearchApi implements SearchApi {
+    protected options: VSOptions;
+    protected currentUrl: M3u8StorConfig['remoteConfig']['data']['apiSites'][0];
+    apiMap: Map<string, {
+        url: string;
+        desc?: string;
+        enable?: 0 | 1 | boolean;
+        remote?: boolean;
+    }>;
+    get desc(): string;
+    get key(): string;
+    get enable(): boolean;
+    constructor(options?: VSOptions);
+    search(wd: string, api?: string): Promise<VideoSearchResult>;
+    detail(id: string | number, api?: string): Promise<VideoDetailsResult>;
+    /** 按 id 取列表(每一项中包含了更为详细的内容) */
+    getVideoList(ids: number | string | (number | string)[], api?: string): Promise<VideoDetailsResult>;
+    private formatUrl;
+}

package/cjs/lib/search-api/CommSearchApi.js

@@ -0,0 +1,80 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CommSearchApi = void 0;
+const fe_utils_1 = require("@lzwme/fe-utils");
+const req = new fe_utils_1.Request(null, {
+    'content-type': 'application/json; charset=UTF-8',
+});
+/**
+ * 基于采集站点 API 的通用搜索
+ * @example
+ * ```ts
+ * const v = new CommSearchApi({ api: 'https://api.xinlangapi.com/xinlangapi.php/provide/vod/' });
+ * v.search('三体')
+ *   .then(d => {
+ *     console.log(d.total, d.list);
+ *     return v.getVideoList(d.list[0].vod_id);
+ *   })
+ *   .then(d => {
+ *     console.log('detail:', d.total, d.list[0]);
+ *   });
+ * ```
+ */
+class CommSearchApi {
+    options;
+    currentUrl;
+    apiMap = new Map();
+    get desc() {
+        return this.options.desc || this.options.api;
+    }
+    get key() {
+        return this.options.api;
+    }
+    get enable() {
+        return this.options.api && this.options.enable !== false;
+    }
+    constructor(options = {}) {
+        this.options = options;
+        if (options.api)
+            options.api = this.formatUrl(options.api)[0];
+        this.options = options;
+    }
+    async search(wd, api = this.options.api) {
+        let { data } = await req.get(api, { wd }, null, { rejectUnauthorized: false });
+        if (typeof data == 'string')
+            data = JSON.parse(data);
+        return data;
+    }
+    async detail(id, api = this.options.api) {
+        return this.getVideoList(id, api);
+    }
+    /** 按 id 取列表(每一项中包含了更为详细的内容) */
+    async getVideoList(ids, api = this.options.api) {
+        let { data } = await req.get(api, {
+            ac: 'videolist',
+            ids: Array.isArray(ids) ? ids.join(',') : ids,
+        }, null, { rejectUnauthorized: false });
+        if (typeof data == 'string')
+            data = JSON.parse(data);
+        return data;
+    }
+    formatUrl(url) {
+        const urls = [];
+        if (!url)
+            return urls;
+        if (typeof url === 'string')
+            url = [url];
+        for (let u of url) {
+            u = String(u || '').trim();
+            if (u.startsWith('http')) {
+                if (u.endsWith('provide/'))
+                    u += 'vod/';
+                if (u.endsWith('provide/vod'))
+                    u += '/';
+                urls.push(u.replace('/at/xml/', '/'));
+            }
+        }
+        return [...new Set(urls)];
+    }
+}
+exports.CommSearchApi = CommSearchApi;

package/cjs/lib/storage.d.ts

@@ -1,10 +1,12 @@
 import { LiteStorage } from '@lzwme/fe-utils';
-import { type VSOptions } from './video-search';
 import type { M3u8DLOptions, VideoDetails } from '../types';
-export interface M3u8StorConfig extends VSOptions {
+export interface M3u8StorConfig {
     /** 播放地址缓存 */
     api?: string[];
-    /** 远程加载的配置信息 */
+    /**
+     * 远程加载的配置信息
+     * @deprecated
+     */
     remoteConfig?: {
         /** 最近一次更新的时间。默认缓存1小时 */
         updateTime?: number;
@@ -22,7 +24,7 @@ export interface M3u8StorConfig extends VSOptions {
     latestSearchDL?: {
         keyword: string;
         urls: string[];
-        info: VideoDetails;
+        info: Partial<VideoDetails>;
         dlOptions: M3u8DLOptions;
     };
 }

package/cjs/lib/utils.d.ts

@@ -1,4 +1,5 @@
 import { NLogger, Request } from '@lzwme/fe-utils';
+import { Stats } from 'node:fs';
 export declare const request: Request;
 export declare const getRetry: <T = string>(url: string, retries?: number) => Promise<{
     data: T;
@@ -8,3 +9,4 @@ export declare const getRetry: <T = string>(url: string, retries?: number) => Pr
 }>;
 export declare const logger: NLogger;
 export declare function isSupportFfmpeg(): boolean;
+export declare function findFiles(apidir?: string, validate?: (filepath: string, stat: Stats) => boolean): string[];

package/cjs/lib/utils.js

@@ -2,7 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.logger = exports.getRetry = exports.request = void 0;
 exports.isSupportFfmpeg = isSupportFfmpeg;
+exports.findFiles = findFiles;
 const fe_utils_1 = require("@lzwme/fe-utils");
+const node_fs_1 = require("node:fs");
+const node_path_1 = require("node:path");
 exports.request = new fe_utils_1.Request('', {
     'content-type': 'application/x-www-form-urlencoded; charset=UTF-8',
 });
@@ -23,3 +26,20 @@ function isSupportFfmpeg() {
         _isSupportFfmpeg = (0, fe_utils_1.execSync)('ffmpeg -version').stderr === '';
     return _isSupportFfmpeg;
 }
+function findFiles(apidir, validate) {
+    const files = [];
+    if (apidir && (0, node_fs_1.existsSync)(apidir)) {
+        const stat = (0, node_fs_1.statSync)(apidir);
+        if (!validate || validate(apidir, stat)) {
+            if (stat.isFile()) {
+                files.push((0, node_path_1.resolve)(apidir));
+            }
+            else if (stat.isDirectory()) {
+                (0, node_fs_1.readdirSync)(apidir).forEach(filename => {
+                    findFiles((0, node_path_1.resolve)(apidir, filename)).forEach(f => files.push(f));
+                });
+            }
+        }
+    }
+    return files;
+}

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

@@ -1,58 +1,6 @@
-import type { VideoListResult, VideoSearchResult, CliOptions } from '../types';
-export interface VSOptions {
-    /** 播放地址缓存 */
-    api?: string[];
-    force?: boolean;
-    /** 远程配置的请求地址 */
-    remoteConfigUrl?: string;
-}
-/**
- * @example
- * ```ts
- * const v = new VideoSearch({ api: ['https://api.xinlangapi.com/xinlangapi.php/provide/vod/'] });
- * v.search('三体')
- *   .then(d => {
- *     console.log(d.total, d.list);
- *     return v.getVideoList(d.list[0].vod_id);
- *   })
- *   .then(d => {
- *     console.log('detail:', d.total, d.list[0]);
- *   });
- * ```
- */
-export declare class VideoSearch {
-    protected options: VSOptions;
-    apiMap: Map<string, {
-        url: string;
-        desc?: string;
-        enable?: 0 | 1 | boolean;
-        remote?: boolean;
-    }>;
-    get api(): {
-        url: string;
-        desc?: string;
-        enable?: 0 | 1 | boolean;
-        remote?: boolean;
-    }[];
-    constructor(options?: VSOptions);
-    updateOptions(options: VSOptions): Promise<this>;
-    search(wd: string, api?: {
-        url: string;
-        desc?: string;
-        enable?: 0 | 1 | boolean;
-        remote?: boolean;
-    }): Promise<VideoSearchResult>;
-    getVideoList(ids: number | string | (number | string)[], api?: {
-        url: string;
-        desc?: string;
-        enable?: 0 | 1 | boolean;
-        remote?: boolean;
-    }): Promise<VideoListResult>;
-    private formatUrl;
-    private loadRemoteConfig;
-    updateApiFromRemote(force?: boolean): Promise<void>;
-}
+import type { CliOptions } from '../types';
 export declare function VideoSerachAndDL(keyword: string, options: {
     url?: string[];
+    apidir?: string;
     remoteConfigUrl?: string;
 }, baseOpts: CliOptions): Promise<void>;

package/cjs/lib/video-search.js

@@ -1,127 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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");
 const m3u8_batch_download_js_1 = require("../m3u8-batch-download.js");
 const enquirer_1 = require("enquirer");
 const console_log_colors_1 = require("console-log-colors");
-const req = new fe_utils_1.Request(null, {
-    'content-type': 'application/json; charset=UTF-8',
-});
-/**
- * @example
- * ```ts
- * const v = new VideoSearch({ api: ['https://api.xinlangapi.com/xinlangapi.php/provide/vod/'] });
- * v.search('三体')
- *   .then(d => {
- *     console.log(d.total, d.list);
- *     return v.getVideoList(d.list[0].vod_id);
- *   })
- *   .then(d => {
- *     console.log('detail:', d.total, d.list[0]);
- *   });
- * ```
- */
-class VideoSearch {
-    options;
-    apiMap = new Map();
-    get api() {
-        return [...this.apiMap.values()].reverse();
-    }
-    constructor(options = {}) {
-        this.options = options;
-        if (!options.api?.length)
-            options.api = [];
-        if (process.env.VAPI)
-            options.api.push(...process.env.VAPI.split('$$$'));
-        this.updateOptions(options);
-    }
-    async updateOptions(options) {
-        const cache = storage_js_1.stor.get();
-        const apis = [...(cache.api || []), ...options.api];
-        this.formatUrl(apis);
-        if (options.api?.length)
-            storage_js_1.stor.set({ api: apis });
-        (cache.api || []).forEach(url => {
-            this.apiMap.set(url, { url, desc: url });
-        });
-        await this.updateApiFromRemote(options.force);
-        if (!this.apiMap.size)
-            throw Error('没有可用的 API 站点，请添加或指定');
-        return this;
-    }
-    async search(wd, api = this.api[0]) {
-        let { data } = await req.get(api.url, { wd }, null, { rejectUnauthorized: false });
-        if (typeof data == 'string')
-            data = JSON.parse(data);
-        return data;
-    }
-    async getVideoList(ids, api = this.api[0]) {
-        let { data } = await req.get(api.url, {
-            ac: 'videolist',
-            ids: Array.isArray(ids) ? ids.join(',') : ids,
-        }, null, { rejectUnauthorized: false });
-        if (typeof data == 'string')
-            data = JSON.parse(data);
-        return data;
-    }
-    formatUrl(url) {
-        const urls = [];
-        if (!url)
-            return urls;
-        if (typeof url === 'string')
-            url = [url];
-        for (let u of url) {
-            u = String(u || '').trim();
-            if (u.startsWith('http')) {
-                if (u.endsWith('provide/'))
-                    u += 'vod/';
-                if (u.endsWith('provide/vod'))
-                    u += '/';
-                urls.push(u.replace('/at/xml/', '/'));
-            }
-        }
-        return [...new Set(urls)];
-    }
-    async loadRemoteConfig(force = false) {
-        const cache = storage_js_1.stor.get();
-        let needUpdate = true;
-        if (!force && cache.remoteConfig?.updateTime) {
-            needUpdate = Date.now() - cache.remoteConfig.updateTime > 1 * 60 * 60 * 1000;
-        }
-        if (needUpdate) {
-            const url = this.options.remoteConfigUrl || 'https://mirror.ghproxy.com/raw.githubusercontent.com/lzwme/m3u8-dl/main/test/remote-config.json';
-            const { data } = await req.get(url, null, { 'content-type': 'application/json' }, { rejectUnauthorized: false });
-            utils_js_1.logger.debug('加载远程配置', data);
-            if (Array.isArray(data.apiSites)) {
-                storage_js_1.stor.set({
-                    remoteConfig: {
-                        updateTime: Date.now(),
-                        data,
-                    },
-                });
-            }
-        }
-        return cache.remoteConfig;
-    }
-    async updateApiFromRemote(force = false) {
-        const remoteConfig = await this.loadRemoteConfig(force);
-        if (Array.isArray(remoteConfig?.data?.apiSites)) {
-            remoteConfig.data.apiSites.forEach(item => {
-                if (item.enable === 0 || item.enable === false)
-                    return;
-                item.url = this.formatUrl(item.url)[0];
-                item.remote = true;
-                this.apiMap.set(item.url, item);
-            });
-        }
-    }
-}
-exports.VideoSearch = VideoSearch;
+const ApiManage_1 = require("./search-api/ApiManage");
 async function VideoSerachAndDL(keyword, options, baseOpts) {
+    utils_js_1.logger.debug(options, baseOpts);
     const cache = storage_js_1.stor.get();
     const doDownload = async (info, urls) => {
         const p = await (0, enquirer_1.prompt)({
@@ -144,7 +31,7 @@ async function VideoSerachAndDL(keyword, options, baseOpts) {
                 storage_js_1.stor.set({ latestSearchDL: null });
         }
         catch (error) {
-            utils_js_1.logger.info('cachel download');
+            utils_js_1.logger.info('cancel download:', error.message);
         }
     };
     if (cache.latestSearchDL?.urls) {
@@ -161,19 +48,12 @@ async function VideoSerachAndDL(keyword, options, baseOpts) {
             storage_js_1.stor.set({ latestSearchDL: null });
         }
     }
-    const vs = new VideoSearch();
-    await vs.updateOptions({ api: options.url || [], force: baseOpts.force, remoteConfigUrl: options.remoteConfigUrl });
-    const apis = vs.api;
-    let apiUrl = options.url?.length ? { url: options.url[0] } : apis[0];
-    if (!options.url && apis.length > 0) {
-        await (0, enquirer_1.prompt)({
-            type: 'select',
-            name: 'k',
-            message: '请选择 API 站点',
-            choices: apis.map(d => ({ name: d.url, message: d.desc })),
-            validate: value => value.length >= 1,
-        }).then(v => (apiUrl = apis.find(d => d.url === v.k)));
+    if (options.apidir && !ApiManage_1.apiManage.current)
+        ApiManage_1.apiManage.load(options.apidir);
+    if (options.url) {
+        options.url.forEach(api => ApiManage_1.apiManage.add({ api, desc: api }));
     }
+    await ApiManage_1.apiManage.select();
     await (0, enquirer_1.prompt)({
         type: 'input',
         name: 'k',
@@ -181,13 +61,13 @@ async function VideoSerachAndDL(keyword, options, baseOpts) {
         validate: value => value.length > 1,
         initial: keyword,
     }).then(v => (keyword = v.k));
-    const sRes = await vs.search(keyword, apiUrl);
+    const sRes = await ApiManage_1.apiManage.search(keyword, ApiManage_1.apiManage.current);
     utils_js_1.logger.debug(sRes);
-    if (!sRes.total) {
+    if (!sRes.length) {
         console.log(console_log_colors_1.color.green(`[${keyword}]`), `没有搜到结果`);
         return VideoSerachAndDL(keyword, options, baseOpts);
     }
-    const choices = sRes.list.map((d, idx) => ({
+    const choices = sRes.map((d, idx) => ({
         name: d.vod_id,
         message: `${idx + 1}. [${d.type_name}] ${d.vod_name}`,
         hint: `${d.vod_remarks}(${d.vod_time})`,
@@ -196,14 +76,14 @@ async function VideoSerachAndDL(keyword, options, baseOpts) {
         type: 'select',
         name: 'vid',
         pointer: '👉',
-        message: `查找到了 ${console_log_colors_1.color.greenBright(sRes.list.length)} 条结果，请选择：`,
+        message: `查找到了 ${console_log_colors_1.color.greenBright(sRes.length)} 条结果，请选择：`,
         choices: choices.concat({ name: -1, message: (0, console_log_colors_1.greenBright)('重新搜索'), hint: '' }),
     });
     if (answer1.vid === -1)
         return VideoSerachAndDL(keyword, options, baseOpts);
-    const vResult = await vs.getVideoList(answer1.vid, apiUrl);
-    if (!vResult.list?.length) {
-        utils_js_1.logger.error('获取视频信息失败!', vResult.msg);
+    const vResult = await ApiManage_1.apiManage.detail(sRes.find(d => d.vod_id == answer1.vid));
+    if (!vResult) {
+        utils_js_1.logger.error('获取视频信息失败!');
         return VideoSerachAndDL(keyword, options, baseOpts);
     }
     else {

package/cjs/types/m3u8.d.ts

@@ -45,6 +45,8 @@ export interface M3u8DLOptions {
     headers?: IncomingHttpHeaders;
     /** 下载时是否启动本地资源播放（边下边看） */
     play?: boolean;
+    /** 下载完毕后，是否合并转换为 mp4 或 ts 文件。默认为 true */
+    convert?: boolean;
 }
 export interface WorkerTaskInfo {
     info: TsItemInfo;

package/cjs/types/m3u8.js

@@ -1,4 +1,11 @@
 "use strict";
+/*
+ * @Author: renxia
+ * @Date: 2024-08-02 09:58:56
+ * @LastEditors: renxia
+ * @LastEditTime: 2024-08-02 17:15:07
+ * @Description:
+ */
 /* eslint-disable @typescript-eslint/triple-slash-reference */
 /// <reference path="../../global.d.ts"/>
 Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -1,122 +1,132 @@
-/** 模糊搜索返回的结果(?wd=<wd>) */
-export interface VideoSearchResult {
-    code: number;
-    msg: string;
-    page: number;
-    pagecount: number;
-    limit: string;
+import { AnyObject } from '@lzwme/fe-utils';
+export interface SearchApiResult<T> {
+    /** api 来源 */
+    api_key?: number | string;
+    code?: number;
+    msg?: string;
+    page?: number;
+    pagecount?: number;
+    limit?: string;
     total: number;
-    list: VodList[];
-    class: {
+    list: T;
+}
+/** 模糊搜索返回的结果(?wd=<wd>) */
+export interface VideoSearchResult extends SearchApiResult<VodList[]> {
+    class?: {
         type_id: number;
         type_pid: number;
         type_name: string;
     }[];
 }
-interface VodList {
-    vod_id: number;
-    vod_name: string;
-    type_id: number;
-    type_name: string;
-    vod_en: string;
-    vod_time: string;
-    vod_remarks: string;
-    vod_play_from: string;
-    vod_play_url: string;
-}
+type VodList = Pick<VideoDetails, 'api_key' | 'vod_id' | 'vod_name' | 'vod_en' | 'vod_time' | 'vod_remarks' | 'vod_play_from' | 'vod_play_url' | 'type_name' | 'type_id'>;
 /** 按 id 搜素返回的详情列表 */
-export interface VideoListResult {
-    code: number;
-    msg: string;
-    page: number;
-    pagecount: number;
-    limit: string;
-    total: number;
-    list: VideoDetails[];
-}
+export type VideoDetailsResult = SearchApiResult<VideoDetails[]>;
 export interface VideoDetails {
+    /** api 来源 */
+    api_key: number | string;
+    /** 视频 id，可用于查询详情 */
     vod_id: number;
-    type_id: number;
-    type_id_1: number;
-    group_id: number;
+    /** 视频名称 */
     vod_name: string;
-    vod_sub: string;
-    vod_en: string;
-    vod_status: number;
-    vod_letter: string;
-    vod_color: string;
-    vod_tag: string;
-    vod_class: string;
-    vod_pic: string;
-    vod_pic_thumb: string;
-    vod_pic_slide: string;
-    vod_pic_screenshot: null;
-    vod_actor: string;
-    vod_director: string;
-    vod_writer: string;
-    vod_behind: string;
-    vod_blurb: string;
-    vod_remarks: string;
-    vod_pubdate: string;
-    vod_total: number;
-    vod_serial: string;
-    vod_tv: string;
-    vod_weekday: string;
-    vod_area: string;
-    vod_lang: string;
-    vod_year: string;
-    vod_version: string;
-    vod_state: string;
-    vod_author: string;
-    vod_jumpurl: string;
-    vod_tpl: string;
-    vod_tpl_play: string;
-    vod_tpl_down: string;
-    vod_isend: number;
-    vod_lock: number;
-    vod_level: number;
-    vod_copyright: number;
-    vod_points: number;
-    vod_points_play: number;
-    vod_points_down: number;
-    vod_hits: number;
-    vod_hits_day: number;
-    vod_hits_week: number;
-    vod_hits_month: number;
-    vod_duration: string;
-    vod_up: number;
-    vod_down: number;
-    vod_score: string;
-    vod_score_all: number;
-    vod_score_num: number;
-    vod_time: string;
-    vod_time_add: number;
-    vod_time_hits: number;
-    vod_time_make: number;
-    vod_trysee: number;
-    vod_douban_id: number;
-    vod_douban_score: string;
-    vod_reurl: string;
-    vod_rel_vod: string;
-    vod_rel_art: string;
-    vod_pwd: string;
-    vod_pwd_url: string;
-    vod_pwd_play: string;
-    vod_pwd_play_url: string;
-    vod_pwd_down: string;
-    vod_pwd_down_url: string;
-    vod_content: string;
-    vod_play_from: string;
-    vod_play_server: string;
-    vod_play_note: string;
+    /** 播放地址 */
     vod_play_url: string;
-    vod_down_from: string;
-    vod_down_server: string;
-    vod_down_note: string;
-    vod_down_url: string;
-    vod_plot: number;
-    vod_plot_name: string;
-    vod_plot_detail: string;
-    type_name: string;
+    /** 分类 id */
+    type_id?: number;
+    /** 分类名称 */
+    type_name?: string;
+    vod_en?: string;
+    vod_time?: string;
+    vod_remarks?: string;
+    vod_play_from?: string;
+    type_id_1?: number;
+    group_id?: number;
+    vod_sub?: string;
+    vod_status?: number;
+    vod_letter?: string;
+    vod_color?: string;
+    vod_tag?: string;
+    vod_class?: string;
+    vod_pic?: string;
+    vod_pic_thumb?: string;
+    vod_pic_slide?: string;
+    vod_pic_screenshot: null;
+    vod_actor?: string;
+    vod_director?: string;
+    vod_writer?: string;
+    vod_behind?: string;
+    vod_blurb?: string;
+    vod_pubdate?: string;
+    vod_total?: number;
+    vod_serial?: string;
+    vod_tv?: string;
+    vod_weekday?: string;
+    vod_area?: string;
+    vod_lang?: string;
+    vod_year?: string;
+    vod_version?: string;
+    vod_state?: string;
+    vod_author?: string;
+    vod_jumpurl?: string;
+    vod_tpl?: string;
+    vod_tpl_play?: string;
+    vod_tpl_down?: string;
+    vod_isend?: number;
+    vod_lock?: number;
+    vod_level?: number;
+    vod_copyright?: number;
+    vod_points?: number;
+    vod_points_play?: number;
+    vod_points_down?: number;
+    vod_hits?: number;
+    vod_hits_day?: number;
+    vod_hits_week?: number;
+    vod_hits_month?: number;
+    vod_duration?: string;
+    vod_up?: number;
+    vod_down?: number;
+    /** 评分 */
+    vod_score?: string;
+    vod_score_all?: number;
+    vod_score_num?: number;
+    vod_time_add?: number;
+    vod_time_hits?: number;
+    vod_time_make?: number;
+    vod_trysee?: number;
+    /** 在豆瓣的 id */
+    vod_douban_id?: number;
+    /** 豆瓣评分 */
+    vod_douban_score?: string;
+    vod_reurl?: string;
+    vod_rel_vod?: string;
+    vod_rel_art?: string;
+    vod_pwd?: string;
+    vod_pwd_url?: string;
+    vod_pwd_play?: string;
+    vod_pwd_play_url?: string;
+    vod_pwd_down?: string;
+    vod_pwd_down_url?: string;
+    vod_content?: string;
+    vod_play_server?: string;
+    vod_play_note?: string;
+    vod_down_from?: string;
+    vod_down_server?: string;
+    vod_down_note?: string;
+    vod_down_url?: string;
+    vod_plot?: number;
+    vod_plot_name?: string;
+    vod_plot_detail?: string;
+}
+/** 搜索Api的格式 */
+export interface SearchApi extends AnyObject {
+    /** API 唯一标记 */
+    key: string | number;
+    /** API 描述 */
+    desc?: string;
+    /** 是否启用 */
+    enable?: boolean;
+    /** 按关键字搜索列表 */
+    search(wd: string, ...args: unknown[]): Promise<VideoSearchResult>;
+    /** 按 id 获取某个视频的详情 */
+    detail(id: string | number, ...args: unknown[]): Promise<VideoDetailsResult>;
 }
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lzwme/m3u8-dl",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "Batch download of m3u8 files and convert to mp4",
   "main": "cjs/index.js",
   "types": "cjs/index.d.ts",
@@ -43,26 +43,26 @@
     "registry": "https://registry.npmjs.com"
   },
   "devDependencies": {
-    "@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.2.1",
-    "husky": "^9.1.4",
-    "prettier": "^3.3.3",
+    "@eslint/js": "^9.26.0",
+    "@lzwme/fed-lint-helper": "^2.6.6",
+    "@types/node": "^22.15.12",
+    "@typescript-eslint/eslint-plugin": "^8.32.0",
+    "@typescript-eslint/parser": "^8.32.0",
+    "eslint": "^9.26.0",
+    "eslint-config-prettier": "^10.1.2",
+    "eslint-plugin-prettier": "^5.4.0",
+    "husky": "^9.1.7",
+    "prettier": "^3.5.3",
     "standard-version": "^9.5.0",
-    "typescript": "^5.5.4",
-    "typescript-eslint": "^7.18.0"
+    "typescript": "^5.8.3",
+    "typescript-eslint": "^8.32.0"
   },
   "dependencies": {
-    "@lzwme/fe-utils": "^1.7.5",
-    "commander": "^12.1.0",
+    "@lzwme/fe-utils": "^1.8.3",
+    "commander": "^13.1.0",
     "console-log-colors": "^0.5.0",
     "enquirer": "^2.4.1",
-    "m3u8-parser": "^7.1.0"
+    "m3u8-parser": "^7.2.0"
   },
   "files": [
     "cjs",