improve header reading

package.json

@@ -1,6 +1,6 @@
 {
     "name": "minyami",
-    "version": "4.2.8",
+    "version": "4.2.9",
     "description": "",
     "main": "dist/exports.js",
     "types": "dist/exports.d.ts",

readme.md

@@ -42,7 +42,7 @@ Help:
          --cookies <cookies>       Cookies to download
              <cookies>
          --headers <headers>       HTTP Headers used to download
-             <headers>             Multiple headers should be splited with \n. eg. --headers "Cookie: a=1\nUser-Agent: X-UA". Don't forget to escape. This option will override --cookies.
+             <headers>             Custom headers. eg. --headers "User-Agent: xxxxx". This option will override --cookies.
          --live                    Download live
          --format <format_name>    (Optional) Set output format. default: ts
              <format_name>         Format name. ts or mkv.
@@ -76,6 +76,10 @@ Q: How to set temporary file location.
 
 A: You can use environment variables to set the directory of temporary files. See [Issue #80](https://github.com/Last-Order/Minyami/issues/80#issuecomment-869132412).
 
+Q: How to set multiple HTTP headers.
+
+A: By providing multiple --headers option. For example, `minyami -d xxxx --headers "Cookie: xxxx" --headers "User-Agent: yyy"`.
+
 ## Use as a library (3.1.0+)
 
 ```TypeScript
@@ -91,7 +95,7 @@ The `'chunk-downloaded'` event is emitted when every media chunk is downloaded.
 
 ### Event: `chunk-error`
 
--    `error: Error` 
+-   `error: Error`
 
 The `'chunk-error'` event is emitted when failed to download or decrypt media chunks.
 
@@ -105,13 +109,13 @@ The `'finished'` event is emitted after all the works are done. CLI program exit
 
 ### Event: `merge-error`
 
-- `error: Error` 
+-   `error: Error`
 
 The `merge-error` event is emitted when a merge progress is failed.
 
 ### Event: `critical-error`
 
-- `error: Error` 
+-   `error: Error`
 
 The `critical-error` is emitted when a error that Minyami can't handle happens.
 

readme.zh-cn.md

@@ -37,7 +37,7 @@ Help:
          --cookies <cookies>       (可选) 视频下载 Cookies
              <cookies>
          --headers <headers>       手动设定 HTTP Headers
-             <headers>             多个 Header 使用 "\n" 分隔，例如："Cookie: a=1\nUser-Agent: X-UA"
+             <headers>             自定义 HTTP Header，例如："User-Agent: X-UA"
          --live                    直播下载模式
          --format <format_name>    (可选) 输出格式，默认为 ts
              <format_name>         格式名称，ts 或 mkv
@@ -68,4 +68,8 @@ A: 可以使用`--proxy`参数设置代理，详见上方用法。目前支持`H
 
 Q: 如何设置临时文件目录？
 
-A: 通过环境变量可以设置临时文件目录。详见 [Issue #80](https://github.com/Last-Order/Minyami/issues/80#issuecomment-869132412)。
+A: 通过环境变量可以设置临时文件目录。详见 [Issue #80](https://github.com/Last-Order/Minyami/issues/80#issuecomment-869132412)。
+
+Q: 如何设置多个 HTTP Header？
+
+A: 通过设置多个`--headers`，例如`minyami -d xxxx --headers "Cookie: xxxx" --headers "User-Agent: yyy"`。

src/core/downloader.ts

@@ -19,7 +19,7 @@ export interface DownloaderConfig {
     key?: string;
     verbose?: boolean;
     cookies?: string;
-    headers?: string;
+    headers?: string | string[];
     retries?: number;
     proxy?: string;
     format?: string;
@@ -163,12 +163,15 @@ class Downloader extends EventEmitter {
         }
 
         if (headers) {
-            for (const h of headers.split("\\n")) {
-                try {
-                    const header = /^([^ :]+):(.+)$/.exec(h).slice(1);
-                    this.headers[header[0]] = header[1].trim();
-                } catch (e) {
-                    logger.warning(`HTTP Headers invalid. Ignored.`);
+            const headerConfigArr = Array.isArray(headers) ? headers : [headers];
+            for (const headerConfig of headerConfigArr) {
+                for (const h of headerConfig.split("\\n")) {
+                    try {
+                        const header = /^([^ :]+):(.+)$/.exec(h).slice(1);
+                        this.headers[header[0]] = header[1].trim();
+                    } catch (e) {
+                        logger.warning(`HTTP Headers invalid. Ignored.`);
+                    }
                 }
             }
             // Apply global custom headers

src/index.ts

@@ -213,8 +213,7 @@ Erii.addOption({
     description: "HTTP Headers used to download",
     argument: {
         name: "headers",
-        description:
-            'Multiple headers should be splited with \\n. eg. --headers "Cookie: a=1\\nUser-Agent: X-UA". Don\'t forget to escape. This option will override --cookies.',
+        description: 'Custom headers. eg. --headers "User-Agent: xxxxx". This option will override --cookies.',
     },
 });