@lzwme/m3u8-dl 1.6.0-0 → 1.7.0

package/cjs/lib/format-options.js

@@ -7,22 +7,45 @@ const fe_utils_1 = require("@lzwme/fe-utils");
 const video_parser_1 = require("../video-parser");
 const utils_1 = require("./utils");
 const fileSupportExtList = [
+    // video
     '.mp4',
     '.mkv',
     '.avi',
     '.mov',
     '.wmv',
     '.ts',
-    '.exe',
-    '.zip',
-    '.rar',
-    '.pdf',
+    // audio
+    '.mp3',
+    '.wav',
+    '.ogg',
+    '.m4a',
+    '.aac',
+    '.flac',
+    '.ape',
+    // document
     '.doc',
     '.docx',
     '.xls',
     '.xlsx',
     '.ppt',
     '.pptx',
+    '.pdf',
+    '.mobi',
+    '.epub',
+    // others
+    '.exe',
+    '.msi',
+    '.zip',
+    '.rar',
+    '.7z',
+    '.tar.gz',
+    '.tar.bz2',
+    '.tar.xz',
+    '.iso',
+    '.dmg',
+    '.pkg',
+    '.deb',
+    '.rpm',
 ];
 function formatOptions(url, opts) {
     const options = {

package/cjs/lib/i18n.d.ts

@@ -2,7 +2,7 @@
  * Shared i18n utility for backend (CLI, SDK, Server)
  */
 import type { AnyObject } from '@lzwme/fe-utils';
-type Locale = 'zh' | 'en';
+type Locale = 'zh-CN' | 'en';
 export declare const LANG_CODES: Set<string>;
 /**
  * Detect language from OS or environment

package/cjs/lib/i18n.js

@@ -9,7 +9,7 @@ exports.setLanguage = setLanguage;
 exports.getLanguage = getLanguage;
 exports.getLang = getLang;
 exports.t = t;
-exports.LANG_CODES = new Set(['zh', 'en']);
+exports.LANG_CODES = new Set(['zh-CN', 'en']);
 let globalLang = null;
 /**
  * Detect language from OS or environment
@@ -18,17 +18,27 @@ function detectLanguage() {
     // Check environment variable first
     const envLang = process.env.M3U8DL_LANG || process.env.LANG;
     if (envLang) {
-        const langCode = envLang.toLowerCase().split('-')[0].split('_')[0];
-        if (exports.LANG_CODES.has(langCode)) {
-            return langCode;
+        const langCode = envLang.toLowerCase();
+        // 支持 zh-CN, zh-TW, zh 等变体映射到 zh-CN
+        if (langCode.startsWith('zh')) {
+            return 'zh-CN';
+        }
+        const baseLangCode = langCode.split('-')[0].split('_')[0];
+        if (exports.LANG_CODES.has(baseLangCode)) {
+            return baseLangCode;
         }
     }
     // Try to detect from OS locale
     try {
         const osLocale = Intl.DateTimeFormat().resolvedOptions().locale;
-        const langCode = osLocale.toLowerCase().split('-')[0];
-        if (exports.LANG_CODES.has(langCode)) {
-            return langCode;
+        const langCode = osLocale.toLowerCase();
+        // 支持 zh-CN, zh-TW 等变体映射到 zh-CN
+        if (langCode.startsWith('zh')) {
+            return 'zh-CN';
+        }
+        const baseLangCode = langCode.split('-')[0];
+        if (exports.LANG_CODES.has(baseLangCode)) {
+            return baseLangCode;
         }
     }
     catch {
@@ -53,8 +63,15 @@ function getLanguage() {
  * Get language from various sources
  */
 function getLang(lang) {
-    if (lang && exports.LANG_CODES.has(lang)) {
-        return lang;
+    if (lang) {
+        const normalizedLang = lang.toLowerCase();
+        // 支持向后兼容：将 zh 映射到 zh-CN
+        if (normalizedLang === 'zh' || normalizedLang.startsWith('zh')) {
+            return 'zh-CN';
+        }
+        if (exports.LANG_CODES.has(normalizedLang)) {
+            return normalizedLang;
+        }
     }
     if (globalLang) {
         return globalLang;
@@ -66,7 +83,9 @@ function getLang(lang) {
  */
 function t(key, lang, params) {
     const targetLang = getLang(lang);
-    const translations = require(`../i18n/locales/${targetLang}.js`);
+    // 将 zh-CN 映射到文件名 zh-CN.ts
+    const langFile = targetLang === 'zh-CN' ? 'zh-CN' : targetLang;
+    const translations = require(`../i18n/locales/${langFile}.js`);
     // Navigate through nested keys (e.g., 'cli.command.download.description')
     const keys = key.split('.');
     let value = translations.default || translations;

package/cjs/lib/local-play.js

@@ -19,7 +19,7 @@ async function localPlay(m3u8Info) {
     const cacheFilepath = toLocalM3u8(m3u8Info);
     const filename = (0, node_path_1.basename)(cacheFilepath);
     const info = await createLocalServer((0, node_path_1.dirname)(cacheDir));
-    const playUrl = `https://lzw.me/x/m3u8-player?url=${encodeURIComponent(`${info.origin}/${cacheDirname}/${filename}`)}`;
+    const playUrl = `https://m3u8-player.lzw.me?from=sdk&url=${encodeURIComponent(`${info.origin}/${cacheDirname}/${filename}`)}`;
     const cmd = `${process.platform === 'win32' ? 'start' : 'open'} ${playUrl}`;
     (0, fe_utils_1.execSync)(cmd);
     return info;

package/cjs/lib/m3u8-download.js

@@ -9,8 +9,8 @@ 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 i18n_js_1 = require("./i18n.js");
 const format_options_js_1 = require("./format-options.js");
+const i18n_js_1 = require("./i18n.js");
 const local_play_js_1 = require("./local-play.js");
 const m3u8_convert_js_1 = require("./m3u8-convert.js");
 const parseM3u8_js_1 = require("./parseM3u8.js");

package/cjs/lib/utils.d.ts

@@ -18,3 +18,5 @@ export declare function getLocation(url: string, method?: string): Promise<strin
  * 如果 headers 是字符串，会先将其解析为对象；如果 headers 为空，则返回空对象。
  */
 export declare function formatHeaders(headers: string | OutgoingHttpHeaders): Record<string, string>;
+/** 异步检查文件是否存在 */
+export declare function checkFileExists(filepath: string): Promise<boolean>;

package/cjs/lib/utils.js

@@ -5,7 +5,9 @@ exports.isSupportFfmpeg = isSupportFfmpeg;
 exports.findFiles = findFiles;
 exports.getLocation = getLocation;
 exports.formatHeaders = formatHeaders;
+exports.checkFileExists = checkFileExists;
 const node_fs_1 = require("node:fs");
+const promises_1 = require("node:fs/promises");
 const node_path_1 = require("node:path");
 const fe_utils_1 = require("@lzwme/fe-utils");
 exports.request = new fe_utils_1.Request({
@@ -65,3 +67,15 @@ function formatHeaders(headers) {
         headers = Object.fromEntries(headers.split('\n').map(line => line.split(':').map(d => d.trim())));
     return (0, fe_utils_1.toLowcaseKeyObject)(headers);
 }
+/** 异步检查文件是否存在 */
+async function checkFileExists(filepath) {
+    try {
+        if (!filepath)
+            return false;
+        await (0, promises_1.access)(filepath, promises_1.constants.F_OK);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}

package/cjs/server/download-server.d.ts

@@ -1,5 +1,5 @@
 import type { Express } from 'express';
-import type { Server } from 'ws';
+import type { WebSocketServer } from 'ws';
 import type { M3u8DLOptions, M3u8DLProgressStats, M3u8WorkerPool, TsItemInfo } from '../types/m3u8.js';
 interface DLServerOptions {
     port?: number;
@@ -18,12 +18,18 @@ interface CacheItem extends Partial<M3u8DLProgressStats> {
     /** 格式化后实际下载使用的参数 */
     dlOptions?: M3u8DLOptions;
     status: 'pause' | 'resume' | 'done' | 'pending' | 'error';
+    /**
+     * 当前任务的 ts 信息
+     * @deprecated 下一版本将移除
+     */
     current?: TsItemInfo;
+    /** 当前任务的 ts 缓存目录 */
+    cacheDir?: string;
     workPoll?: M3u8WorkerPool;
 }
 export declare class DLServer {
     app: Express;
-    wss: Server;
+    wss: WebSocketServer | null;
     /** DS 参数 */
     options: DLServerOptions;
     private serverInfo;
@@ -38,11 +44,12 @@ export declare class DLServer {
     private checkDLFileLaest;
     private checkDLFileTimer;
     private checkDLFileIsExists;
+    private checkItemStatus;
     dlCacheClone(): [string, CacheItem][];
     private cacheSaveTimer;
     saveCache(): void;
-    private readConfig;
-    saveConfig(config: M3u8DLOptions, configPath?: string): void;
+    private loadConfig;
+    saveConfig(config: M3u8DLOptions, configPath?: string): Promise<void>;
     private createApp;
     private startDownload;
     startNextPending(): void;