defaults to use socks5h

Last-Order · Apr 29, 2019 · 6bdfa73 · 6bdfa73
1 parent 0c94e3c
commit 6bdfa73
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "minyami",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "description": "",
   "main": "index.js",
   "scripts": {

diff --git a/src/core/parsers/nico.ts b/src/core/parsers/nico.ts
@@ -87,7 +87,7 @@ export default class Parser {
                                 'Cookie': downloader.cookies,
                                 'User-Agent': UA.CHROME_DEFAULT_UA
                             },
-                            httpsAgent: downloader.proxy ? new SocksProxyAgent(`socks5://${downloader.proxyHost}:${downloader.proxyPort}`) : undefined,
+                            httpsAgent: downloader.proxy ? new SocksProxyAgent(`socks5h://${downloader.proxyHost}:${downloader.proxyPort}`) : undefined,
                         })
                         const token = response.data.data.streamServer.url.match(/ht2_nicolive=(.+)/)[1];
                         const host = response.data.data.streamServer.url.match(/(http(s):\/\/.+\/)/)[1];
@@ -112,7 +112,7 @@ export default class Parser {
                     socketUrl = `wss://a.live2.nicovideo.jp/unama/wsapi/v1/watch/${liveId}/timeshift?audience_token=${downloader.key}`;
                 }
                 if (downloader.proxy) {
-                    const agent = new SocksProxyAgent(`socks5://${downloader.proxyHost}:${downloader.proxyPort}`);
+                    const agent = new SocksProxyAgent(`socks5h://${downloader.proxyHost}:${downloader.proxyPort}`);
                     socket = new ReconnectingWebSocket(socketUrl, {
                         agent
                     }, {

diff --git a/src/core/parsers/nicolive.ts b/src/core/parsers/nicolive.ts
@@ -26,7 +26,7 @@ export default class Parser {
                     socketUrl = `wss://a.live2.nicovideo.jp/unama/wsapi/v1/watch/${liveId}/timeshift?audience_token=${downloader.key}`;
                 }
                 if (downloader.proxy) {
-                    const agent = new SocksProxyAgent(`socks5://${downloader.proxyHost}:${downloader.proxyPort}`);
+                    const agent = new SocksProxyAgent(`socks5h://${downloader.proxyHost}:${downloader.proxyPort}`);
                     socket = new ReconnectingWebSocket(socketUrl, {
                         agent
                     }, {

diff --git a/src/utils/m3u8.ts b/src/utils/m3u8.ts
@@ -15,7 +15,7 @@ export async function loadM3U8(Log:Logger, path: string, retries: number = 1, ti
             try {
                 const response = await axios.get(path, {
                     timeout,
-                    httpsAgent: proxy ? new SocksProxyAgent(`socks5://${proxy.host}:${proxy.port}`) : undefined,
+                    httpsAgent: proxy ? new SocksProxyAgent(`socks5h://${proxy.host}:${proxy.port}`) : undefined,
                     headers: {
                         'User-Agent': UA.CHROME_DEFAULT_UA,
                         'Host': new URL(path).host

diff --git a/src/utils/media.ts b/src/utils/media.ts
@@ -78,7 +78,7 @@ export function download(url: string, path: string, proxy: AxiosProxyConfig = un
                 url,
                 method: 'GET',
                 responseType: 'arraybuffer',
-                httpsAgent: proxy ? new SocksProxyAgent(`socks5://${proxy.host}:${proxy.port}`) : undefined,
+                httpsAgent: proxy ? new SocksProxyAgent(`socks5h://${proxy.host}:${proxy.port}`) : undefined,
                 headers: {
                     'User-Agent': UA.CHROME_DEFAULT_UA,
                     'Host': new URL(url).host
@@ -115,7 +115,7 @@ export async function requestRaw(url: string, proxy: AxiosProxyConfig = undefine
         method: 'GET',
         responseType: 'stream',
         timeout: 60000,
-        httpsAgent: proxy ? new SocksProxyAgent(`socks5://${proxy.host}:${proxy.port}`) : undefined,
+        httpsAgent: proxy ? new SocksProxyAgent(`socks5h://${proxy.host}:${proxy.port}`) : undefined,
         headers: {
             'User-Agent': UA.CHROME_DEFAULT_UA,
             'Host': new URL(url).host