add proxy support and change axios to got

README.md

@@ -73,6 +73,9 @@ for example `docker run --name rssbot -d -e RSSBOT_TOKEN=123456:abcdef123456-U f
 | notify_error_count | NOTIFY_ERR_COUNT | 5                                                              | error count when it will notfiy                                              |
 | view_all           | RSSBOT_VIEW_ALL  | false                                                          | enable or not                                                                |
 | UA                 | RSSBOT_UA        | 'Mozilla/5.0 NodeRSSBot(https://github.com/fengkx/NodeRSSBot)' | user-agent of requrest                                                       |
+| proxy.protocol     | PROXY_PROTOCOL   | null                                                           | proxy protocol http/https/socks                                              |
+| proxy.host         | PROXY_HOST       | null                                                           | proxy host                                                                   |
+| proxy.port         | PROXY_PORT       | null                                                           | proxy port                                                                   |
 
 language can be setting in `zh-cn` or `en`
 
@@ -154,7 +157,7 @@ viewall 只能在私聊中使用
 # TODO
 
 -   [x] export 命令
--   代理
+-   [x] 代理
 -   unit test
 
 # 配置项
@@ -171,6 +174,9 @@ viewall 只能在私聊中使用
 | notify_error_count | NOTIFY_ERR_COUNT | 5                                                              | 发出通知的错误次数                                                           |
 | view_all           | RSSBOT_VIEW_ALL  | false                                                          | 是否开启                                                                     |
 | UA                 | RSSBOT_UA        | 'Mozilla/5.0 NodeRSSBot(https://github.com/fengkx/NodeRSSBot)' | 请求的 user-agent                                                            |
+| proxy.protocool    | PROXY_PROTOCOL   | null                                                           | 代理协议 http/https/socks                                                    |
+| proxy.host         | PROXY_HOST       | null                                                           | 代理地址                                                                     |
+| proxy.port         | PROXY_PORT       | null                                                           | 代理端口                                                                     |
 
 语言可以设置为 `zh-cn` or `en`
 时间间隔可设置为每多少分钟或多少小时。m 表示分钟， h 表示小时

config/index.js

@@ -2,7 +2,11 @@ const path = require('path');
 
 module.exports = {
     token: process.env.RSSBOT_TOKEN || '',
-    socks_proxy: process.env.socks_proxy || undefined,
+    proxy: {
+        protocol: process.env.PROXY_PROTOCOL || null,
+        host: process.env.PROXY_HOST || null,
+        port: process.env.PROXY_PORT || null
+    },
     db_path:
         process.env.RSSBOT_DB_PATH ||
         path.join(__dirname, '../data/database.db'),

index.js

@@ -35,7 +35,7 @@ const {
 const bot = new Telegraf(token, {
     telegram: {
         // Telegram options
-        // agent: agent,        // https.Agent instance, allows custom proxy, certificate, keep alive, etc.
+        agent: require('./utils/agent') // https.Agent instance, allows custom proxy, certificate, keep alive, etc.
     }
 });
 

middlewares/importFromOpml.js

@@ -1,4 +1,4 @@
-const axios = require('axios');
+const got = require('got');
 const Parser = require('xml2js').Parser;
 const logger = require('../utils/logger');
 const RSS = require('../proxies/rssFeed');
@@ -28,8 +28,8 @@ module.exports = async (ctx, next) => {
     const { fileLink } = ctx.state;
 
     try {
-        const res = await axios.get(fileLink);
-        const opmlStr = res.data;
+        const res = await got.get(fileLink);
+        const opmlStr = res.body;
         const outlines = await getOutlines(opmlStr);
         ctx.state.outlines = outlines;
         await Promise.all(

middlewares/subMultiUrl.js

@@ -1,4 +1,4 @@
-const axios = require('../utils/axios');
+const got = require('../utils/got');
 const Parser = require('rss-parser');
 const RSS = require('../proxies/rssFeed');
 const i18n = require('../i18n');
@@ -14,8 +14,8 @@ module.exports = async (ctx, next) => {
             } else {
                 try {
                     const parser = new Parser();
-                    const res = await axios.get(encodeURI(url));
-                    const rssFeed = await parser.parseString(res.data);
+                    const res = await got.get(encodeURI(url));
+                    const rssFeed = await parser.parseString(res.body);
                     return {
                         feed_title: rssFeed.title,
                         url

middlewares/testUrl.js

@@ -1,4 +1,4 @@
-const axios = require('../utils/axios');
+const got = require('../utils/got');
 const Parser = require('rss-parser');
 const RSS = require('../proxies/rssFeed');
 
@@ -11,17 +11,17 @@ module.exports = async (ctx, next) => {
         await next();
     } else {
         try {
-            const res = await axios.get(url);
+            const res = await got.get(url);
             const parser = new Parser();
-            let feed = await parser.parseString(res.data);
+            let feed = await parser.parseString(res.body);
             delete feed.items;
             ctx.state.feed = feed;
         } catch (e) {
-            if (e.respone) {
-                switch (e.respone.status) {
+            if (e.response) {
+                switch (e.response.status) {
                     case 404:
                     case 403:
-                        throw new Error(e.respone.status);
+                        throw new Error(e.response.status);
                     default:
                         throw new Error('FETCH_ERROR');
                 }