try to fix ssr base64

Bumps [github.com/cloudflare/cloudflare-go](https://github.com/cloudflare/cloudflare-go) from 0.13.1 to 0.13.2.
- [Release notes](https://github.com/cloudflare/cloudflare-go/releases)
- [Commits](https://github.com/cloudflare/cloudflare-go/compare/v0.13.1...v0.13.2)

Signed-off-by: dependabot[bot] <support@github.com>

.github/FUNDING.yml

@@ -9,4 +9,4 @@ community_bridge: # Replace with a single Community Bridge project-name e.g., cl
 liberapay: # Replace with a single Liberapay username
 issuehunt: # Replace with a single IssueHunt username
 otechie: # Replace with a single Otechie username
-custom: ['https://blog.lgf.im/donate/']# Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/workflows/docker.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v2.3.1
+        uses: actions/checkout@v2.3.2
 
       - name: Build and push Docker images
         uses: docker/build-push-action@v1.1.0

.github/workflows/go.yml

@@ -12,7 +12,7 @@ jobs:
           go-version: 1.14.x
 
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v2.3.1
+        uses: actions/checkout@v2.3.2
 
       - name: Cache go module
         uses: actions/cache@v2
@@ -26,6 +26,12 @@ jobs:
         run: |
           go test ./...
 
+      - name: gen go-bindata
+        if: startsWith(github.ref, 'refs/tags/')
+        run: |
+          go get -u github.com/go-bindata/go-bindata/...
+          go-bindata -o internal/bindata/geoip/geoip.go -pkg bingeoip  assets/GeoLite2-City.mmdb assets/flags.json
+
       - name: Build
         if: startsWith(github.ref, 'refs/tags/')
         env:

.gitignore

@@ -21,4 +21,4 @@ vendor
 # macOS file
 .DS_Store
 
-*.exe
+assets/html/

Dockerfile

@@ -9,9 +9,8 @@ RUN go mod download && \
 
 FROM alpine:latest
 
-RUN apk add --no-cache ca-certificates
+RUN apk add --no-cache ca-certificates tzdata
 WORKDIR /proxypool-src
 COPY ./assets /proxypool-src/assets
-COPY ./source.yaml /proxypool-src
 COPY --from=builder /proxypool /proxypool-src/
 ENTRYPOINT ["/proxypool-src/proxypool"]

Makefile

@@ -20,11 +20,8 @@ PLATFORM_LIST = \
 	freebsd-386 \
 	freebsd-amd64
 
-WINDOWS_ARCH_LIST = \
-	windows-386 \
-	windows-amd64
 
-all: linux-amd64 darwin-amd64 windows-amd64 # Most used
+all: linux-amd64 darwin-amd64
 
 docker:
 	$(GOBUILD) -o $(BINDIR)/$(NAME)-$@
@@ -74,24 +71,14 @@ freebsd-386:
 freebsd-amd64:
 	GOARCH=amd64 GOOS=freebsd $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
 
-windows-386:
-	GOARCH=386 GOOS=windows $(GOBUILD) -o $(BINDIR)/$(NAME)-$@.exe
-
-windows-amd64:
-	GOARCH=amd64 GOOS=windows $(GOBUILD) -o $(BINDIR)/$(NAME)-$@.exe
-
 gz_releases=$(addsuffix .gz, $(PLATFORM_LIST))
-zip_releases=$(addsuffix .zip, $(WINDOWS_ARCH_LIST))
 
 $(gz_releases): %.gz : %
 	chmod +x $(BINDIR)/$(NAME)-$(basename $@)
 	gzip -f -S -$(VERSION).gz $(BINDIR)/$(NAME)-$(basename $@)
 
-$(zip_releases): %.zip : %
-	zip -m -j $(BINDIR)/$(NAME)-$(basename $@)-$(VERSION).zip $(BINDIR)/$(NAME)-$(basename $@).exe
+all-arch: $(PLATFORM_LIST)
 
-all-arch: $(PLATFORM_LIST) $(WINDOWS_ARCH_LIST)
-
-releases: $(gz_releases) $(zip_releases)
+releases: $(gz_releases)
 clean:
 	rm $(BINDIR)/*

README.md

@@ -2,7 +2,7 @@
   <br>proxypool<br>
 </h1>
 
-<h5 align="center">自动抓取tg频道、订阅地址、公开互联网上的ss、ssr、vmess节点信息，聚合去重测试可用性后提供节点列表</h5>
+<h5 align="center">自动抓取tg频道、订阅地址、公开互联网上的ss、ssr、vmess、trojan节点信息，聚合去重测试可用性后提供节点列表</h5>
 
 <p align="center">
   <a href="https://github.com/zu1k/proxypool/actions">
@@ -16,22 +16,31 @@
   </a>
 </p>
 
-![Star](https://img.shields.io/github/stars/zu1k/proxypool.svg?style=social&label=Star) 来都来了，不点个Star再走？ 
-
 ## 支持
 
-- 支持ss、ssr、vmess节点链接与订阅
-- 任意 Telegram 频道抓取
-- 机场订阅地址抓取解析
+- 支持ss、ssr、vmess、trojan多种类型
+- Telegram频道抓取
+- 订阅地址抓取解析
 - 公开互联网页面模糊抓取
-- 翻墙党论坛新节点信息
-- 其他节点分享网站
-- 定时抓取更新
-- 使用配置文件提供抓取源
+- 定时抓取自动更新
+- 通过配置文件设置抓取源
 - 自动检测节点可用性
 
 ## 安装
 
+### 使用Heroku
+
+点击按钮进入部署页面，填写基本信息然后运行
+
+其中 `DOMAIN` 需要填写为你需要绑定的域名，`CONFIG_FILE` 需要填写你的配置文件路径，配置文件模板见 config/config.yaml 文件
+
+`CF` 开头的选项暂不需要填写，不影响程序运行
+
+[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy)
+
+> 因为爬虫程序需要持续运行，所以至少选择 $7/月 的配置
+> 免费配置长时间无人访问会被heroku强制停止
+
 ### 从源码编译
 
 需要安装Golang
@@ -52,30 +61,28 @@ docker pull docker.pkg.github.com/zu1k/proxypool/proxypool:latest
 
 ## 使用
 
-### 共享抓取配置文件
+### 修改配置文件
 
-每一次抓取前会自动从github下载最新的抓取配置文件
+首先修改 config.yaml 中的必要配置信息，cf开头的选项不需要填写
 
-直接运行 `proxypool` 程序即可
+source.yaml 文件中定义了抓取源，需要定期手动维护更新
 
-### 自定义抓取配置文件
+### 启动程序
+
+使用 `-c` 参数指定配置文件路径，支持http链接
 
 ```shell
-proxypool -c source.yaml
+proxypool -c config.yaml
 ```
 
-### 帮助更新配置文件
-
-可以在 https://github.com/zu1k/proxypool/issues/3 进行留言
-
-### 用户使用
-
-目前公开版本： https://proxy.tgbot.co
-
-直接在clash添加配置文件即可使用： https://proxy.tgbot.co/clash/config
-
 ## 截图
 
 ![Speedtest](docs/speedtest.png)
 
 ![Fast](docs/fast.png)
+
+## 声明
+
+本项目遵循 GNU General Public License v3.0 开源，在此基础上，所有使用本项目提供服务者都必须在网站首页保留指向本项目的链接
+
+禁止使用本项目进行营利和做其他违法事情，产生的一切后果本项目概不负责

api/router.go

@@ -1,56 +1,199 @@
 package api
 
 import (
+	"html/template"
+	"net/http"
 	"os"
+	"strconv"
 
 	"github.com/gin-gonic/gin"
 	_ "github.com/heroku/x/hmetrics/onload"
-	"github.com/zu1k/proxypool/app/cache"
-	"github.com/zu1k/proxypool/provider"
+	"github.com/zu1k/proxypool/config"
+	binhtml "github.com/zu1k/proxypool/internal/bindata/html"
+	"github.com/zu1k/proxypool/internal/cache"
+	"github.com/zu1k/proxypool/pkg/provider"
 )
 
+const version = "v0.3.5"
+
 var router *gin.Engine
 
 func setupRouter() {
-	router = gin.Default()
+	gin.SetMode(gin.ReleaseMode)
+	router = gin.New()
+	router.Use(gin.Recovery())
+	temp, err := loadTemplate()
+	if err != nil {
+		panic(err)
+	}
+	router.SetHTMLTemplate(temp)
+
+	router.GET("/", func(c *gin.Context) {
+		c.HTML(http.StatusOK, "assets/html/index.html", gin.H{
+			"domain":               config.Config.Domain,
+			"getters_count":        cache.GettersCount,
+			"all_proxies_count":    cache.AllProxiesCount,
+			"ss_proxies_count":     cache.SSProxiesCount,
+			"ssr_proxies_count":    cache.SSRProxiesCount,
+			"vmess_proxies_count":  cache.VmessProxiesCount,
+			"trojan_proxies_count": cache.TrojanProxiesCount,
+			"useful_proxies_count": cache.UsefullProxiesCount,
+			"last_crawl_time":      cache.LastCrawlTime,
+			"version":              version,
+		})
+	})
+
+	router.GET("/clash", func(c *gin.Context) {
+		c.HTML(http.StatusOK, "assets/html/clash.html", gin.H{
+			"domain": config.Config.Domain,
+		})
+	})
+
+	router.GET("/surge", func(c *gin.Context) {
+		c.HTML(http.StatusOK, "assets/html/surge.html", gin.H{
+			"domain": config.Config.Domain,
+		})
+	})
+
+	router.GET("/clash/config", func(c *gin.Context) {
+		c.HTML(http.StatusOK, "assets/html/clash-config.yaml", gin.H{
+			"domain": config.Config.Domain,
+		})
+	})
+
+	router.GET("/surge/config", func(c *gin.Context) {
+		c.HTML(http.StatusOK, "assets/html/surge.conf", gin.H{
+			"domain": config.Config.Domain,
+		})
+	})
 
-	router.StaticFile("/", "assets/index.html")
-	router.StaticFile("/clash", "assets/clash.html")
-	router.StaticFile("/surge", "assets/surge.html")
-	router.StaticFile("/clash/config", "assets/clash-config.yaml")
-	router.StaticFile("/surge/config", "assets/surge.conf")
 	router.GET("/clash/proxies", func(c *gin.Context) {
 		proxyTypes := c.DefaultQuery("type", "")
+		proxyCountry := c.DefaultQuery("c", "")
+		proxyNotCountry := c.DefaultQuery("nc", "")
 		text := ""
-		if proxyTypes == "" {
+		if proxyTypes == "" && proxyCountry == "" && proxyNotCountry == "" {
 			text = cache.GetString("clashproxies")
 			if text == "" {
 				proxies := cache.GetProxies("proxies")
-				clash := provider.Clash{Proxies: proxies}
+				clash := provider.Clash{
+					provider.Base{
+						Proxies: &proxies,
+					},
+				}
 				text = clash.Provide()
 				cache.SetString("clashproxies", text)
 			}
 		} else if proxyTypes == "all" {
 			proxies := cache.GetProxies("allproxies")
-			clash := provider.Clash{Proxies: proxies, Types: proxyTypes}
+			clash := provider.Clash{
+				provider.Base{
+					Proxies:    &proxies,
+					Types:      proxyTypes,
+					Country:    proxyCountry,
+					NotCountry: proxyNotCountry,
+				},
+			}
 			text = clash.Provide()
 		} else {
 			proxies := cache.GetProxies("proxies")
-			clash := provider.Clash{Proxies: proxies, Types: proxyTypes}
+			clash := provider.Clash{
+				provider.Base{
+					Proxies:    &proxies,
+					Types:      proxyTypes,
+					Country:    proxyCountry,
+					NotCountry: proxyNotCountry,
+				},
+			}
 			text = clash.Provide()
 		}
 		c.String(200, text)
 	})
 	router.GET("/surge/proxies", func(c *gin.Context) {
-		text := cache.GetString("surgeproxies")
-		if text == "" {
-			proxies := cache.GetProxies("proxies")
-			surge := provider.Surge{Proxies: proxies}
+		proxyTypes := c.DefaultQuery("type", "")
+		proxyCountry := c.DefaultQuery("c", "")
+		proxyNotCountry := c.DefaultQuery("nc", "")
+		text := ""
+		if proxyTypes == "" && proxyCountry == "" && proxyNotCountry == "" {
+			text = cache.GetString("surgeproxies")
+			if text == "" {
+				proxies := cache.GetProxies("proxies")
+				surge := provider.Surge{
+					provider.Base{
+						Proxies: &proxies,
+					},
+				}
+				text = surge.Provide()
+				cache.SetString("surgeproxies", text)
+			}
+		} else if proxyTypes == "all" {
+			proxies := cache.GetProxies("allproxies")
+			surge := provider.Surge{
+				provider.Base{
+					Proxies:    &proxies,
+					Types:      proxyTypes,
+					Country:    proxyCountry,
+					NotCountry: proxyNotCountry,
+				},
+			}
+			text = surge.Provide()
+		} else {
+			proxies := cache.GetProxies("proxies")
+			surge := provider.Surge{
+				provider.Base{
+					Proxies:    &proxies,
+					Types:      proxyTypes,
+					Country:    proxyCountry,
+					NotCountry: proxyNotCountry,
+				},
+			}
 			text = surge.Provide()
-			cache.SetString("surgeproxies", text)
 		}
 		c.String(200, text)
 	})
+
+	router.GET("/ss/sub", func(c *gin.Context) {
+		proxies := cache.GetProxies("proxies")
+		ssSub := provider.SSSub{
+			provider.Base{
+				Proxies: &proxies,
+				Types:   "ss",
+			},
+		}
+		c.String(200, ssSub.Provide())
+	})
+	router.GET("/ssr/sub", func(c *gin.Context) {
+		proxies := cache.GetProxies("proxies")
+		ssrSub := provider.SSRSub{
+			provider.Base{
+				Proxies: &proxies,
+				Types:   "ssr",
+			},
+		}
+		c.String(200, ssrSub.Provide())
+	})
+	router.GET("/vmess/sub", func(c *gin.Context) {
+		proxies := cache.GetProxies("proxies")
+		vmessSub := provider.VmessSub{
+			provider.Base{
+				Proxies: &proxies,
+				Types:   "vmess",
+			},
+		}
+		c.String(200, vmessSub.Provide())
+	})
+	router.GET("/link/:id", func(c *gin.Context) {
+		idx := c.Param("id")
+		proxies := cache.GetProxies("allproxies")
+		id, err := strconv.Atoi(idx)
+		if err != nil {
+			c.String(500, err.Error())
+		}
+		if id >= proxies.Len() {
+			c.String(500, "id too big")
+		}
+		c.String(200, proxies[id].Link())
+	})
 }
 
 func Run() {
@@ -61,3 +204,15 @@ func Run() {
 	}
 	router.Run(":" + port)
 }
+
+func loadTemplate() (t *template.Template, err error) {
+	t = template.New("")
+	for _, fileName := range binhtml.AssetNames() {
+		data := binhtml.MustAsset(fileName)
+		t, err = t.New(fileName).Parse(string(data))
+		if err != nil {
+			return nil, err
+		}
+	}
+	return t, nil
+}

app.json

@@ -0,0 +1,25 @@
+{
+  "name": "proxypool",
+  "description": "自动抓取tg频道、订阅地址、公开互联网上的ss、ssr、vmess节点信息，聚合去重测试可用性后提供节点列表",
+  "website": "https://proxy.tgbot.co/",
+  "repository": "https://github.com/zu1k/proxypool",
+  "success_url": "/",
+  "logo": "https://raw.githubusercontent.com/zu1k/proxypool/heroku/assets/proxy.jpg",
+  "keywords": ["golang", "ss", "ssr", "vmess", "shadowsocks", "shadowsocksr", "trojan"],
+  "env": {
+    "CONFIG_FILE": {
+      "description": "Path to config file, could be a url."
+    },
+    "DOMAIN": {
+      "description": "Domain to use."
+    },
+    "CF_API_EMAIL": {
+      "description": "Cloudflare Email.",
+      "required": false
+    },
+    "CF_API_KEY": {
+      "description": "Cloudflare API key.",
+      "required": false
+    }
+  }
+}

app/config_test.go

@@ -1,36 +0,0 @@
-package app
-
-import (
-	"errors"
-	"fmt"
-	"strconv"
-	"testing"
-
-	"github.com/zu1k/proxypool/config"
-	"github.com/zu1k/proxypool/getter"
-)
-
-func TestConfigFile(t *testing.T) {
-	c, err := config.Parse("../source.yaml")
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	if c == nil {
-		t.Error(errors.New("no sources"))
-		return
-	}
-	for idx, source := range c.Sources {
-		g, err := getter.NewGetter(source.Type, source.Options)
-		if err != nil {
-			t.Error(err, idx)
-			fmt.Println(source)
-			return
-		}
-		if g == nil {
-			t.Error(errors.New("getter is nil:" + strconv.Itoa(idx)))
-			fmt.Println(source)
-			return
-		}
-	}
-}

app/cron.go

@@ -1,10 +0,0 @@
-package app
-
-import (
-	"github.com/jasonlvhit/gocron"
-)
-
-func Cron() {
-	_ = gocron.Every(10).Minutes().Do(CrawlGo)
-	<-gocron.Start()
-}

app/getter.go

@@ -1,35 +0,0 @@
-package app
-
-import (
-	"errors"
-	"fmt"
-
-	"github.com/zu1k/proxypool/config"
-	"github.com/zu1k/proxypool/getter"
-)
-
-var Getters = make([]getter.Getter, 0)
-
-func InitConfigAndGetters(path string) (err error) {
-	c, err := config.Parse(path)
-	if err != nil {
-		return err
-	}
-	if c == nil {
-		return errors.New("no sources")
-	}
-	InitGetters(c.Sources)
-	return nil
-}
-
-func InitGetters(sources []config.Source) {
-	Getters = make([]getter.Getter, 0)
-	for _, source := range sources {
-		g, err := getter.NewGetter(source.Type, source.Options)
-		if err == nil && g != nil {
-			Getters = append(Getters, g)
-			fmt.Println("init getter:", source.Type, source.Options)
-		}
-	}
-	fmt.Println("Getter count:", len(Getters))
-}

app/task.go

@@ -1,74 +0,0 @@
-package app
-
-import (
-	"fmt"
-	"io/ioutil"
-	"log"
-	"sync"
-
-	"github.com/zu1k/proxypool/app/cache"
-	"github.com/zu1k/proxypool/config"
-	"github.com/zu1k/proxypool/provider"
-	"github.com/zu1k/proxypool/proxy"
-	"github.com/zu1k/proxypool/tool"
-	"gopkg.in/yaml.v2"
-)
-
-var NeedFetchNewConfigFile = false
-
-func CrawlGo() {
-	if NeedFetchNewConfigFile {
-		FetchNewConfigFileThenInit()
-	}
-	wg := &sync.WaitGroup{}
-	var pc = make(chan proxy.Proxy)
-	for _, g := range Getters {
-		wg.Add(1)
-		go g.Get2Chan(pc, wg)
-	}
-	proxies := cache.GetProxies("proxies")
-	go func() {
-		wg.Wait()
-		close(pc)
-	}()
-	for node := range pc {
-		if node != nil {
-			proxies = append(proxies, node)
-		}
-	}
-	// 节点去重
-	proxies = proxies.Deduplication()
-	log.Println("CrawlGo node count:", len(proxies))
-	proxies.NameAddCounrty().Sort().NameAddIndex()
-	cache.SetProxies("allproxies", proxies)
-
-	// 可用性检测
-	proxiesUseful := proxy.CleanProxies(provider.Clash{Proxies: proxies}.CleanProxies())
-	proxies = make(proxy.ProxyList, len(proxiesUseful))
-	copy(proxies, proxiesUseful)
-
-	log.Println("CrawlGo clash useable node count:", len(proxies))
-
-	// 排序和重命名
-	proxies.NameAddCounrty().Sort().NameAddIndex()
-	cache.SetProxies("proxies", proxies)
-
-	cache.SetString("clashproxies", provider.Clash{Proxies: proxies}.Provide())
-	cache.SetString("surgeproxies", provider.Surge{Proxies: proxies}.Provide())
-}
-
-func FetchNewConfigFileThenInit() {
-	fmt.Println("fetch new config file...")
-	resp, err := tool.GetHttpClient().Get("https://raw.githubusercontent.com/zu1k/proxypool/master/source.yaml")
-	if err != nil {
-		return
-	}
-	defer resp.Body.Close()
-	body, err := ioutil.ReadAll(resp.Body)
-
-	err = yaml.Unmarshal(body, &config.SourceConfig)
-	if err != nil {
-		return
-	}
-	InitGetters(config.SourceConfig.Sources)
-}

assets/clash.html

@@ -1,119 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="HandheldFriendly" content="True">
-    <title>免费Clash节点</title>
-    <style type='text/css'>
-        body {
-            background-color: white;
-            color: #333333;
-            font-family: Arial, sans-serif;
-            margin: 0;
-            padding: 36px;
-            line-height: 1;
-            font-size: 14px;
-        }
-
-        .section {
-            margin-bottom: 36px;
-        }
-
-        .section.friendly {
-            color: #222222;
-        }
-
-        .section.friendly h1 {
-            font-size: 26px;
-            background-color: #dad8e4;
-            padding: 18px 22px 15px 22px;
-            margin: 0;
-            overflow: hidden;
-        }
-
-        .section.friendly h1 strong {
-            display: inline-block;
-            float: left;
-        }
-
-        .section.friendly h1 small {
-            display: inline-block;
-            float: right;
-            text-align: right;
-            font-size: 18px;
-            padding-top: 4px;
-            color: #333333;
-        }
-
-        .section.friendly .article {
-            border: 4px solid #dad8e4;
-            padding: 24px 18px 18px 18px;
-        }
-
-        .section.friendly .article h3 {
-            font-size: 20px;
-            margin: 0 0 18px 0;
-        }
-
-        .section.friendly .article a {
-            color: #6b6ceb;
-        }
-
-        .section.friendly .article a:visited {
-            color: #1d1d3b;
-        }
-
-        .section.friendly .article p {
-            font-size: 14px;
-        }
-
-        .section.friendly .article ul {
-            list-style-type: square;
-        }
-
-        .section.original {
-            background-color: #eeeeee;
-            color: #444444;
-        }
-
-        .section.original h2 {
-            background-color: #dddddd;
-            margin: 0;
-            padding: 18px 22px 18px 22px;
-            font-size: 20px;
-        }
-
-        .section.original pre {
-            margin: 0;
-            padding: 18px 22px 18px 22px;
-            overflow: auto;
-            font-family: monaco, monospaced;
-        }
-
-        .section.original pre code {
-            display: block;
-            font-size: 11px;
-            width: 100%;
-        }
-    </style>
-</head>
-<body>
-<div class='container'>
-    <div class='section friendly'>
-        <h1><strong>免费Clash节点</strong></h1>
-        <div class='article'>
-            <p>自动抓取tg频道、订阅地址、公开互联网上的ss、ssr、vmess节点信息，聚合去重后提供clash配置，每10分钟更新</p>
-            <br>
-            <p>Clash配置文件：<a href="https://proxy.tgbot.co/clash/config">https://proxy.tgbot.co/clash/config</a> <a href="clash://install-config?url=https://proxy.tgbot.co/clash/config">一键导入</a></p>
-            <p>Clash proxy-provider(Shadowrocket添加订阅方式可用)：<a href="https://proxy.tgbot.co/clash/proxies">https://proxy.tgbot.co/clash/proxies</a></p>
-            <br>
-			<p>筛选代理类型(此种方式你只能自己维护配置文件)：https://proxy.tgbot.co/clash/proxies?type=ss,ssr,vmess</p>
-            <p>所有节点的Provider(不是都可以用)：<a href="https://proxy.tgbot.co/clash/proxies?type=all">https://proxy.tgbot.co/clash/proxies?type=all</a></p>
-            <br>
-            <p>抓取程序已开源：<a href="https://github.com/zu1k/proxypool">https://github.com/zu1k/proxypool</a></p>
-        </div>
-    </div>
-</div>
-</body>
-</html>

assets/index.html

@@ -1,127 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="HandheldFriendly" content="True">
-    <title>免费节点</title>
-    <style type='text/css'>
-        body {
-            background-color: white;
-            color: #333333;
-            font-family: Arial, sans-serif;
-            margin: 0;
-            padding: 36px;
-            line-height: 1;
-            font-size: 14px;
-        }
-
-        .section {
-            margin-bottom: 36px;
-        }
-
-        .section.friendly {
-            color: #222222;
-        }
-
-        .section.friendly h1 {
-            font-size: 26px;
-            background-color: #dad8e4;
-            padding: 18px 22px 15px 22px;
-            margin: 0;
-            overflow: hidden;
-        }
-
-        .section.friendly h1 strong {
-            display: inline-block;
-            float: left;
-        }
-
-        .section.friendly h1 small {
-            display: inline-block;
-            float: right;
-            text-align: right;
-            font-size: 18px;
-            padding-top: 4px;
-            color: #333333;
-        }
-
-        .section.friendly .article {
-            border: 4px solid #dad8e4;
-            padding: 24px 18px 18px 18px;
-        }
-
-        .section.friendly .article h3 {
-            font-size: 20px;
-            margin: 0 0 18px 0;
-        }
-
-        .section.friendly .article a {
-            color: #6b6ceb;
-        }
-
-        .section.friendly .article a:visited {
-            color: #1d1d3b;
-        }
-
-        .section.friendly .article p {
-            font-size: 14px;
-        }
-
-        .section.friendly .article ul {
-            list-style-type: square;
-        }
-
-        .section.original {
-            background-color: #eeeeee;
-            color: #444444;
-        }
-
-        .section.original h2 {
-            background-color: #dddddd;
-            margin: 0;
-            padding: 18px 22px 18px 22px;
-            font-size: 20px;
-        }
-
-        .section.original pre {
-            margin: 0;
-            padding: 18px 22px 18px 22px;
-            overflow: auto;
-            font-family: monaco, monospaced;
-        }
-
-        .section.original pre code {
-            display: block;
-            font-size: 11px;
-            width: 100%;
-        }
-    </style>
-</head>
-<body>
-<div class='container'>
-    <div class='section friendly'>
-        <h1><strong>免费节点</strong></h1>
-        <div class='article'>
-            <p>自动抓取tg频道、订阅地址、公开互联网上的ss、ssr、vmess节点信息，聚合去重后提供节点列表，每10分钟更新</p>
-            <br>
-            <h5><a href="/clash">Clash</a></h5>
-            <p>Clash配置文件：<a href="https://proxy.tgbot.co/clash/config">https://proxy.tgbot.co/clash/config</a> <a
-                        href="clash://install-config?url=https://proxy.tgbot.co/clash/config">一键导入</a></p>
-            <p>Clash proxy-provider(Shadowrocket添加订阅方式可用)：<a href="https://proxy.tgbot.co/clash/proxies">https://proxy.tgbot.co/clash/proxies</a>
-            </p>
-			<p>所有节点的Provider(不是都可以用)：<a href="https://proxy.tgbot.co/clash/proxies?type=all">https://proxy.tgbot.co/clash/proxies?type=all</a>
-			</p>
-			<br>
-			<h5><a href="/surge">Surge</a></h5>
-            <p>Surge配置文件：<a href="https://proxy.tgbot.co/surge/config">https://proxy.tgbot.co/surge/config</a> <a
-                        href="surge3:///install-config?url=https://proxy.tgbot.co/surge/config">一键导入</a></p>
-            <p>Surge proxy list：<a href="https://proxy.tgbot.co/surge/proxies">https://proxy.tgbot.co/surge/proxies</a>
-            </p>
-            <br>
-            <p>抓取程序已开源：<a href="https://github.com/zu1k/proxypool">https://github.com/zu1k/proxypool</a></p>
-        </div>
-    </div>
-</div>
-</body>
-</html>

assets/source.yaml

@@ -1,24 +0,0 @@
-sources:
-  - type: subscribe
-    options:
-      url: https://raw.githubusercontent.com/ssrsub/ssr/master/v2ray
-
-  - type: webfuzz
-    options:
-      url: https://merlinblog.xyz/wiki/freess.html
-
-  - type: tgchannel
-    options:
-      channel: ssrList
-      num: 200
-
-  - type: web-fanqiangdang
-    options:
-      url: https://fanqiangdang.com/forum.php?mod=rss&fid=50&auth=0
-      num: 200
-
-  - type: web-freessrxyz
-    options:
-
-  - type: web-lucnorg
-    options:

assets/surge.conf

@@ -1,45 +0,0 @@
-[Proxy]
-Direct = direct
-
-[Proxy Group]
-Proxy = select, 延迟最低, 失败切换, 手动选择
-延迟最低 = url-test, policy-path=https://proxy.tgbot.co/surge/proxies, url=http://www.qualcomm.cn/generate_204, update-interval=3600, interval = 600s, tolerance = 100ms, timeout = 5s, evaluate-before-use = true
-失败切换 = fallback, policy-path=https://proxy.tgbot.co/surge/proxies, url=http://www.qualcomm.cn/generate_204, update-interval=3600, interval = 600s, tolerance = 100ms, timeout = 5s, evaluate-before-use = true
-手动选择 = select, policy-path=https://proxy.tgbot.co/surge/proxies, url=http://www.qualcomm.cn/generate_204, update-interval=3600, interval = 600s, tolerance = 100ms, timeout = 5s, evaluate-before-use = true
-Apple = select, Direct, Proxy
-Adblock = select, Direct, REJECT, REJECT-TINYGIF
-
-[Rule]
-# RULESET
-RULE-SET,SYSTEM,Direct
-# 
-# Unbreak 后续规则修正
-RULE-SET,https://github.com/DivineEngine/Profiles/raw/master/Surge/Ruleset/Unbreak.list,Adblock
-# Advertising 广告
-RULE-SET,https://github.com/DivineEngine/Profiles/raw/master/Surge/Ruleset/Guard/Advertising.list,Adblock
-# Privacy 隐私
-# RULE-SET,https://github.com/DivineEngine/Profiles/raw/master/Surge/Ruleset/Guard/Privacy.list,Adblock
-# Hijacking 运营商劫持或恶意网站
-RULE-SET,https://github.com/DivineEngine/Profiles/raw/master/Surge/Ruleset/Guard/Hijacking.list,Adblock
-# 
-# Apple
-RULE-SET,https://github.com/DivineEngine/Profiles/raw/master/Surge/Ruleset/Extra/Apple/Apple.list,Apple
-# 
-# 代理
-# Streaming 国际流媒体服务
-RULE-SET,https://github.com/DivineEngine/Profiles/raw/master/Surge/Ruleset/StreamingMedia/Streaming.list,Proxy
-# StreamingSE 中国流媒体服务（面向海外版本）
-RULE-SET,https://github.com/DivineEngine/Profiles/raw/master/Surge/Ruleset/StreamingMedia/StreamingSE.list,Proxy
-# Global 全球加速
-RULE-SET,https://github.com/DivineEngine/Profiles/raw/master/Surge/Ruleset/Global.list,Proxy
-# 
-RULE-SET,https://github.com/Hackl0us/SS-Rule-Snippet/raw/master/Rulesets/App/social/Telegram.list,Proxy
-RULE-SET,https://github.com/Hackl0us/SS-Rule-Snippet/raw/master/Rulesets/App/social/WhatsApp.list,Proxy
-RULE-SET,https://github.com/Hackl0us/SS-Rule-Snippet/raw/master/Rulesets/App/social/LINE.list,Proxy
-# 
-# Direct
-RULE-SET,https://github.com/DivineEngine/Profiles/raw/master/Surge/Ruleset/Extra/ChinaIP.list,Direct
-# 
-RULE-SET,LAN,Direct
-# GEOIP,CN,Direct
-FINAL,Proxy,dns-failed

assets/surge.html

@@ -1,86 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="HandheldFriendly" content="True">
-	<title>免费Surge节点</title>
-	<style type='text/css'>
-	  body {
-		background-color: white;
-		color: #333333;
-		  font-family: Arial, sans-serif;
-		margin: 0;
-		padding: 36px;
-		line-height: 1;
-		font-size: 14px; }
-
-	  .section {
-		margin-bottom: 36px; }
-		.section.friendly {
-		  color: #222222; }
-		  .section.friendly h1 {
-			font-size: 26px;
-			background-color: #dad8e4;
-			padding: 18px 22px 15px 22px;
-			margin: 0;
-			overflow: hidden; }
-			.section.friendly h1 strong {
-			  display: inline-block;
-			  float: left; }
-			.section.friendly h1 small {
-			  display: inline-block;
-			  float: right;
-			  text-align: right;
-			  font-size: 18px;
-			  padding-top: 4px;
-			  color: #333333; }
-		  .section.friendly .article {
-			border: 4px solid #dad8e4;
-			padding: 24px 18px 18px 18px; }
-			.section.friendly .article h3 {
-			  font-size: 20px;
-			  margin: 0 0 18px 0; }
-			.section.friendly .article a {
-			  color: #6b6ceb; }
-			  .section.friendly .article a:visited {
-				color: #1d1d3b; }
-			.section.friendly .article p {
-			  font-size: 14px; }
-			.section.friendly .article ul {
-			  list-style-type: square; }
-	  .section.original {
-		background-color: #eeeeee;
-		color: #444444; }
-		.section.original h2 {
-		  background-color: #dddddd;
-		  margin: 0;
-		  padding: 18px 22px 18px 22px;
-		  font-size: 20px; }
-		.section.original pre {
-		  margin: 0;
-		  padding: 18px 22px 18px 22px;
-		  overflow: auto;
-		  font-family: monaco, monospaced; }
-		  .section.original pre code {
-			display: block;
-			font-size: 11px;
-			width: 100%; }
-	</style>
-</head>
-<body>
-<div class='container'>
-  <div class='section friendly'>
-	<h1><strong>免费Surge节点</strong></h1>
-	<div class='article'>
-	  <p>自动抓取tg频道、订阅地址、公开互联网上的ss、vmess节点信息，聚合去重后提供Surge节点列表，每10分钟更新</p>
-		<br>
-	  <p>Surge配置文件：<a href="https://proxy.tgbot.co/surge/config">https://proxy.tgbot.co/surge/config</a> <a href="surge3:///install-config?url=https://proxy.tgbot.co/surge/config">一键导入</a></p>
-	  <p>Surge proxy list：<a href="https://proxy.tgbot.co/surge/proxies">https://proxy.tgbot.co/surge/proxies</a></p>
-		<br>
-	  <p>抓取程序已开源：<a href="https://github.com/zu1k/proxypool">https://github.com/zu1k/proxypool</a></p>
-	</div>
-  </div>
-</div>
-</body>
-</html>

config/config.go

@@ -1,50 +1,71 @@
 package config
 
 import (
-	"fmt"
+	"errors"
 	"io/ioutil"
 	"os"
+	"strings"
 
 	"github.com/ghodss/yaml"
-	"github.com/zu1k/proxypool/tool"
+	"github.com/zu1k/proxypool/pkg/tool"
 )
 
-type Source struct {
-	Type    string       `json:"type" yaml:"type"`
-	Options tool.Options `json:"options" yaml:"options"`
+var configFilePath = "config.yaml"
+
+type ConfigOptions struct {
+	Domain      string   `json:"domain" yaml:"domain"`
+	CFEmail     string   `json:"cf_email" yaml:"cf_email"`
+	CFKey       string   `json:"cf_key" yaml:"cf_key"`
+	SourceFiles []string `json:"source-files" yaml:"source-files"`
 }
 
-type Config struct {
-	Sources []Source `json:"sources" yaml:"sources"`
-}
+// Config 配置
+var Config ConfigOptions
 
-var SourceConfig = Config{}
-
-func Parse(path string) (*Config, error) {
-	fileData, err := readFile(path)
+// Parse 解析配置文件，支持本地文件系统和网络链接
+func Parse(path string) error {
+	if path == "" {
+		path = configFilePath
+	} else {
+		configFilePath = path
+	}
+	fileData, err := ReadFile(path)
 	if err != nil {
-		return nil, err
+		return err
 	}
-	SourceConfig = Config{}
-	err = yaml.Unmarshal(fileData, &SourceConfig)
+	Config = ConfigOptions{}
+	err = yaml.Unmarshal(fileData, &Config)
 	if err != nil {
-		return nil, err
+		return err
 	}
-	return &SourceConfig, nil
+
+	// 部分配置环境变量优先
+	if domain := os.Getenv("DOMAIN"); domain != "" {
+		Config.Domain = domain
+	}
+	if cfEmail := os.Getenv("CF_API_EMAIL"); cfEmail != "" {
+		Config.CFEmail = cfEmail
+	}
+	if cfKey := os.Getenv("CF_API_KEY"); cfKey != "" {
+		Config.CFKey = cfKey
+	}
+
+	return nil
 }
 
-func readFile(path string) ([]byte, error) {
-	if _, err := os.Stat(path); os.IsNotExist(err) {
-		return nil, err
+// 从本地文件或者http链接读取配置文件内容
+func ReadFile(path string) ([]byte, error) {
+	if strings.HasPrefix(path, "http://") || strings.HasPrefix(path, "https://") {
+		resp, err := tool.GetHttpClient().Get(path)
+		if err != nil {
+			return nil, errors.New("config file http get fail")
+		}
+		defer resp.Body.Close()
+		return ioutil.ReadAll(resp.Body)
+	} else {
+		if _, err := os.Stat(path); os.IsNotExist(err) {
+			return nil, err
+		}
+		return ioutil.ReadFile(path)
 	}
-	data, err := ioutil.ReadFile(path)
-	if err != nil {
-		return nil, err
-	}
-
-	if len(data) == 0 {
-		return nil, fmt.Errorf("Configuration file %s is empty", path)
-	}
-
-	return data, err
 }

config/config.yaml

@@ -0,0 +1,13 @@
+# your domain
+domain: example.com
+
+# cloudflare api
+cf_email: ""
+cf_key: ""
+
+# source definition file
+source-files:
+  # use local file
+  - source.yaml
+  # use web file
+  - https://example.com/source.yaml

config/source.go

@@ -0,0 +1,8 @@
+package config
+
+import "github.com/zu1k/proxypool/pkg/tool"
+
+type Source struct {
+	Type    string       `json:"type" yaml:"type"`
+	Options tool.Options `json:"options" yaml:"options"`
+}

config/source.yaml

@@ -0,0 +1,29 @@
+# 模糊抓取订阅链接
+- type: webfuzzsub
+  options:
+    url: https://raw.githubusercontent.com/du5/free/master/sub.list
+
+# 订阅链接
+- type: subscribe
+  options:
+    url: https://raw.githubusercontent.com/ssrsub/ssr/master/v2ray
+
+# 网页模糊抓取
+- type: webfuzz
+  options:
+    url: https://merlinblog.xyz/wiki/freess.html
+
+# tg频道抓取
+- type: tgchannel
+  options:
+    channel: ssrList
+    num: 200
+
+# 翻墙党论坛抓取
+- type: web-fanqiangdang
+  options:
+    url: https://fanqiangdang.com/forum-48-1.html
+
+# 某个网站抓取
+- type: web-freessrxyz
+  options:

docs/genbindata.sh

@@ -0,0 +1,2 @@
+go-bindata -o internal/bindata/html/html.go -pkg binhtml  assets/html/
+go-bindata -o internal/bindata/geoip/geoip.go -pkg bingeoip  assets/GeoLite2-City.mmdb assets/flags.json

getter/web_lucn_org.go

@@ -1,85 +0,0 @@
-package getter
-
-import (
-	"encoding/base64"
-	"encoding/json"
-	"io/ioutil"
-	"sync"
-
-	"github.com/zu1k/proxypool/proxy"
-	"github.com/zu1k/proxypool/tool"
-)
-
-func init() {
-	Register("web-lucnorg", NewWebLucnorg)
-}
-
-const lucnorgSsrLink = "https://lncn.org/api/ssrList"
-
-type WebLucnOrg struct {
-}
-
-func NewWebLucnorg(options tool.Options) (getter Getter, err error) {
-	return &WebLucnOrg{}, nil
-}
-
-func (w *WebLucnOrg) Get() proxy.ProxyList {
-	resp, err := tool.GetHttpClient().Post(lucnorgSsrLink, nil)
-	if err != nil {
-		return nil
-	}
-	defer resp.Body.Close()
-	body, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return nil
-	}
-
-	response := struct {
-		Code string `json:"code"`
-		Ssrs string `json:"ssrs"`
-	}{}
-	err = json.Unmarshal(body, &response)
-	if err != nil {
-		return nil
-	}
-
-	dec := decryptAesForLucn(response.Code, response.Ssrs)
-	if dec == nil {
-		return nil
-	}
-
-	type node struct {
-		Url string `json:"url"`
-	}
-	ssrs := make([]node, 0)
-	err = json.Unmarshal(dec, &ssrs)
-	if err != nil {
-		return nil
-	}
-
-	result := make([]string, 0)
-	for _, node := range ssrs {
-		result = append(result, node.Url)
-	}
-	return StringArray2ProxyArray(result)
-}
-
-func (w *WebLucnOrg) Get2Chan(pc chan proxy.Proxy, wg *sync.WaitGroup) {
-	defer wg.Done()
-	nodes := w.Get()
-	for _, node := range nodes {
-		pc <- node
-	}
-}
-
-func decryptAesForLucn(code string, c string) []byte {
-	if code == "" {
-		code = "abclnv561cqqfg30"
-	}
-	cipher, err := base64.StdEncoding.DecodeString(c)
-	if err != nil {
-		return nil
-	}
-	result := tool.AesEcbDecryptWithPKCS7Unpadding(cipher, []byte(code))
-	return result
-}

go.mod

@@ -9,31 +9,30 @@ require (
 	github.com/antchfx/htmlquery v1.2.3 // indirect
 	github.com/antchfx/xmlquery v1.2.4 // indirect
 	github.com/antchfx/xpath v1.1.8 // indirect
+	github.com/cloudflare/cloudflare-go v0.13.2
 	github.com/ghodss/yaml v1.0.0
 	github.com/gin-gonic/gin v1.6.3
+	github.com/go-bindata/go-bindata v3.1.2+incompatible // indirect
 	github.com/go-playground/validator/v10 v10.3.0 // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
 	github.com/gocolly/colly v1.2.0
 	github.com/golang/protobuf v1.4.2 // indirect
 	github.com/heroku/x v0.0.25
+	github.com/ivpusic/grpool v1.0.0
 	github.com/jasonlvhit/gocron v0.0.1
 	github.com/json-iterator/go v1.1.10 // indirect
 	github.com/kennygrant/sanitize v1.2.4 // indirect
-	github.com/mkevac/debugcharts v0.0.0-20191222103121-ae1c48aa8615
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.1 // indirect
 	github.com/oschwald/geoip2-golang v1.4.0
 	github.com/oschwald/maxminddb-golang v1.7.0 // indirect
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/saintfish/chardet v0.0.0-20120816061221-3af4cd4741ca // indirect
-	github.com/shirou/gopsutil v2.20.7+incompatible // indirect
 	github.com/temoto/robotstxt v1.1.1 // indirect
 	golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de // indirect
-	golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc // indirect
 	golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed // indirect
 	golang.org/x/text v0.3.3 // indirect
 	google.golang.org/appengine v1.6.6 // indirect
 	google.golang.org/protobuf v1.25.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
-	gopkg.in/yaml.v2 v2.3.0
 )

go.sum

@@ -10,8 +10,6 @@ github.com/Dreamacro/go-shadowsocks2 v0.1.6-0.20200722122336-8e5c7db4f96a/go.mod
 github.com/PuerkitoBio/goquery v1.5.1 h1:PSPBGne8NIUWw+/7vFBV+kG2J/5MOjbzc7154OaKCSE=
 github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
 github.com/StackExchange/wmi v0.0.0-20170410192909-ea383cf3ba6e/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
-github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d h1:G0m3OIz70MZUWq3EgK3CesDbo8upS2Vm9/P3FtgI+Jk=
-github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
 github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
 github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
 github.com/andybalholm/cascadia v1.2.0 h1:vuRCkM5Ozh/BfmsaTm26kbjm0mIOM3yS5Ek/F5h18aE=
@@ -28,17 +26,22 @@ github.com/aws/aws-sdk-go v1.13.10/go.mod h1:ZRmQr0FajVIyZ4ZzBYKG5P3ZqPz9IHG41Zo
 github.com/axiomhq/hyperloglog v0.0.0-20180317131949-fe9507de0228/go.mod h1:IOXAcuKIFq/mDyuQ4wyJuJ79XLMsmLM+5RdQ+vWrL7o=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cloudflare/cloudflare-go v0.13.0 h1:Mx2gNz/r4H0eHETENq5ZPtc/kOX/uzEfT2UFuA+/XAU=
+github.com/cloudflare/cloudflare-go v0.13.0/go.mod h1:6rZ6s/XWxP8WIWMATgDM7aUop0Z0ZOAfcm/4rEd0lOY=
+github.com/cloudflare/cloudflare-go v0.13.1 h1:8i8E5CubfAlD/2zWM7VGKoIPS2/x/lO/nRnqDl0j5Dk=
+github.com/cloudflare/cloudflare-go v0.13.1/go.mod h1:27kfc1apuifUmJhp069y0+hwlKDg4bd8LWlu7oKeZvM=
+github.com/cloudflare/cloudflare-go v0.13.2 h1:bhMGoNhAg21DuqJjU9jQepRRft6vYfo6pejT3NN4V6A=
+github.com/cloudflare/cloudflare-go v0.13.2/go.mod h1:27kfc1apuifUmJhp069y0+hwlKDg4bd8LWlu7oKeZvM=
 github.com/codegangsta/negroni v1.0.0/go.mod h1:v0y3T5G7Y1UlFfyxFn/QLRU4a2EuNau2iZY63YTKWo0=
+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dgryski/go-metro v0.0.0-20180109044635-280f6062b5bc/go.mod h1:c9O8+fpSOX1DM8cPNSkX/qsBWdkD4yd2dpciOWQjpBw=
-github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc=
 github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
 github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
@@ -46,25 +49,22 @@ github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
 github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14=
 github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
-github.com/go-chi/chi v4.1.2+incompatible h1:fGFk2Gmi/YKXk0OmGfBh0WgmN3XB8lVnEyNz34tQRec=
+github.com/go-bindata/go-bindata v1.0.0 h1:DZ34txDXWn1DyWa+vQf7V9ANc2ILTtrEjtlsdJRF26M=
+github.com/go-bindata/go-bindata v3.1.2+incompatible h1:5vjJMVhowQdPzjE1LdxyFF7YFTXg5IgGVW4gBr5IbvE=
+github.com/go-bindata/go-bindata v3.1.2+incompatible/go.mod h1:xK8Dsgwmeed+BBsSy2XTopBn/8uK2HWuGSnA11C3Joo=
 github.com/go-chi/chi v4.1.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ=
-github.com/go-chi/cors v1.1.1 h1:eHuqxsIw89iXcWnWUN8R72JMibABJTN/4IOYI5WERvw=
 github.com/go-chi/cors v1.1.1/go.mod h1:K2Yje0VW/SJzxiyMYu6iPQYa7hMjQX2i/F491VChg1I=
-github.com/go-chi/render v1.0.1 h1:4/5tis2cKaNdnv9zFLfXzcquC9HbeZgCnxGnKrltBS8=
 github.com/go-chi/render v1.0.1/go.mod h1:pq4Rr7HbnsdaeHagklXub+p6Wd16Af5l9koip1OvJns=
 github.com/go-ini/ini v1.33.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8=
-github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI=
-github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM=
 github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
 github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
 github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
 github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
 github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
-github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1Vv0sFl1UcHBOY=
 github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
 github.com/go-playground/validator/v10 v10.3.0 h1:nZU+7q+yJoFmwvNgv/LnPUkwPal62+b2xXj0AU1Es7o=
 github.com/go-playground/validator/v10 v10.3.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
@@ -114,8 +114,6 @@ github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OI
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
-github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/grpc-ecosystem/go-grpc-middleware v1.2.0/go.mod h1:mJzapYve32yjrKlk9GbyCZHuPgZsrbyIbyKhSzOpg6s=
@@ -129,11 +127,12 @@ github.com/heroku/x v0.0.25/go.mod h1:qE/I0jp6rIeTBBosrPYV4ygRX3OMhqmC/A6x8ewodJ
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/hydrogen18/memlistener v0.0.0-20141126152155-54553eb933fb/go.mod h1:qEIFzExnS6016fRpRfxrExeVn2gbClQA99gQhnIcdhE=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
+github.com/ivpusic/grpool v1.0.0 h1:+FCiCo3GhfsvzfXuJWnpJUNb/VaqyYVgG8C+qvh07Rc=
+github.com/ivpusic/grpool v1.0.0/go.mod h1:WPmiAI5ExAn06vg+0JzyPzXMQutJmpb7TrBtyLJkOHQ=
 github.com/jasonlvhit/gocron v0.0.1 h1:qTt5qF3b3srDjeOIR4Le1LfeyvoYzJlYpqvG7tJX5YU=
 github.com/jasonlvhit/gocron v0.0.1/go.mod h1:k9a3TV8VcU73XZxfVHCHWMWF9SOqgoku0/QlY2yvlA4=
 github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
 github.com/joeshaw/envdecode v0.0.0-20180129163420-d5f34bca07f3/go.mod h1:Q+alOFAXgW5SrcfMPt/G4B2oN+qEcQRJjkn/f4mKL04=
-github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68=
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
@@ -148,7 +147,6 @@ github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQL
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8=
 github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
@@ -163,26 +161,22 @@ github.com/lstoll/grpce v1.7.0/go.mod h1:XiCWl3R+avNCT7KsTjv3qCblgsSqd0SC4ymySrH
 github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ=
 github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/miekg/dns v1.1.29 h1:xHBEhR+t5RzcFJjBLJlax2daXOrTYtr9z4WdKEfWFzg=
+github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/miekg/dns v1.1.29/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
-github.com/mkevac/debugcharts v0.0.0-20191222103121-ae1c48aa8615 h1:/mD+ABZyXD39BzJI2XyRJlqdZG11gXFo0SSynL+OFeU=
-github.com/mkevac/debugcharts v0.0.0-20191222103121-ae1c48aa8615/go.mod h1:Ad7oeElCZqA1Ufj0U9/liOF4BtVepxRcTvr2ey7zTvM=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
+github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/oschwald/geoip2-golang v1.4.0 h1:5RlrjCgRyIGDz/mBmPfnAF4h8k0IAcRv9PvrpOfz+Ug=
 github.com/oschwald/geoip2-golang v1.4.0/go.mod h1:8QwxJvRImBH+Zl6Aa6MaIcs5YdlZSTKtzmPGzQqi9ng=
-github.com/oschwald/maxminddb-golang v1.6.0 h1:KAJSjdHQ8Kv45nFIbtoLGrGWqHFajOIm7skTyz/+Dls=
 github.com/oschwald/maxminddb-golang v1.6.0/go.mod h1:DUJFucBg2cvqx42YmDa/+xHvb0elJtOm3o4aFQ/nb/w=
 github.com/oschwald/maxminddb-golang v1.7.0 h1:JmU4Q1WBv5Q+2KZy5xJI+98aUwTIrPPxZUkd5Cwr8Zc=
 github.com/oschwald/maxminddb-golang v1.7.0/go.mod h1:RXZtst0N6+FY/3qCNmZMBApR19cdQj43/NM9VkrNAis=
@@ -190,6 +184,8 @@ github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaR
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.2-0.20190227000051-27936f6d90f9/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
@@ -198,19 +194,16 @@ github.com/rcrowley/go-metrics v0.0.0-20160613154715-cfa5a85e9f0a/go.mod h1:bCqn
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rollbar/rollbar-go v1.0.2/go.mod h1:AcFs5f0I+c71bpHlXNNDbOWJiKwjFDtISeXco0L5PKQ=
 github.com/rollbar/rollbar-go v1.2.0/go.mod h1:czC86b8U4xdUH7W2C6gomi2jutLm8qK0OtrF5WMvpcc=
+github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/saintfish/chardet v0.0.0-20120816061221-3af4cd4741ca h1:NugYot0LIVPxTvN8n+Kvkn6TrbMyxQiuvKdEwFdR9vI=
 github.com/saintfish/chardet v0.0.0-20120816061221-3af4cd4741ca/go.mod h1:uugorj2VCxiV1x+LzaIdVa9b4S4qGAcH6cbhh4qVxOU=
 github.com/shirou/gopsutil v0.0.0-20180427012116-c95755e4bcd7/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
-github.com/shirou/gopsutil v2.19.11+incompatible h1:lJHR0foqAjI4exXqWsU3DbH7bX1xvdhGdnXTIARA9W4=
-github.com/shirou/gopsutil v2.19.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
-github.com/shirou/gopsutil v2.20.7+incompatible h1:Ymv4OD12d6zm+2yONe39VSmp2XooJe8za7ngOLW/o/w=
-github.com/shirou/gopsutil v2.20.7+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
-github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 h1:udFKJ0aHUL60LboW/A+DfgoHVedieIzIXE8uylPue0U=
 github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc=
+github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I=
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a h1:pa8hGb/2YqsZKovtsgrwcDH1RZhVbTKCjLp47XpqCDs=
 github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/soveran/redisurl v0.0.0-20180322091936-eb325bc7a4b8/go.mod h1:FVJ8jbHu7QrNFs3bZEsv/L5JjearIAY9N0oXh2wk+6Y=
 github.com/spf13/cobra v0.0.2/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
@@ -231,6 +224,8 @@ github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
 github.com/unrolled/secure v1.0.1/go.mod h1:R6rugAuzh4TQpbFAq69oqZggyBQxFRFQIewtz5z7Jsc=
 github.com/urfave/cli v1.21.0/go.mod h1:lxDj6qX9Q6lWQxIrbrT0nwecwUtRnhVZAJjJZrVUZZQ=
+github.com/urfave/cli v1.22.4/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
+github.com/urfave/cli/v2 v2.1.1/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ=
 github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
@@ -243,7 +238,6 @@ golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de h1:ikNHVSjEfnvz6sxdSPCaPt572qowuyMDMJLLm3Db3ig=
 golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
@@ -277,8 +271,11 @@ golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc h1:zK/HqS5bZxDptfPJNq8v7vJfXtkU7r9TLIoSr1bXaP4=
 golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20200822124328-c89045814202 h1:VvcQYSHwXgi7W+TpUR6A9g6Up98WAHf3f/ulnJ62IyA=
+golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -288,7 +285,6 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a h1:WXEvlFVvvGxCJLG6REjsT03iWnKLEWinaScsxF2Vm2o=
 golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20171017063910-8dbc5d05d6ed/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -302,21 +298,20 @@ golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191220220014-0732a990476f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed h1:J22ig1FUekjjkmZUM7pTKixYm8DvrYsvrBZdunYeIuQ=
 golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e h1:EHBhcS0mlXEAVwNyO2dLfjToGsyY4j24pTs2ScHnX7s=
+golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -329,7 +324,6 @@ golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20191216052735-49a3e744a425 h1:VvQyQJN0tSuecqgcIxMWnnfG5kSmgy9KZR9sW3W5QeA=
 golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
@@ -351,7 +345,6 @@ google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRn
 google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190716160619-c506a9f90610/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
 google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
@@ -375,7 +368,6 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/eapache/channels.v1 v1.1.0 h1:5bGAyKKvyCTWjSj7mhefG6Lc68VyN4MH1v8/7OoeeB4=
 gopkg.in/eapache/channels.v1 v1.1.0/go.mod h1:BHIBujSvu9yMTrTYbTCjDD43gUhtmaOtTWDe7sTv1js=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=

internal/app/getter.go

@@ -0,0 +1,54 @@
+package app
+
+import (
+	"errors"
+	"fmt"
+
+	"github.com/zu1k/proxypool/internal/cache"
+
+	"github.com/ghodss/yaml"
+
+	"github.com/zu1k/proxypool/config"
+	"github.com/zu1k/proxypool/pkg/getter"
+)
+
+var Getters = make([]getter.Getter, 0)
+
+func InitConfigAndGetters(path string) (err error) {
+	err = config.Parse(path)
+	if err != nil {
+		return
+	}
+	if s := config.Config.SourceFiles; len(s) == 0 {
+		return errors.New("no sources")
+	} else {
+		initGetters(s)
+	}
+	return
+}
+
+func initGetters(sourceFiles []string) {
+	Getters = make([]getter.Getter, 0)
+	for _, path := range sourceFiles {
+		data, err := config.ReadFile(path)
+		if err != nil {
+			fmt.Errorf("Init SourceFile Error: %s\n", err.Error())
+			continue
+		}
+		sourceList := make([]config.Source, 0)
+		err = yaml.Unmarshal(data, &sourceList)
+		if err != nil {
+			fmt.Errorf("Init SourceFile Error: %s\n", err.Error())
+			continue
+		}
+		for _, source := range sourceList {
+			g, err := getter.NewGetter(source.Type, source.Options)
+			if err == nil && g != nil {
+				Getters = append(Getters, g)
+				fmt.Println("init getter:", source.Type, source.Options)
+			}
+		}
+	}
+	fmt.Println("Getter count:", len(Getters))
+	cache.GettersCount = len(Getters)
+}

internal/app/task.go

@@ -0,0 +1,75 @@
+package app
+
+import (
+	"log"
+	"sync"
+	"time"
+
+	"github.com/zu1k/proxypool/internal/cache"
+	"github.com/zu1k/proxypool/pkg/provider"
+	"github.com/zu1k/proxypool/pkg/proxy"
+)
+
+var location, _ = time.LoadLocation("PRC")
+
+func CrawlGo() {
+	wg := &sync.WaitGroup{}
+	var pc = make(chan proxy.Proxy)
+	for _, g := range Getters {
+		wg.Add(1)
+		go g.Get2Chan(pc, wg)
+	}
+	proxies := cache.GetProxies("allproxies")
+	go func() {
+		wg.Wait()
+		close(pc)
+	}()
+	for node := range pc {
+		if node != nil {
+			proxies = append(proxies, node)
+		}
+	}
+	// 节点去重
+	proxies = proxies.Deduplication()
+	log.Println("CrawlGo node count:", len(proxies))
+	proxies = provider.Clash{
+		provider.Base{
+			Proxies: &proxies,
+		},
+	}.CleanProxies()
+	log.Println("CrawlGo cleaned node count:", len(proxies))
+	proxies.NameAddCounrty().Sort().NameAddIndex().NameAddTG()
+	log.Println("Proxy rename DONE!")
+
+	cache.SetProxies("allproxies", proxies)
+	cache.AllProxiesCount = proxies.Len()
+	log.Println("AllProxiesCount:", cache.AllProxiesCount)
+	cache.SSProxiesCount = proxies.TypeLen("ss")
+	log.Println("SSProxiesCount:", cache.SSProxiesCount)
+	cache.SSRProxiesCount = proxies.TypeLen("ssr")
+	log.Println("SSRProxiesCount:", cache.SSRProxiesCount)
+	cache.VmessProxiesCount = proxies.TypeLen("vmess")
+	log.Println("VmessProxiesCount:", cache.VmessProxiesCount)
+	cache.TrojanProxiesCount = proxies.TypeLen("trojan")
+	log.Println("TrojanProxiesCount:", cache.TrojanProxiesCount)
+	cache.LastCrawlTime = time.Now().In(location).Format("2006-01-02 15:04:05")
+
+	// 可用性检测
+	log.Println("Now proceed proxy health check...")
+	proxies = proxy.CleanBadProxiesWithGrpool(proxies)
+	log.Println("CrawlGo clash usable node count:", len(proxies))
+	proxies.NameReIndex()
+	cache.SetProxies("proxies", proxies)
+	cache.UsefullProxiesCount = proxies.Len()
+
+	cache.SetString("clashproxies", provider.Clash{
+		provider.Base{
+			Proxies: &proxies,
+		},
+	}.Provide())
+	cache.SetString("surgeproxies", provider.Surge{
+		provider.Base{
+			Proxies: &proxies,
+		},
+	}.Provide())
+}

internal/bindata/geoip/geoip.go

@@ -0,0 +1,213 @@
+// Code generated for package bingeoip by go-bindata DO NOT EDIT. (@generated)
+// sources:
+// assets/GeoLite2-City.mmdb
+// assets/flags.json
+package bingeoip
+
+import (
+	"fmt"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"strings"
+)
+
+// bindataRead reads the given file from disk. It returns an error on failure.
+func bindataRead(path, name string) ([]byte, error) {
+	buf, err := ioutil.ReadFile(path)
+	if err != nil {
+		err = fmt.Errorf("Error reading asset %s at %s: %v", name, path, err)
+	}
+	return buf, err
+}
+
+type asset struct {
+	bytes []byte
+	info  os.FileInfo
+}
+
+// assetsGeolite2CityMmdb reads file data from disk. It returns an error on failure.
+func assetsGeolite2CityMmdb() (*asset, error) {
+	path := "assets/GeoLite2-City.mmdb"
+	name := "assets/GeoLite2-City.mmdb"
+	bytes, err := bindataRead(path, name)
+	if err != nil {
+		return nil, err
+	}
+
+	fi, err := os.Stat(path)
+	if err != nil {
+		err = fmt.Errorf("Error reading asset info %s at %s: %v", name, path, err)
+	}
+
+	a := &asset{bytes: bytes, info: fi}
+	return a, err
+}
+
+// assetsFlagsJson reads file data from disk. It returns an error on failure.
+func assetsFlagsJson() (*asset, error) {
+	path := "assets/flags.json"
+	name := "assets/flags.json"
+	bytes, err := bindataRead(path, name)
+	if err != nil {
+		return nil, err
+	}
+
+	fi, err := os.Stat(path)
+	if err != nil {
+		err = fmt.Errorf("Error reading asset info %s at %s: %v", name, path, err)
+	}
+
+	a := &asset{bytes: bytes, info: fi}
+	return a, err
+}
+
+// Asset loads and returns the asset for the given name.
+// It returns an error if the asset could not be found or
+// could not be loaded.
+func Asset(name string) ([]byte, error) {
+	cannonicalName := strings.Replace(name, "\\", "/", -1)
+	if f, ok := _bindata[cannonicalName]; ok {
+		a, err := f()
+		if err != nil {
+			return nil, fmt.Errorf("Asset %s can't read by error: %v", name, err)
+		}
+		return a.bytes, nil
+	}
+	return nil, fmt.Errorf("Asset %s not found", name)
+}
+
+// MustAsset is like Asset but panics when Asset would return an error.
+// It simplifies safe initialization of global variables.
+func MustAsset(name string) []byte {
+	a, err := Asset(name)
+	if err != nil {
+		panic("asset: Asset(" + name + "): " + err.Error())
+	}
+
+	return a
+}
+
+// AssetInfo loads and returns the asset info for the given name.
+// It returns an error if the asset could not be found or
+// could not be loaded.
+func AssetInfo(name string) (os.FileInfo, error) {
+	cannonicalName := strings.Replace(name, "\\", "/", -1)
+	if f, ok := _bindata[cannonicalName]; ok {
+		a, err := f()
+		if err != nil {
+			return nil, fmt.Errorf("AssetInfo %s can't read by error: %v", name, err)
+		}
+		return a.info, nil
+	}
+	return nil, fmt.Errorf("AssetInfo %s not found", name)
+}
+
+// AssetNames returns the names of the assets.
+func AssetNames() []string {
+	names := make([]string, 0, len(_bindata))
+	for name := range _bindata {
+		names = append(names, name)
+	}
+	return names
+}
+
+// _bindata is a table, holding each asset generator, mapped to its name.
+var _bindata = map[string]func() (*asset, error){
+	"assets/GeoLite2-City.mmdb": assetsGeolite2CityMmdb,
+	"assets/flags.json":         assetsFlagsJson,
+}
+
+// AssetDir returns the file names below a certain
+// directory embedded in the file by go-bindata.
+// For example if you run go-bindata on data/... and data contains the
+// following hierarchy:
+//     data/
+//       foo.txt
+//       img/
+//         a.png
+//         b.png
+// then AssetDir("data") would return []string{"foo.txt", "img"}
+// AssetDir("data/img") would return []string{"a.png", "b.png"}
+// AssetDir("foo.txt") and AssetDir("notexist") would return an error
+// AssetDir("") will return []string{"data"}.
+func AssetDir(name string) ([]string, error) {
+	node := _bintree
+	if len(name) != 0 {
+		cannonicalName := strings.Replace(name, "\\", "/", -1)
+		pathList := strings.Split(cannonicalName, "/")
+		for _, p := range pathList {
+			node = node.Children[p]
+			if node == nil {
+				return nil, fmt.Errorf("Asset %s not found", name)
+			}
+		}
+	}
+	if node.Func != nil {
+		return nil, fmt.Errorf("Asset %s not found", name)
+	}
+	rv := make([]string, 0, len(node.Children))
+	for childName := range node.Children {
+		rv = append(rv, childName)
+	}
+	return rv, nil
+}
+
+type bintree struct {
+	Func     func() (*asset, error)
+	Children map[string]*bintree
+}
+
+var _bintree = &bintree{nil, map[string]*bintree{
+	"assets": &bintree{nil, map[string]*bintree{
+		"GeoLite2-City.mmdb": &bintree{assetsGeolite2CityMmdb, map[string]*bintree{}},
+		"flags.json":         &bintree{assetsFlagsJson, map[string]*bintree{}},
+	}},
+}}
+
+// RestoreAsset restores an asset under the given directory
+func RestoreAsset(dir, name string) error {
+	data, err := Asset(name)
+	if err != nil {
+		return err
+	}
+	info, err := AssetInfo(name)
+	if err != nil {
+		return err
+	}
+	err = os.MkdirAll(_filePath(dir, filepath.Dir(name)), os.FileMode(0755))
+	if err != nil {
+		return err
+	}
+	err = ioutil.WriteFile(_filePath(dir, name), data, info.Mode())
+	if err != nil {
+		return err
+	}
+	err = os.Chtimes(_filePath(dir, name), info.ModTime(), info.ModTime())
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+// RestoreAssets restores an asset under the given directory recursively
+func RestoreAssets(dir, name string) error {
+	children, err := AssetDir(name)
+	// File
+	if err != nil {
+		return RestoreAsset(dir, name)
+	}
+	// Dir
+	for _, child := range children {
+		err = RestoreAssets(dir, filepath.Join(name, child))
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func _filePath(dir, name string) string {
+	cannonicalName := strings.Replace(name, "\\", "/", -1)
+	return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...)
+}

internal/cache/cache.go

@@ -1,11 +1,10 @@
 package cache
 
 import (
-	"log"
 	"time"
 
 	"github.com/patrickmn/go-cache"
-	"github.com/zu1k/proxypool/proxy"
+	"github.com/zu1k/proxypool/pkg/proxy"
 )
 
 var c = cache.New(cache.NoExpiration, 10*time.Minute)
@@ -13,10 +12,8 @@ var c = cache.New(cache.NoExpiration, 10*time.Minute)
 func GetProxies(key string) proxy.ProxyList {
 	result, found := c.Get(key)
 	if found {
-		log.Println(len(result.(proxy.ProxyList)))
 		return result.(proxy.ProxyList)
 	}
-	log.Println("Cache not found")
 	return nil
 }
 

internal/cache/vars.go

@@ -0,0 +1,15 @@
+package cache
+
+var (
+	GettersCount = 0
+
+	AllProxiesCount    = 0
+	SSRProxiesCount    = 0
+	SSProxiesCount     = 0
+	VmessProxiesCount  = 0
+	TrojanProxiesCount = 0
+
+	UsefullProxiesCount = 0
+
+	LastCrawlTime = "程序刚升级完成，正在爬取中..."
+)

internal/cloudflare/cache.go

@@ -0,0 +1,30 @@
+package cloudflare
+
+import (
+	"fmt"
+	"log"
+
+	"github.com/cloudflare/cloudflare-go"
+	"github.com/zu1k/proxypool/config"
+)
+
+func test() {
+	api, err := cloudflare.New(config.Config.CFKey, config.Config.CFKey)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	// Fetch the zone ID
+	id, err := api.ZoneIDByName(config.Config.Domain)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	// Fetch zone details
+	zone, err := api.ZoneDetails(id)
+	if err != nil {
+		log.Fatal(err)
+	}
+	// Print zone details
+	fmt.Println(zone)
+}

internal/cron/cron.go

@@ -0,0 +1,16 @@
+package cron
+
+import (
+	"github.com/jasonlvhit/gocron"
+	"github.com/zu1k/proxypool/internal/app"
+)
+
+func Cron() {
+	_ = gocron.Every(15).Minutes().Do(crawlTask)
+	<-gocron.Start()
+}
+
+func crawlTask() {
+	_ = app.InitConfigAndGetters("")
+	app.CrawlGo()
+}

main.go

@@ -3,48 +3,34 @@ package main
 import (
 	"flag"
 	"fmt"
-	"net/http"
-	_ "net/http/pprof"
+	"os"
 
-	_ "github.com/mkevac/debugcharts"
 	"github.com/zu1k/proxypool/api"
-	"github.com/zu1k/proxypool/app"
-	"github.com/zu1k/proxypool/proxy"
+	"github.com/zu1k/proxypool/internal/app"
+	"github.com/zu1k/proxypool/internal/cron"
+	"github.com/zu1k/proxypool/pkg/proxy"
 )
 
-var (
-	debugMode      = false
-	configFilePath = ""
-)
+var configFilePath = ""
 
 func main() {
-	flag.StringVar(&configFilePath, "c", "", "path to config file: source.yaml")
-	flag.BoolVar(&debugMode, "d", false, "debug mode")
+	flag.StringVar(&configFilePath, "c", "", "path to config file: config.yaml")
 	flag.Parse()
 
-	if debugMode {
-		go pprof()
-	}
-
 	if configFilePath == "" {
-		app.NeedFetchNewConfigFile = true
-	} else {
-		err := app.InitConfigAndGetters(configFilePath)
-		if err != nil {
-			fmt.Println(err)
-		}
+		configFilePath = os.Getenv("CONFIG_FILE")
+	}
+	if configFilePath == "" {
+		configFilePath = "config.yaml"
+	}
+	err := app.InitConfigAndGetters(configFilePath)
+	if err != nil {
+		panic(err)
 	}
-	proxy.InitGeoIpDB()
 
-	go app.Cron()
+	proxy.InitGeoIpDB()
 	fmt.Println("Do the first crawl...")
 	go app.CrawlGo()
+	go cron.Cron()
 	api.Run()
 }
-
-func pprof() {
-	ip := "127.0.0.1:6060"
-	if err := http.ListenAndServe(ip, nil); err != nil {
-		fmt.Printf("start pprof failed on %s\n", ip)
-	}
-}

pkg/getter/base.go

@@ -5,8 +5,8 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/zu1k/proxypool/proxy"
-	"github.com/zu1k/proxypool/tool"
+	"github.com/zu1k/proxypool/pkg/proxy"
+	"github.com/zu1k/proxypool/pkg/tool"
 )
 
 type Getter interface {
@@ -39,6 +39,8 @@ func String2Proxy(link string) proxy.Proxy {
 		data, err = proxy.ParseVmessLink(link)
 	} else if strings.HasPrefix(link, "ss://") {
 		data, err = proxy.ParseSSLink(link)
+	} else if strings.HasPrefix(link, "trojan://") {
+		data, err = proxy.ParseTrojanLink(link)
 	}
 	if err != nil {
 		return nil
@@ -58,6 +60,7 @@ func GrepLinksFromString(text string) []string {
 	results := proxy.GrepSSRLinkFromString(text)
 	results = append(results, proxy.GrepVmessLinkFromString(text)...)
 	results = append(results, proxy.GrepSSLinkFromString(text)...)
+	results = append(results, proxy.GrepTrojanLinkFromString(text)...)
 	return results
 }
 

pkg/getter/subscribe.go

@@ -2,11 +2,12 @@ package getter
 
 import (
 	"io/ioutil"
+	"log"
 	"strings"
 	"sync"
 
-	"github.com/zu1k/proxypool/proxy"
-	"github.com/zu1k/proxypool/tool"
+	"github.com/zu1k/proxypool/pkg/proxy"
+	"github.com/zu1k/proxypool/pkg/tool"
 )
 
 func init() {
@@ -41,6 +42,7 @@ func (s *Subscribe) Get() proxy.ProxyList {
 func (s *Subscribe) Get2Chan(pc chan proxy.Proxy, wg *sync.WaitGroup) {
 	defer wg.Done()
 	nodes := s.Get()
+	log.Printf("STATISTIC: Subscribe\tcount=%d\turl=%s\n", len(nodes), s.Url)
 	for _, node := range nodes {
 		pc <- node
 	}

pkg/getter/tgchannel.go

@@ -2,11 +2,12 @@ package getter
 
 import (
 	"fmt"
+	"log"
 	"sync"
 
 	"github.com/gocolly/colly"
-	"github.com/zu1k/proxypool/proxy"
-	"github.com/zu1k/proxypool/tool"
+	"github.com/zu1k/proxypool/pkg/proxy"
+	"github.com/zu1k/proxypool/pkg/tool"
 )
 
 func init() {
@@ -40,7 +41,7 @@ func NewTGChannelGetter(options tool.Options) (getter Getter, err error) {
 			return nil, err
 		}
 		return &TGChannelGetter{
-			c:         colly.NewCollector(),
+			c:         tool.GetColly(),
 			NumNeeded: t,
 			Url:       "https://t.me/s/" + url,
 		}, nil
@@ -49,10 +50,16 @@ func NewTGChannelGetter(options tool.Options) (getter Getter, err error) {
 }
 
 func (g *TGChannelGetter) Get() proxy.ProxyList {
+	result := make(proxy.ProxyList, 0)
 	g.results = make([]string, 0)
 	// 找到所有的文字消息
 	g.c.OnHTML("div.tgme_widget_message_text", func(e *colly.HTMLElement) {
 		g.results = append(g.results, GrepLinksFromString(e.Text)...)
+		// 抓取到http链接，有可能是订阅链接或其他链接，无论如何试一下
+		subUrls := urlRe.FindAllString(e.Text, -1)
+		for _, url := range subUrls {
+			result = append(result, (&Subscribe{Url: url}).Get()...)
+		}
 	})
 
 	// 找到之前消息页面的链接，加入访问队列
@@ -67,13 +74,13 @@ func (g *TGChannelGetter) Get() proxy.ProxyList {
 	if err != nil {
 		_ = fmt.Errorf("%s", err.Error())
 	}
-
-	return StringArray2ProxyArray(g.results)
+	return append(result, StringArray2ProxyArray(g.results)...)
 }
 
 func (g *TGChannelGetter) Get2Chan(pc chan proxy.Proxy, wg *sync.WaitGroup) {
 	defer wg.Done()
 	nodes := g.Get()
+	log.Printf("STATISTIC: TGChannel\tcount=%d\turl=%s\n", len(nodes), g.Url)
 	for _, node := range nodes {
 		pc <- node
 	}

pkg/getter/web_fanqiangdang.go

@@ -2,11 +2,13 @@ package getter
 
 import (
 	"fmt"
+	"log"
+	"strings"
 	"sync"
 
 	"github.com/gocolly/colly"
-	"github.com/zu1k/proxypool/proxy"
-	"github.com/zu1k/proxypool/tool"
+	"github.com/zu1k/proxypool/pkg/proxy"
+	"github.com/zu1k/proxypool/pkg/tool"
 )
 
 func init() {
@@ -14,26 +16,12 @@ func init() {
 }
 
 type WebFanqiangdang struct {
-	c         *colly.Collector
-	NumNeeded int
-	Url       string
-	results   []string
+	c       *colly.Collector
+	Url     string
+	results proxy.ProxyList
 }
 
 func NewWebFanqiangdangGetter(options tool.Options) (getter Getter, err error) {
-	num, found := options["num"]
-
-	t := 200
-	switch num.(type) {
-	case int:
-		t = num.(int)
-	case float64:
-		t = int(num.(float64))
-	}
-
-	if !found || t <= 0 {
-		t = 200
-	}
 	urlInterface, found := options["url"]
 	if found {
 		url, err := AssertTypeStringNotNull(urlInterface)
@@ -41,40 +29,43 @@ func NewWebFanqiangdangGetter(options tool.Options) (getter Getter, err error) {
 			return nil, err
 		}
 		return &WebFanqiangdang{
-			c:         colly.NewCollector(),
-			NumNeeded: t,
-			Url:       url,
+			c:   colly.NewCollector(),
+			Url: url,
 		}, nil
 	}
 	return nil, ErrorUrlNotFound
 }
 
 func (w *WebFanqiangdang) Get() proxy.ProxyList {
-	w.results = make([]string, 0)
-	// 找到所有的文字消息
+	w.results = make(proxy.ProxyList, 0)
 	w.c.OnHTML("td.t_f", func(e *colly.HTMLElement) {
-		w.results = append(w.results, GrepLinksFromString(e.Text)...)
-	})
-
-	// 从订阅中取出每一页，因为是订阅，所以都比较新
-	w.c.OnXML("//item//link", func(e *colly.XMLElement) {
-		if len(w.results) < w.NumNeeded {
-			_ = e.Request.Visit(e.Text)
+		w.results = append(w.results, FuzzParseProxyFromString(e.Text)...)
+		subUrls := urlRe.FindAllString(e.Text, -1)
+		for _, url := range subUrls {
+			w.results = append(w.results, (&Subscribe{Url: url}).Get()...)
 		}
 	})
 
-	w.results = make([]string, 0)
+	w.c.OnHTML("th.new>a[href]", func(e *colly.HTMLElement) {
+		url := e.Attr("href")
+		if strings.HasPrefix(url, "https://fanqiangdang.com/thread") {
+			_ = e.Request.Visit(url)
+		}
+	})
+
+	w.results = make(proxy.ProxyList, 0)
 	err := w.c.Visit(w.Url)
 	if err != nil {
 		_ = fmt.Errorf("%s", err.Error())
 	}
 
-	return StringArray2ProxyArray(w.results)
+	return w.results
 }
 
 func (w *WebFanqiangdang) Get2Chan(pc chan proxy.Proxy, wg *sync.WaitGroup) {
 	defer wg.Done()
 	nodes := w.Get()
+	log.Printf("STATISTIC: Fanqiangdang\tcount=%d\turl=%s\n", len(nodes), w.Url)
 	for _, node := range nodes {
 		pc <- node
 	}

pkg/getter/web_free_ssr_xyz.go

@@ -3,10 +3,11 @@ package getter
 import (
 	"encoding/json"
 	"io/ioutil"
+	"log"
 	"sync"
 
-	"github.com/zu1k/proxypool/proxy"
-	"github.com/zu1k/proxypool/tool"
+	"github.com/zu1k/proxypool/pkg/proxy"
+	"github.com/zu1k/proxypool/pkg/tool"
 )
 
 func init() {
@@ -34,6 +35,7 @@ func (w *WebFreessrXyz) Get() proxy.ProxyList {
 func (w *WebFreessrXyz) Get2Chan(pc chan proxy.Proxy, wg *sync.WaitGroup) {
 	defer wg.Done()
 	nodes := w.Get()
+	log.Printf("STATISTIC: FreeSSRxyz\tcount=%d\turl=%s\n", len(nodes), "api.free-ssr.xyz")
 	for _, node := range nodes {
 		pc <- node
 	}

pkg/getter/web_fuzz.go

@@ -2,10 +2,11 @@ package getter
 
 import (
 	"io/ioutil"
+	"log"
 	"sync"
 
-	"github.com/zu1k/proxypool/proxy"
-	"github.com/zu1k/proxypool/tool"
+	"github.com/zu1k/proxypool/pkg/proxy"
+	"github.com/zu1k/proxypool/pkg/tool"
 )
 
 func init() {
@@ -33,6 +34,7 @@ func (w *WebFuzz) Get() proxy.ProxyList {
 func (w *WebFuzz) Get2Chan(pc chan proxy.Proxy, wg *sync.WaitGroup) {
 	defer wg.Done()
 	nodes := w.Get()
+	log.Printf("STATISTIC: WebFuzz\tcount=%d\turl=%s\n", len(nodes), w.Url)
 	for _, node := range nodes {
 		pc <- node
 	}

pkg/getter/web_fuzz_sub.go

@@ -2,11 +2,12 @@ package getter
 
 import (
 	"io/ioutil"
+	"log"
 	"regexp"
 	"sync"
 
-	"github.com/zu1k/proxypool/proxy"
-	"github.com/zu1k/proxypool/tool"
+	"github.com/zu1k/proxypool/pkg/proxy"
+	"github.com/zu1k/proxypool/pkg/tool"
 )
 
 func init() {
@@ -39,6 +40,7 @@ func (w *WebFuzzSub) Get() proxy.ProxyList {
 func (w *WebFuzzSub) Get2Chan(pc chan proxy.Proxy, wg *sync.WaitGroup) {
 	defer wg.Done()
 	nodes := w.Get()
+	log.Printf("STATISTIC: WebFuzzSub\tcount=%d\turl=%s\n", len(nodes), w.Url)
 	for _, node := range nodes {
 		pc <- node
 	}
@@ -80,7 +82,7 @@ const (
 	domainPattern = `[a-zA-Z0-9][a-zA-Z0-9_-]{0,62}(\.[a-zA-Z0-9][a-zA-Z0-9_-]{0,62})*(\.[a-zA-Z][a-zA-Z0-9]{0,10}){1}`
 
 	// 匹配 URL
-	urlPattern = `((https|http|ftp|rtsp|mms)?://)?` + // 协议
+	urlPattern = `((https|http)?://)?` + // 协议
 		`(([0-9a-zA-Z]+:)?[0-9a-zA-Z_-]+@)?` + // pwd:user@
 		"(" + ipPattern + "|(" + domainPattern + "))" + // IP 或域名
 		`(:\d{1,5})?` + // 端口

pkg/provider/base.go

@@ -0,0 +1,89 @@
+package provider
+
+import (
+	"strings"
+
+	"github.com/zu1k/proxypool/pkg/proxy"
+)
+
+type Provider interface {
+	Provide() string
+}
+
+func checkInList(list []string, item string) bool {
+	for _, i := range list {
+		if item == i {
+			return true
+		}
+	}
+	return false
+}
+
+type Base struct {
+	Proxies    *proxy.ProxyList `yaml:"proxies"`
+	Types      string           `yaml:"type"`
+	Country    string           `yaml:"country"`
+	NotCountry string           `yaml:"not_country"`
+}
+
+func (b *Base) preFilter() {
+	proxies := make(proxy.ProxyList, 0)
+
+	needFilterType := true
+	needFilterCountry := true
+	needFilterNotCountry := true
+	if b.Types == "" || b.Types == "all" {
+		needFilterType = false
+	}
+	if b.Country == "" || b.Country == "all" {
+		needFilterCountry = false
+	}
+	if b.NotCountry == "" {
+		needFilterNotCountry = false
+	}
+	types := strings.Split(b.Types, ",")
+	countries := strings.Split(b.Country, ",")
+	notCountries := strings.Split(b.NotCountry, ",")
+
+	bProxies := *b.Proxies
+	for _, p := range bProxies {
+		if needFilterType {
+			typeOk := false
+			for _, t := range types {
+				if p.TypeName() == t {
+					typeOk = true
+					break
+				}
+			}
+			if !typeOk {
+				goto exclude
+			}
+		}
+
+		if needFilterNotCountry {
+			for _, c := range notCountries {
+				if strings.Contains(p.BaseInfo().Name, c) {
+					goto exclude
+				}
+			}
+		}
+
+		if needFilterCountry {
+			countryOk := false
+			for _, c := range countries {
+				if strings.Contains(p.BaseInfo().Name, c) {
+					countryOk = true
+					break
+				}
+			}
+			if !countryOk {
+				goto exclude
+			}
+		}
+
+		proxies = append(proxies, p)
+	exclude:
+	}
+
+	b.Proxies = &proxies
+}

pkg/provider/clash.go

@@ -3,17 +3,16 @@ package provider
 import (
 	"strings"
 
-	"github.com/zu1k/proxypool/proxy"
+	"github.com/zu1k/proxypool/pkg/proxy"
 )
 
 type Clash struct {
-	Proxies proxy.ProxyList `yaml:"proxies"`
-	Types   string          `yaml:"type"`
+	Base
 }
 
 func (c Clash) CleanProxies() (proxies proxy.ProxyList) {
 	proxies = make(proxy.ProxyList, 0)
-	for _, p := range c.Proxies {
+	for _, p := range *c.Proxies {
 		if checkClashSupport(p) {
 			proxies = append(proxies, p)
 		}
@@ -22,28 +21,15 @@ func (c Clash) CleanProxies() (proxies proxy.ProxyList) {
 }
 
 func (c Clash) Provide() string {
+	c.preFilter()
+
 	var resultBuilder strings.Builder
 	resultBuilder.WriteString("proxies:\n")
-
-	if c.Types == "" || c.Types == "all" {
-		for _, p := range c.Proxies {
-			if checkClashSupport(p) {
-				resultBuilder.WriteString(p.ToClash() + "\n")
-			}
-		}
-	} else {
-		types := strings.Split(c.Types, ",")
-		for _, p := range c.Proxies {
-			if checkClashSupport(p) {
-				for _, t := range types {
-					if p.TypeName() == t {
-						resultBuilder.WriteString(p.ToClash() + "\n")
-					}
-				}
-			}
+	for _, p := range *c.Proxies {
+		if checkClashSupport(p) {
+			resultBuilder.WriteString(p.ToClash() + "\n")
 		}
 	}
-
 	return resultBuilder.String()
 }
 
@@ -64,6 +50,8 @@ func checkClashSupport(p proxy.Proxy) bool {
 		if checkInList(ssCipherList, ss.Cipher) {
 			return true
 		}
+	case "trojan":
+		return true
 	default:
 		return false
 	}

pkg/provider/ssrsub.go

@@ -0,0 +1,21 @@
+package provider
+
+import (
+	"strings"
+
+	"github.com/zu1k/proxypool/pkg/tool"
+)
+
+type SSRSub struct {
+	Base
+}
+
+func (sub SSRSub) Provide() string {
+	sub.Types = "ssr"
+	sub.preFilter()
+	var resultBuilder strings.Builder
+	for _, p := range *sub.Proxies {
+		resultBuilder.WriteString(p.Link() + "\n")
+	}
+	return tool.Base64EncodeString(resultBuilder.String(), false)
+}

pkg/provider/sssub.go

@@ -0,0 +1,45 @@
+package provider
+
+import (
+	"encoding/json"
+	"strconv"
+
+	"github.com/zu1k/proxypool/pkg/proxy"
+)
+
+type SSSub struct {
+	Base
+}
+
+type ssJson struct {
+	Remarks    string                 `json:"remarks"`
+	Server     string                 `json:"server"`
+	ServerPort string                 `json:"server_port"`
+	Method     string                 `json:"method"`
+	Password   string                 `json:"password"`
+	Plugin     string                 `json:"plugin"`
+	PluginOpts map[string]interface{} `json:"plugin_opts"`
+}
+
+func (sub SSSub) Provide() string {
+	sub.Types = "ss"
+	sub.preFilter()
+	proxies := make([]ssJson, 0, sub.Proxies.Len())
+	for _, p := range *sub.Proxies {
+		pp := p.(*proxy.Shadowsocks)
+		proxies = append(proxies, ssJson{
+			Remarks:    pp.Name,
+			Server:     pp.Server,
+			ServerPort: strconv.Itoa(pp.Port),
+			Method:     pp.Cipher,
+			Password:   pp.Password,
+			Plugin:     pp.Plugin,
+			PluginOpts: pp.PluginOpts,
+		})
+	}
+	text, err := json.Marshal(proxies)
+	if err != nil {
+		return ""
+	}
+	return string(text)
+}

pkg/provider/surge.go

@@ -3,22 +3,22 @@ package provider
 import (
 	"strings"
 
-	"github.com/zu1k/proxypool/proxy"
+	"github.com/zu1k/proxypool/pkg/proxy"
 )
 
 type Surge struct {
-	Proxies proxy.ProxyList `yaml:"proxies"`
+	Base
 }
 
 func (s Surge) Provide() string {
-	var resultBuilder strings.Builder
+	s.preFilter()
 
-	for _, p := range s.Proxies {
+	var resultBuilder strings.Builder
+	for _, p := range *s.Proxies {
 		if checkSurgeSupport(p) {
-			resultBuilder.WriteString(p.ToSurge() + "\n")
+			resultBuilder.WriteString(p.ToClash() + "\n")
 		}
 	}
-
 	return resultBuilder.String()
 }
 

pkg/provider/vmesssub.go

@@ -0,0 +1,21 @@
+package provider
+
+import (
+	"strings"
+
+	"github.com/zu1k/proxypool/pkg/tool"
+)
+
+type VmessSub struct {
+	Base
+}
+
+func (sub VmessSub) Provide() string {
+	sub.Types = "vmess"
+	sub.preFilter()
+	var resultBuilder strings.Builder
+	for _, p := range *sub.Proxies {
+		resultBuilder.WriteString(p.Link() + "\n")
+	}
+	return tool.Base64EncodeString(resultBuilder.String(), false)
+}

pkg/proxy/base.go

@@ -19,16 +19,28 @@ func (b *Base) SetName(name string) {
 	b.Name = name
 }
 
+func (b *Base) SetIP(ip string) {
+	b.Server = ip
+}
+
 func (b *Base) BaseInfo() *Base {
 	return b
 }
 
+func (b *Base) Clone() Base {
+	c := *b
+	return c
+}
+
 type Proxy interface {
 	String() string
 	ToClash() string
 	ToSurge() string
+	Link() string
 	Identifier() string
 	SetName(name string)
+	SetIP(ip string)
 	TypeName() string
 	BaseInfo() *Base
+	Clone() Proxy
 }

pkg/proxy/check.go

@@ -0,0 +1,132 @@
+package proxy
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"sync"
+	"time"
+
+	"github.com/ivpusic/grpool"
+
+	"github.com/Dreamacro/clash/adapters/outbound"
+)
+
+const defaultURLTestTimeout = time.Second * 5
+
+func testDelay(p Proxy) (delay uint16, err error) {
+	pmap := make(map[string]interface{})
+	err = json.Unmarshal([]byte(p.String()), &pmap)
+	if err != nil {
+		return
+	}
+
+	pmap["port"] = int(pmap["port"].(float64))
+	if p.TypeName() == "vmess" {
+		pmap["alterId"] = int(pmap["alterId"].(float64))
+	}
+
+	clashProxy, err := outbound.ParseProxy(pmap)
+	if err != nil {
+		fmt.Println(err.Error())
+		return
+	}
+
+	ctx, cancel := context.WithTimeout(context.Background(), defaultURLTestTimeout)
+	delay, err = clashProxy.URLTest(ctx, "http://www.gstatic.com/generate_204")
+	cancel()
+	return delay, err
+}
+
+func CleanBadProxiesWithGrpool(proxies []Proxy) (cproxies []Proxy) {
+	pool := grpool.NewPool(500, 200)
+
+	c := make(chan checkResult)
+	defer close(c)
+
+	pool.WaitCount(len(proxies))
+	go func() {
+		for _, p := range proxies {
+			pp := p
+			pool.JobQueue <- func() {
+				defer pool.JobDone()
+				delay, err := testDelay(pp)
+				if err == nil {
+					c <- checkResult{
+						name:  pp.Identifier(),
+						delay: delay,
+					}
+				}
+			}
+		}
+	}()
+	done := make(chan struct{})
+	defer close(done)
+
+	go func() {
+		pool.WaitAll()
+		pool.Release()
+		done <- struct{}{}
+	}()
+
+	okMap := make(map[string]struct{})
+	for {
+		select {
+		case r := <-c:
+			if r.delay > 0 {
+				okMap[r.name] = struct{}{}
+			}
+		case <-done:
+			cproxies = make(ProxyList, 0, 500)
+			for _, p := range proxies {
+				if _, ok := okMap[p.Identifier()]; ok {
+					cproxies = append(cproxies, p.Clone())
+				}
+			}
+			return
+		}
+	}
+}
+
+func CleanBadProxies(proxies []Proxy) (cproxies []Proxy) {
+	c := make(chan checkResult, 40)
+	wg := &sync.WaitGroup{}
+	wg.Add(len(proxies))
+	for _, p := range proxies {
+		go testProxyDelayToChan(p, c, wg)
+	}
+	go func() {
+		wg.Wait()
+		close(c)
+	}()
+
+	okMap := make(map[string]struct{})
+	for r := range c {
+		if r.delay > 0 {
+			okMap[r.name] = struct{}{}
+		}
+	}
+	cproxies = make(ProxyList, 0, 500)
+	for _, p := range proxies {
+		if _, ok := okMap[p.Identifier()]; ok {
+			cproxies = append(cproxies, p.Clone())
+		}
+	}
+	return
+}
+
+type checkResult struct {
+	name  string
+	delay uint16
+}
+
+func testProxyDelayToChan(p Proxy, c chan checkResult, wg *sync.WaitGroup) {
+	defer wg.Done()
+	delay, err := testDelay(p)
+	if err == nil {
+		c <- checkResult{
+			name:  p.Identifier(),
+			delay: delay,
+		}
+	}
+}

pkg/proxy/geoip.go

@@ -0,0 +1,105 @@
+package proxy
+
+import (
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"log"
+	"net"
+	"os"
+
+	"github.com/oschwald/geoip2-golang"
+	bingeoip "github.com/zu1k/proxypool/internal/bindata/geoip"
+)
+
+var geoIp GeoIP
+
+func InitGeoIpDB() {
+	err := bingeoip.RestoreAsset("", "assets/GeoLite2-City.mmdb")
+	if err != nil {
+		panic(err)
+	}
+	err = bingeoip.RestoreAsset("", "assets/flags.json")
+	if err != nil {
+		panic(err)
+	}
+	geoIp = NewGeoIP("assets/GeoLite2-City.mmdb", "assets/flags.json")
+}
+
+// GeoIP2
+type GeoIP struct {
+	db       *geoip2.Reader
+	emojiMap map[string]string
+}
+
+type CountryEmoji struct {
+	Code  string `json:"code"`
+	Emoji string `json:"emoji"`
+}
+
+// new geoip from db file
+func NewGeoIP(geodb, flags string) (geoip GeoIP) {
+	// 判断文件是否存在
+	_, err := os.Stat(geodb)
+	if err != nil && os.IsNotExist(err) {
+		log.Println("文件不存在，请自行下载 Geoip2 City库，并保存在", geodb)
+		os.Exit(1)
+	} else {
+		db, err := geoip2.Open(geodb)
+		if err != nil {
+			log.Fatal(err)
+		}
+		geoip.db = db
+	}
+
+	_, err = os.Stat(flags)
+	if err != nil && os.IsNotExist(err) {
+		log.Println("flags 文件不存在，请自行下载 flags.json，并保存在", flags)
+		os.Exit(1)
+	} else {
+		data, err := ioutil.ReadFile(flags)
+		if err != nil {
+			log.Fatal(err)
+			return
+		}
+		var countryEmojiList = make([]CountryEmoji, 0)
+		err = json.Unmarshal(data, &countryEmojiList)
+		if err != nil {
+			log.Fatalln(err.Error())
+			return
+		}
+
+		emojiMap := make(map[string]string)
+		for _, i := range countryEmojiList {
+			emojiMap[i.Code] = i.Emoji
+		}
+		geoip.emojiMap = emojiMap
+	}
+	return
+}
+
+// find ip info
+func (g GeoIP) Find(ipORdomain string) (ip, country string, err error) {
+	ips, err := net.LookupIP(ipORdomain)
+	if err != nil {
+		return "", "", err
+	}
+	ip = ips[0].String()
+
+	var record *geoip2.City
+	record, err = g.db.City(ips[0])
+	if err != nil {
+		return
+	}
+	countryIsoCode := record.Country.IsoCode
+	if countryIsoCode == "" {
+		country = fmt.Sprintf("🏁 ZZ")
+	}
+	emoji, found := g.emojiMap[countryIsoCode]
+	if found {
+		country = fmt.Sprintf("%v %v", emoji, countryIsoCode)
+	} else {
+		country = fmt.Sprintf("🏁 ZZ")
+	}
+	return
+}

pkg/proxy/link_test.go

@@ -0,0 +1,62 @@
+package proxy
+
+import (
+	"fmt"
+	"testing"
+)
+
+func TestSSLink(t *testing.T) {
+	ss, err := ParseSSLink("ss://YWVzLTI1Ni1jZmI6ZUlXMERuazY5NDU0ZTZuU3d1c3B2OURtUzIwMXRRMERAMTcyLjEwNC4xNjEuNTQ6ODA5OQ==#翻墙党223.13新加坡")
+	if err != nil {
+		t.Error(err)
+	}
+	fmt.Println(ss)
+	fmt.Println(ss.Link())
+	ss, err = ParseSSLink(ss.Link())
+	if err != nil {
+		t.Error(err)
+	}
+	fmt.Println(ss)
+}
+
+func TestSSRLink(t *testing.T) {
+	ssr, err := ParseSSRLink("ssr://MTcyLjEwNC4xNjEuNTQ6ODA5OTpvcmlnaW46YWVzLTI1Ni1jZmI6cGxhaW46WlVsWE1FUnVhelk1TkRVMFpUWnVVM2QxYzNCMk9VUnRVekl3TVhSUk1FUT0vP29iZnNwYXJhbT0mcHJvdG9wYXJhbT0mcmVtYXJrcz01Ny03NWFLWjVZV2FNakl6TGpFejVwYXc1WXFnNVoyaCZncm91cD01cGF3NVlxZzVaMmg=")
+	if err != nil {
+		t.Error(err)
+	}
+	fmt.Println(ssr)
+	fmt.Println(ssr.Link())
+	ssr, err = ParseSSRLink(ssr.Link())
+	if err != nil {
+		t.Error(err)
+	}
+	fmt.Println(ssr)
+}
+
+func TestTrojanLink(t *testing.T) {
+	trojan, err := ParseTrojanLink("trojan://65474277@sqcu.hostmsu.ru:55551?allowinsecure=0&peer=mza.hkfq.xyz&mux=1&ws=0&wspath=&wshost=&ss=0&ssmethod=aes-128-gcm&sspasswd=&group=#%E9%A6%99%E6%B8%AFCN2-MZA%E8%8A%82%E7%82%B9-%E5%AE%BF%E8%BF%81%E8%81%94%E9%80%9A%E4%B8%AD%E8%BD%AC")
+	if err != nil {
+		t.Error(err)
+	}
+	fmt.Println(trojan)
+	fmt.Println(trojan.Link())
+	trojan, err = ParseTrojanLink(trojan.Link())
+	if err != nil {
+		t.Error(err)
+	}
+	fmt.Println(trojan)
+}
+
+func TestVmessLink(t *testing.T) {
+	v, err := ParseVmessLink("vmess://ew0KICAidiI6ICIyIiwNCiAgInBzIjogIuW+ruS/oeWFrOS8l+WPtyDlpJrlvannmoTlpKfljYPkuJbnlYwiLA0KICAiYWRkIjogInMyNzEuc25vZGUueHl6IiwNCiAgInBvcnQiOiAiNDQzIiwNCiAgImlkIjogIjZhOTAwZDYzLWNiOTItMzVhMC1hZWYwLTNhMGMxMWFhODUyMyIsDQogICJhaWQiOiAiMSIsDQogICJuZXQiOiAid3MiLA0KICAidHlwZSI6ICJub25lIiwNCiAgImhvc3QiOiAiczI3MS5zbm9kZS54eXoiLA0KICAicGF0aCI6ICIvcGFuZWwiLA0KICAidGxzIjogInRscyINCn0=")
+	if err != nil {
+		t.Error(err)
+	}
+	fmt.Println(v)
+	fmt.Println(v.Link())
+	v, err = ParseVmessLink(v.Link())
+	if err != nil {
+		t.Error(err)
+	}
+	fmt.Println(v)
+}

pkg/proxy/proxies.go

@@ -0,0 +1,134 @@
+package proxy
+
+import (
+	"fmt"
+	"sort"
+	"strings"
+	"sync"
+)
+
+type ProxyList []Proxy
+
+func (ps ProxyList) Len() int {
+	return len(ps)
+}
+
+func (ps ProxyList) TypeLen(t string) int {
+	l := 0
+	for _, p := range ps {
+		if p.TypeName() == t {
+			l++
+		}
+	}
+	return l
+}
+
+var sortType = make(map[string]int)
+
+func init() {
+	sortType["ss"] = 1
+	sortType["ssr"] = 2
+	sortType["vmess"] = 3
+	sortType["trojan"] = 4
+}
+
+func (ps ProxyList) Less(i, j int) bool {
+	if ps[i].BaseInfo().Name == ps[j].BaseInfo().Name {
+		return sortType[ps[i].BaseInfo().Type] < sortType[ps[j].BaseInfo().Type]
+	} else {
+		return ps[i].BaseInfo().Name < ps[j].BaseInfo().Name
+	}
+}
+
+func (ps ProxyList) Swap(i, j int) {
+	ps[i], ps[j] = ps[j], ps[i]
+}
+
+func (ps ProxyList) Deduplication() ProxyList {
+	result := make(ProxyList, 0, len(ps))
+	temp := map[string]struct{}{}
+	for _, item := range ps {
+		if item != nil {
+			if _, ok := temp[item.Identifier()]; !ok {
+				temp[item.Identifier()] = struct{}{}
+				result = append(result, item)
+			}
+		}
+	}
+	return result
+}
+
+func (ps ProxyList) Sort() ProxyList {
+	sort.Sort(ps)
+	return ps
+}
+
+func (ps ProxyList) NameAddCounrty() ProxyList {
+	num := len(ps)
+	wg := &sync.WaitGroup{}
+	wg.Add(num)
+	for i := 0; i < num; i++ {
+		ii := i
+		go func() {
+			defer wg.Done()
+			_, country, err := geoIp.Find(ps[ii].BaseInfo().Server)
+			if err != nil {
+				country = "🏁 ZZ"
+			}
+			ps[ii].SetName(fmt.Sprintf("%s", country))
+			//ps[ii].SetIP(ip)
+		}()
+	}
+	wg.Wait()
+	return ps
+}
+
+func (ps ProxyList) NameAddIndex() ProxyList {
+	num := len(ps)
+	for i := 0; i < num; i++ {
+		ps[i].SetName(fmt.Sprintf("%s_%+02v", ps[i].BaseInfo().Name, i+1))
+	}
+	return ps
+}
+
+func (ps ProxyList) NameReIndex() ProxyList {
+	num := len(ps)
+	for i := 0; i < num; i++ {
+		originName := ps[i].BaseInfo().Name
+		country := strings.SplitN(originName, "_", 2)[0]
+		ps[i].SetName(fmt.Sprintf("%s_%+02v", country, i+1))
+	}
+	return ps
+}
+
+func (ps ProxyList) NameAddTG() ProxyList {
+	num := len(ps)
+	for i := 0; i < num; i++ {
+		ps[i].SetName(fmt.Sprintf("%s %s", ps[i].BaseInfo().Name, "@peekfun"))
+	}
+	return ps
+}
+
+func Deduplication(src ProxyList) ProxyList {
+	result := make(ProxyList, 0, len(src))
+	temp := map[string]struct{}{}
+	for _, item := range src {
+		if item != nil {
+			if _, ok := temp[item.Identifier()]; !ok {
+				temp[item.Identifier()] = struct{}{}
+				result = append(result, item)
+			}
+		}
+	}
+	return result
+}
+
+func (ps ProxyList) Clone() ProxyList {
+	result := make(ProxyList, 0, len(ps))
+	for _, pp := range ps {
+		if pp != nil {
+			result = append(result, pp.Clone())
+		}
+	}
+	return result
+}

pkg/proxy/shadowsocks.go

@@ -11,7 +11,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/zu1k/proxypool/tool"
+	"github.com/zu1k/proxypool/pkg/tool"
 )
 
 var (
@@ -61,6 +61,17 @@ func (ss Shadowsocks) ToSurge() string {
 	}
 }
 
+func (ss Shadowsocks) Clone() Proxy {
+	return &ss
+}
+
+// https://shadowsocks.org/en/config/quick-guide.html
+func (ss Shadowsocks) Link() (link string) {
+	payload := fmt.Sprintf("%s:%s@%s:%d", ss.Cipher, ss.Password, ss.Server, ss.Port)
+	payload = tool.Base64EncodeString(payload, false)
+	return fmt.Sprintf("ss://%s#%s", payload, ss.Name)
+}
+
 func ParseSSLink(link string) (*Shadowsocks, error) {
 	if !strings.HasPrefix(link, "ss://") {
 		return nil, ErrorNotSSRLink

pkg/proxy/shadowsocksr.go

@@ -3,6 +3,7 @@ package proxy
 import (
 	"encoding/json"
 	"errors"
+	"fmt"
 	"math/rand"
 	"net"
 	"net/url"
@@ -10,7 +11,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/zu1k/proxypool/tool"
+	"github.com/zu1k/proxypool/pkg/tool"
 )
 
 var (
@@ -34,7 +35,7 @@ type ShadowsocksR struct {
 }
 
 func (ssr ShadowsocksR) Identifier() string {
-	return net.JoinHostPort(ssr.Server, strconv.Itoa(ssr.Port)) + ssr.ProtocolParam
+	return net.JoinHostPort(ssr.Server, strconv.Itoa(ssr.Port)) + ssr.Password + ssr.ProtocolParam
 }
 
 func (ssr ShadowsocksR) String() string {
@@ -57,6 +58,23 @@ func (ssr ShadowsocksR) ToSurge() string {
 	return ""
 }
 
+func (ssr ShadowsocksR) Clone() Proxy {
+	return &ssr
+}
+
+// https://github.com/HMBSbige/ShadowsocksR-Windows/wiki/SSR-QRcode-scheme
+func (ssr ShadowsocksR) Link() (link string) {
+	payload := fmt.Sprintf("%s:%d:%s:%s:%s:%s",
+		ssr.Server, ssr.Port, ssr.Protocol, ssr.Cipher, ssr.Obfs, tool.Base64EncodeString(ssr.Password, true))
+	query := url.Values{}
+	query.Add("obfsparam", tool.Base64EncodeString(ssr.ObfsParam, true))
+	query.Add("protoparam", tool.Base64EncodeString(ssr.ProtocolParam, true))
+	query.Add("remarks", tool.Base64EncodeString(ssr.Name, true))
+	query.Add("group", tool.Base64EncodeString("proxy.tgbot.co", true))
+	payload = tool.Base64EncodeString(fmt.Sprintf("%s/?%s", payload, query.Encode()), true)
+	return fmt.Sprintf("ssr://%s", payload)
+}
+
 func ParseSSRLink(link string) (*ShadowsocksR, error) {
 	if !strings.HasPrefix(link, "ssr") {
 		return nil, ErrorNotSSRLink

pkg/proxy/trojan.go

@@ -0,0 +1,165 @@
+package proxy
+
+import (
+	"encoding/json"
+	"errors"
+	"math/rand"
+	"net"
+	"net/url"
+	"regexp"
+	"strconv"
+	"strings"
+)
+
+var (
+	ErrorNotTrojanink = errors.New("not a correct trojan link")
+)
+
+type Trojan struct {
+	Base
+	Password       string   `yaml:"password" json:"password"`
+	ALPN           []string `yaml:"alpn,omitempty" json:"alpn,omitempty"`
+	SNI            string   `yaml:"sni,omitempty" json:"sni,omitempty"`
+	SkipCertVerify bool     `yaml:"skip-cert-verify,omitempty" json:"skip-cert-verify,omitempty"`
+	UDP            bool     `yaml:"udp,omitempty" json:"udp,omitempty"`
+}
+
+/**
+  - name: "trojan"
+    type: trojan
+    server: server
+    port: 443
+    password: yourpsk
+    # udp: true
+    # sni: example.com # aka server name
+    # alpn:
+    #   - h2
+    #   - http/1.1
+    # skip-cert-verify: true
+*/
+
+func (t Trojan) Identifier() string {
+	return net.JoinHostPort(t.Server, strconv.Itoa(t.Port)) + t.Password
+}
+
+func (t Trojan) String() string {
+	data, err := json.Marshal(t)
+	if err != nil {
+		return ""
+	}
+	return string(data)
+}
+
+func (t Trojan) ToClash() string {
+	data, err := json.Marshal(t)
+	if err != nil {
+		return ""
+	}
+	return "- " + string(data)
+}
+
+func (t Trojan) ToSurge() string {
+	return ""
+}
+
+func (t Trojan) Clone() Proxy {
+	return &t
+}
+
+// https://p4gefau1t.github.io/trojan-go/developer/url/
+func (t Trojan) Link() (link string) {
+	query := url.Values{}
+	if t.SNI != "" {
+		query.Set("sni", url.QueryEscape(t.SNI))
+	}
+
+	uri := url.URL{
+		Scheme:   "trojan",
+		User:     url.User(url.QueryEscape(t.Password)),
+		Host:     net.JoinHostPort(t.Server, strconv.Itoa(t.Port)),
+		RawQuery: query.Encode(),
+		Fragment: t.Name,
+	}
+
+	return uri.String()
+}
+
+func ParseTrojanLink(link string) (*Trojan, error) {
+	if !strings.HasPrefix(link, "trojan://") && !strings.HasPrefix(link, "trojan-go://") {
+		return nil, ErrorNotTrojanink
+	}
+
+	/**
+	trojan-go://
+	    $(trojan-password)
+	    @
+	    trojan-host
+	    :
+	    port
+	/?
+	    sni=$(tls-sni.com)&
+	    type=$(original|ws|h2|h2+ws)&
+	        host=$(websocket-host.com)&
+	        path=$(/websocket/path)&
+	    encryption=$(ss;aes-256-gcm;ss-password)&
+	    plugin=$(...)
+	#$(descriptive-text)
+	*/
+
+	uri, err := url.Parse(link)
+	if err != nil {
+		return nil, ErrorNotSSLink
+	}
+
+	password := uri.User.Username()
+	password, _ = url.QueryUnescape(password)
+
+	server := uri.Hostname()
+	port, _ := strconv.Atoi(uri.Port())
+
+	moreInfos := uri.Query()
+	sni := moreInfos.Get("sni")
+	sni, _ = url.QueryUnescape(sni)
+	transformType := moreInfos.Get("type")
+	transformType, _ = url.QueryUnescape(transformType)
+	host := moreInfos.Get("host")
+	host, _ = url.QueryUnescape(host)
+	path := moreInfos.Get("path")
+	path, _ = url.QueryUnescape(path)
+
+	alpn := make([]string, 0)
+	if transformType == "h2" {
+		alpn = append(alpn, "h2")
+	}
+
+	if port == 0 {
+		return nil, ErrorNotTrojanink
+	}
+
+	return &Trojan{
+		Base: Base{
+			Name:   strconv.Itoa(rand.Int()),
+			Server: server,
+			Port:   port,
+			Type:   "trojan",
+		},
+		Password:       password,
+		ALPN:           alpn,
+		UDP:            true,
+		SNI:            host,
+		SkipCertVerify: true,
+	}, nil
+}
+
+var (
+	trojanPlainRe = regexp.MustCompile("trojan(-go)?://([A-Za-z0-9+/_&?=@:%.-])+")
+)
+
+func GrepTrojanLinkFromString(text string) []string {
+	results := make([]string, 0)
+	texts := strings.Split(text, "trojan://")
+	for _, text := range texts {
+		results = append(results, trojanPlainRe.FindAllString("trojan://"+text, -1)...)
+	}
+	return results
+}

pkg/proxy/vmess.go

@@ -11,7 +11,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/zu1k/proxypool/tool"
+	"github.com/zu1k/proxypool/pkg/tool"
 )
 
 var (
@@ -40,7 +40,7 @@ type HTTPOptions struct {
 }
 
 func (v Vmess) Identifier() string {
-	return net.JoinHostPort(v.Server, strconv.Itoa(v.Port)) + v.Cipher
+	return net.JoinHostPort(v.Server, strconv.Itoa(v.Port)) + v.Cipher + v.UUID
 }
 
 func (v Vmess) String() string {
@@ -82,6 +82,18 @@ func (v Vmess) ToSurge() string {
 	}
 }
 
+func (v Vmess) Clone() Proxy {
+	return &v
+}
+
+func (v Vmess) Link() (link string) {
+	vjv, err := json.Marshal(v.toLinkJson())
+	if err != nil {
+		return
+	}
+	return fmt.Sprintf("vmess://%s", tool.Base64EncodeBytes(vjv))
+}
+
 type vmessLinkJson struct {
 	Add  string      `json:"add"`
 	V    string      `json:"v"`
@@ -96,6 +108,27 @@ type vmessLinkJson struct {
 	Tls  string      `json:"tls"`
 }
 
+func (v Vmess) toLinkJson() vmessLinkJson {
+	vj := vmessLinkJson{
+		Add:  v.Server,
+		Ps:   v.Name,
+		Port: v.Port,
+		Id:   v.UUID,
+		Aid:  strconv.Itoa(v.AlterID),
+		Net:  v.Network,
+		Path: v.WSPath,
+		Host: v.ServerName,
+		V:    "2",
+	}
+	if v.TLS {
+		vj.Tls = "tls"
+	}
+	if host, ok := v.WSHeaders["HOST"]; ok && host != "" {
+		vj.Host = host
+	}
+	return vj
+}
+
 func ParseVmessLink(link string) (*Vmess, error) {
 	if !strings.HasPrefix(link, "vmess") {
 		return nil, ErrorNotVmessLink
@@ -186,10 +219,11 @@ func ParseVmessLink(link string) (*Vmess, error) {
 		}
 		port := 443
 		portInterface := vmessJson.Port
-		if i, ok := portInterface.(int); ok {
-			port = i
-		} else if s, ok := portInterface.(string); ok {
-			port, _ = strconv.Atoi(s)
+		switch portInterface.(type) {
+		case int:
+			port = portInterface.(int)
+		case string:
+			port, _ = strconv.Atoi(portInterface.(string))
 		}
 
 		alterId, err := strconv.Atoi(vmessJson.Aid)

pkg/tool/base64.go

@@ -26,3 +26,14 @@ func Base64DecodeString(src string) (dst string, err error) {
 	dst = string(dstbytes)
 	return
 }
+
+func Base64EncodeString(origin string, urlsafe bool) (result string) {
+	if urlsafe {
+		return base64.URLEncoding.EncodeToString([]byte(origin))
+	}
+	return base64.StdEncoding.EncodeToString([]byte(origin))
+}
+
+func Base64EncodeBytes(origin []byte) (result string) {
+	return base64.StdEncoding.EncodeToString([]byte(origin))
+}

pkg/tool/colly.go

@@ -0,0 +1,27 @@
+package tool
+
+import (
+	"net"
+	"net/http"
+	"time"
+
+	"github.com/gocolly/colly"
+)
+
+func GetColly() *colly.Collector {
+	c := colly.NewCollector(
+		colly.UserAgent(UserAgent),
+	)
+	c.WithTransport(&http.Transport{
+		Proxy: http.ProxyFromEnvironment,
+		DialContext: (&net.Dialer{
+			Timeout:   10 * time.Second, // 超时时间
+			KeepAlive: 10 * time.Second, // keepAlive 超时时间
+		}).DialContext,
+		MaxIdleConns:          100,              // 最大空闲连接数
+		IdleConnTimeout:       20 * time.Second, // 空闲连接超时
+		TLSHandshakeTimeout:   10 * time.Second, // TLS 握手超时
+		ExpectContinueTimeout: 10 * time.Second,
+	})
+	return c
+}

pkg/tool/httpclient.go

@@ -6,6 +6,8 @@ import (
 	"time"
 )
 
+const UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.105 Safari/537.36"
+
 type HttpClient struct {
 	*http.Client
 }
@@ -28,7 +30,7 @@ func (c *HttpClient) Get(url string) (resp *http.Response, err error) {
 		return nil, err
 	}
 	req.Header.Set("Accept-Language", "zh-CN,zh;q=0.9,en;q=0.8")
-	req.Header.Set("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.105 Safari/537.36")
+	req.Header.Set("User-Agent", UserAgent)
 	return c.Do(req)
 }
 
@@ -38,6 +40,6 @@ func (c *HttpClient) Post(url string, body io.Reader) (resp *http.Response, err
 		return nil, err
 	}
 	req.Header.Set("Accept-Language", "zh-CN,zh;q=0.9,en;q=0.8")
-	req.Header.Set("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.105 Safari/537.36")
+	req.Header.Set("User-Agent", UserAgent)
 	return c.Do(req)
 }

provider/base.go

@@ -1,14 +0,0 @@
-package provider
-
-type Provider interface {
-	Provide() string
-}
-
-func checkInList(list []string, item string) bool {
-	for _, i := range list {
-		if item == i {
-			return true
-		}
-	}
-	return false
-}

proxy/check.go

@@ -1,79 +0,0 @@
-package proxy
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"time"
-
-	"github.com/Dreamacro/clash/adapters/outbound"
-)
-
-const defaultURLTestTimeout = time.Second * 5
-
-func testDelay(p Proxy) (delay uint16, err error) {
-	pmap := make(map[string]interface{})
-	err = json.Unmarshal([]byte(p.String()), &pmap)
-	if err != nil {
-		return
-	}
-
-	pmap["port"] = int(pmap["port"].(float64))
-	if p.TypeName() == "vmess" {
-		pmap["alterId"] = int(pmap["alterId"].(float64))
-	}
-
-	clashProxy, err := outbound.ParseProxy(pmap)
-	if err != nil {
-		fmt.Println(err.Error())
-		return
-	}
-
-	ctx, cancel := context.WithTimeout(context.Background(), defaultURLTestTimeout)
-	delay, err = clashProxy.URLTest(ctx, "http://www.gstatic.com/generate_204")
-	cancel()
-	return delay, err
-}
-
-func CleanProxies(proxies []Proxy) (cproxies []Proxy) {
-	c := make(chan checkResult, 40)
-	defer close(c)
-	for _, p := range proxies {
-		go testProxyDelayToChan(p, c)
-	}
-	okMap := make(map[string]struct{})
-	size := len(proxies)
-	for i := 0; i < size; i++ {
-		r := <-c
-		if r.delay > 0 {
-			okMap[r.name] = struct{}{}
-		}
-	}
-	cproxies = make([]Proxy, 0)
-	for _, p := range proxies {
-		if _, ok := okMap[p.Identifier()]; ok {
-			cproxies = append(cproxies, p)
-		}
-	}
-	return
-}
-
-type checkResult struct {
-	name  string
-	delay uint16
-}
-
-func testProxyDelayToChan(p Proxy, c chan checkResult) {
-	delay, err := testDelay(p)
-	if err != nil {
-		c <- checkResult{
-			name:  p.Identifier(),
-			delay: 0,
-		}
-		return
-	}
-	c <- checkResult{
-		name:  p.Identifier(),
-		delay: delay,
-	}
-}

proxy/geoip.go

@@ -1,51 +0,0 @@
-package proxy
-
-import (
-	"log"
-	"net"
-	"os"
-
-	"github.com/oschwald/geoip2-golang"
-)
-
-var geoIp GeoIP
-
-func InitGeoIpDB() {
-	geoIp = NewGeoIP("assets/GeoLite2-City.mmdb")
-}
-
-// GeoIP2
-type GeoIP struct {
-	db *geoip2.Reader
-}
-
-// new geoip from db file
-func NewGeoIP(filePath string) (geoip GeoIP) {
-	// 判断文件是否存在
-	_, err := os.Stat(filePath)
-	if err != nil && os.IsNotExist(err) {
-		log.Println("文件不存在，请自行下载 Geoip2 City库，并保存在", filePath)
-		os.Exit(1)
-	} else {
-		db, err := geoip2.Open(filePath)
-		if err != nil {
-			log.Fatal(err)
-		}
-		geoip = GeoIP{db: db}
-	}
-	return
-}
-
-// find ip info
-func (g GeoIP) Find(ipORdomain string) (country string, err error) {
-	ips, err := net.LookupIP(ipORdomain)
-	if err != nil {
-		return "", err
-	}
-	ipData := net.ParseIP(ips[0].String())
-	record, err := g.db.City(ipData)
-	if err != nil {
-		return "", err
-	}
-	return record.Country.IsoCode, nil
-}

proxy/proxies.go

@@ -1,73 +0,0 @@
-package proxy
-
-import (
-	"fmt"
-	"sort"
-)
-
-type ProxyList []Proxy
-
-func (ps ProxyList) Len() int {
-	return len(ps)
-}
-
-func (ps ProxyList) Less(i, j int) bool {
-	return ps[i].BaseInfo().Name < ps[j].BaseInfo().Name
-}
-
-func (ps ProxyList) Swap(i, j int) {
-	ps[i], ps[j] = ps[j], ps[i]
-}
-
-func (ps ProxyList) Deduplication() ProxyList {
-	result := make(ProxyList, 0, len(ps))
-	temp := map[string]struct{}{}
-	for _, item := range ps {
-		if item != nil {
-			if _, ok := temp[item.Identifier()]; !ok {
-				temp[item.Identifier()] = struct{}{}
-				result = append(result, item)
-			}
-		}
-	}
-	return result
-}
-
-func (ps ProxyList) Sort() ProxyList {
-	sort.Sort(ps)
-	return ps
-}
-
-func (ps ProxyList) NameAddCounrty() ProxyList {
-	num := len(ps)
-	for i := 0; i < num; i++ {
-		country, err := geoIp.Find(ps[i].BaseInfo().Server)
-		if err != nil || country == "" {
-			country = "Earth"
-		}
-		ps[i].SetName(fmt.Sprintf("%s", country))
-	}
-	return ps
-}
-
-func (ps ProxyList) NameAddIndex() ProxyList {
-	num := len(ps)
-	for i := 0; i < num; i++ {
-		ps[i].SetName(fmt.Sprintf("%s_%d", ps[i].BaseInfo().Name, i+1))
-	}
-	return ps
-}
-
-func Deduplication(src ProxyList) ProxyList {
-	result := make(ProxyList, 0, len(src))
-	temp := map[string]struct{}{}
-	for _, item := range src {
-		if item != nil {
-			if _, ok := temp[item.Identifier()]; !ok {
-				temp[item.Identifier()] = struct{}{}
-				result = append(result, item)
-			}
-		}
-	}
-	return result
-}

source.yaml

@@ -1,316 +0,0 @@
-sources:
-  - type: webfuzzsub
-    options:
-      url: https://raw.githubusercontent.com/du5/free/master/sub.list
-  # 订阅链接
-  - type: subscribe
-    options:
-      url: https://suda.sub.koicloud.pw/link/K9vz0uFPe9ULfdqX?sub=3
-  - type: subscribe
-    options:
-      url: https://raw.githubusercontent.com/Pcrab/Dotfiles/912c1104b3f8121f72f7ee11590f52bc9c44dde7/.config/electron-ssr/gui-config.json
-  - type: subscribe
-    options:
-      url: https://v2.fit/modules/servers/V2raySocks/osubscribe.php?sid=7063&token=lKJwbO2onxIr
-  - type: subscribe
-    options:
-      url: https://www.liesauer.net/yogurt/subscribe?ACCESS_TOKEN=d309c6921bbd7d0d
-  - type: subscribe
-    options:
-      url: https://neurotoxinw.coding.net/p/qifei/d/qifei/git/raw/master/README.md
-  - type: subscribe
-    options:
-      url: https://sbnmsl.co/link/2cpTGUGJtHBXUK7d?sub=3
-  - type: subscribe
-    options:
-      url: https://extrm.info/link/uirPjznB7esOezjr?sub=1
-  - type: subscribe
-    options:
-      url: http://www.sksla.pro/api/v1/client/subscribe?token=99c3fa86424539bd3bd34a893bc6dee8
-  - type: subscribe
-    options:
-      url: https://vvsub.xyz/api/al/19786-xDX1SCq61Ymi
-  - type: subscribe
-    options:
-      url: https://rss-node.com/link/vqOaWFJRfbYxpAhY?mu=1
-  - type: subscribe
-    options:
-      url: https://tm2w.live/link/EqICUlKXmn1EJwaw?sub=3
-  - type: subscribe
-    options:
-      url: https://dingyue.suying666.info/link/o7j43Aykx8CWBehE?sub=3
-  - type: subscribe
-    options:
-      url: https://dingyue.suying666.info/link/o7j43Aykx8CWBehE?sub=1
-  - type: subscribe
-    options:
-      url: https://www.haidaobot.xyz/link/QwdUmWolPN0LkThW?mu=2
-  - type: subscribe
-    options:
-      url: https://pptp.cloud/sub/cXHG9wqUpQbhHr7b.html
-  - type: subscribe
-    options:
-      url: https://suda.sub.koicloud.pw/link/JgULLCNkImsJ6Ibh?sub=3
-  - type: subscribe
-    options:
-      url: https://jiyou.world/modules/servers/V2raySocks/osubscribetest.php?sid=57394&token=V3GM60lgqZL9
-  - type: subscribe
-    options:
-      url: https://aero.moe/link/kxdbKdopH3paUqUf?sub=3
-  - type: subscribe
-    options:
-      url: http://dy.tntv2.xyz/link/pTL0RgiVblXLIQjS?sub=3&extend=1
-  - type: subscribe
-    options:
-      url: https://719401146.online//link/oHPA3bXVc2zeqGGq?mu=2
-  - type: subscribe
-    options:
-      url: https://www.v2ray.pw/link/b5e255KbnnATXc60?mu=2+&extend=1
-  - type: subscribe
-    options:
-      url: http://ssrdingyue.ueuo.com/v2/8y12r
-  - type: subscribe
-    options:
-      url: https://www.suncloud.fun/link/Su683BQEyUdxtyuY?mu=1&extend=1
-  - type: subscribe
-    options:
-      url: https://sub88.xyz/link/egy4oyqok9aavpcy?sub=3
-  - type: subscribe
-    options:
-      url: https://qiaomenzhuanfx.netlify.com/
-  - type: subscribe
-    options:
-      url: https://sub88.xyz/link/lkY8Jt5Q3SHlffra?mu=2
-  - type: subscribe
-    options:
-      url: https://raw.githubusercontent.com/hotsymbol/vpnsetting/master/v2rayopen
-  - type: subscribe
-    options:
-      url: https://raw.githubusercontent.com/satrom/V2SSR/master/V2RAY/Sub.txt
-  - type: subscribe
-    options:
-      url: https://raw.githubusercontent.com/ssrsub/ssr/master/v2ray
-  - type: subscribe
-    options:
-      url: http://qe83xk711.sabkt.gdipper.com/freev2ray.txt
-  - type: subscribe
-    options:
-      url: https://iwxf.netlify.app/
-  - type: subscribe
-    options:
-      url: https://rss.getfree.win/link/w9ted9eZq1zbC3gx?sub=1
-  - type: subscribe
-    options:
-      url: https://youlianboshi.netlify.com/
-  - type: subscribe
-    options:
-      url: https://raw.githubusercontent.com/ssrsub/ssr/master/ss-sub
-  - type: subscribe
-    options:
-      url: https://bujidao302.com/link/IJ6wKEt96Otboilb?mu=2
-  - type: subscribe
-    options:
-      url: https://raw.githubusercontent.com/satrom/V2SSR/master/SSR/Day.txt
-  - type: subscribe
-    options:
-      url: https://raw.githubusercontent.com/ntkernel/lantern/master/vmess_base64.txt
-  - type: subscribe
-    options:
-      url: https://lei-su.me//link/Dw3lmyXXJJTnvsBA?sub=3&extend=1
-  - type: subscribe
-    options:
-      url: https://raw.githubusercontent.com/cdp2020/v2ray/master/README.md
-  - type: subscribe
-    options:
-      url: https://raw.githubusercontent.com/ssrsub/ssr/master/ssrsub
-  - type: subscribe
-    options:
-      url: https://www.liesauer.net/yogurt/subscribe?ACCESS_TOKEN=DAYxR3mMaZAsaqUb
-  - type: subscribe
-    options:
-      url: https://rss.cnrss.xyz/link/Rcr8h8fvZIWE001U?mu=2
-  - type: subscribe
-    options:
-      url: https://12o.ooo/link/JLisT80gOhRkiFnX?sub=1
-  - type: subscribe
-    options:
-      url: https://sub1.m87sub.xyz/link/pZDgnxhgL6Poh1GQ?sub=3
-  - type: subscribe
-    options:
-      url: https://raw.githubusercontent.com/satrom/V2SSR/master/SSR/Sub.txt
-  - type: subscribe
-    options:
-      url: https://sub88.xyz/link/lkY8Jt5Q3SHlffra?mu=2
-  - type: subscribe
-    options:
-      url: https://s.sublank.xyz/subscribe/66056/0yzuMVawjpr/ssr/
-  - type: subscribe
-    options:
-      url: https://sub1.m87sub.xyz/link/pZDgnxhgL6Poh1GQ?sub=1
-  - type: subscribe
-    options:
-      url: http://qe83xk711.sabkt.gdipper.com/freess.txt
-  - type: subscribe
-    options:
-      url: https://raw.githubusercontent.com/pojiezhiyuanjun/freev2/master/20200808.txt
-  - type: subscribe
-    options:
-      url: https://sub1.m87sub.xyz/link/2488O6IM4n4nksMG?sub=3
-  - type: subscribe
-    options:
-      url: http://103.72.166.89/v2ray.php
-  - type: subscribe
-    options:
-      url: https://fly.lo-lita.ru/api/v1/client/subscribe?token=94be7fa3d65791197dd10c6a0b757571
-  - type: subscribe
-    options:
-      url: https://raw.githubusercontent.com/RaymondHarris971/ssrsub/master/9a075bdee5.txt
-  - type: subscribe
-    options:
-      url: https://bit.ly/2D5fWhX
-  - type: subscribe
-    options:
-      url: https://www.suncloud.fun/link/ja3OIcMTrky6VhN6?mu=1&extend=1
-  - type: subscribe
-    options:
-      url: https://raw.githubusercontent.com/voken100g/AutoSSR/master/recent
-  - type: subscribe
-    options:
-      url: https://jiang.netlify.com/
-  - type: subscribe
-    options:
-      url: https://raw.githubusercontent.com/ssrsub/ssr/master/v2ray
-  - type: subscribe
-    options:
-      url: https://raw.githubusercontent.com/ssrsub/ssr/master/ssrsub
-  - type: subscribe
-    options:
-      url: https://raw.githubusercontent.com/ssrsub/ssr/master/ss-sub
-  - type: subscribe
-    options:
-      url: https://heikejilaila.xyz/keji.php?id=22c7b9fdda20bb7405b270cd75971f66
-  - type: subscribe
-    options:
-      url: https://youlianboshi.netlify.app/
-  - type: subscribe
-    options:
-      url: https://raw.githubusercontent.com/umelabs/node.umelabs.dev/master/Subscribe/SS.md
-  - type: subscribe
-    options:
-      url: https://raw.githubusercontent.com/umelabs/node.umelabs.dev/master/Subscribe/SSR.md
-  - type: subscribe
-    options:
-      url: https://raw.githubusercontent.com/umelabs/node.umelabs.dev/master/Subscribe/v2ray.md
-  - type: subscribe
-    options:
-      url: https://www.3kla.cn/subscribe/txt/Anranray.txt
-
-  # 网页模糊抓取
-  - type: webfuzz
-    options:
-      url: https://zfjvpn.gitbook.io/
-  - type: webfuzz
-    options:
-      url: https://www.freefq.com/d/file/free-ssr/20200811/1f3e9d0d0064f662457062712dcf1b66.txt
-  - type: webfuzz
-    options:
-      url: https://merlinblog.xyz/wiki/freess.html
-  - type: webfuzz
-    options:
-      url: https://zfjvpn.gitbook.io/123/
-  - type: webfuzz
-    options:
-      url: https://raw.githubusercontent.com/ruanfei/ShadowsocksRRShare/master/ss/ss.txt
-  - type: webfuzz
-    options:
-      url: https://raw.githubusercontent.com/ruanfei/ShadowsocksRRShare/master/ssr/ssr.txt
-  - type: webfuzz
-    options:
-      url: https://raw.githubusercontent.com/pojiezhiyuanjun/freev2/master/all.txt
-  - type: webfuzz
-    options:
-      url: https://raw.githubusercontent.com/zu1k/ssrtool-crawler/master/data/ssr.txt
-  - type: webfuzz
-    options:
-      url: https://raw.githubusercontent.com/freefq/free/master/README.md
-  - type: webfuzz
-    options:
-      url: https://raw.githubusercontent.com/52bp/52bp.github.io/master/freesite.html
-
-  # tg频道
-  - type: tgchannel
-    options:
-      channel: ssrList
-      num: 200
-  - type: tgchannel
-    options:
-      channel: ssList
-      num: 200
-  - type: tgchannel
-    options:
-      channel: SSRSUB
-      num: 200
-  - type: tgchannel
-    options:
-      channel: FreeSSRNode
-      num: 200
-  - type: tgchannel
-    options:
-      channel: ssrlists
-      num: 200
-  - type: tgchannel
-    options:
-      channel: ssrshares
-      num: 200
-  - type: tgchannel
-    options:
-      channel: V2List
-      num: 200
-  - type: tgchannel
-    options:
-      channel: ssrtool
-      num: 100
-  - type: tgchannel
-    options:
-      channel: ssrtool_crack
-      num: 100
-  - type: tgchannel
-    options:
-      channel: vmessr
-      num: 200
-  - type: tgchannel
-    options:
-      channel: FreeSSR666
-      num: 200
-  - type: tgchannel
-    options:
-      channel: fanqiang666
-      num: 200
-  - type: tgchannel
-    options:
-      channel: jiedianfenxiang
-      num: 200
-  - type: tgchannel
-    options:
-      channel: freeshadowsock
-      num: 200
-
-  # 翻墙党，后面的东西都无需修改
-  - type: web-fanqiangdang
-    options:
-      url: https://fanqiangdang.com/forum.php?mod=rss&fid=50&auth=0
-      num: 200
-  - type: web-fanqiangdang
-    options:
-      url: https://fanqiangdang.com/forum.php?mod=rss&fid=2&auth=0
-      num: 200
-  - type: web-fanqiangdang
-    options:
-      url: https://fanqiangdang.com/forum.php?mod=rss&fid=36&auth=0
-      num: 200
-
-  - type: web-freessrxyz
-    options:
-
-  - type: web-lucnorg
-    options:

tool/aes.go

@@ -1,43 +0,0 @@
-package tool
-
-import (
-	"bytes"
-	"crypto/aes"
-)
-
-func PKCS7Padding(ciphertext []byte, blockSize int) []byte {
-	padding := blockSize - len(ciphertext)%blockSize
-	padtext := bytes.Repeat([]byte{byte(padding)}, padding)
-	return append(ciphertext, padtext...)
-}
-
-func PKCS7UnPadding(origData []byte) []byte {
-	length := len(origData)
-	unpadding := int(origData[length-1])
-	return origData[:(length - unpadding)]
-}
-
-func AesEcbDecryptWithPKCS7Unpadding(data, key []byte) []byte {
-	block, _ := aes.NewCipher(key)
-	decrypted := make([]byte, len(data))
-	size := block.BlockSize()
-
-	for bs, be := 0, size; bs < len(data); bs, be = bs+size, be+size {
-		block.Decrypt(decrypted[bs:be], data[bs:be])
-	}
-
-	return PKCS7UnPadding(decrypted)
-}
-
-func AesEcbEncryptWithPKCS7Padding(data, key []byte) []byte {
-	block, _ := aes.NewCipher(key)
-	data = PKCS7Padding(data, block.BlockSize())
-	decrypted := make([]byte, len(data))
-	size := block.BlockSize()
-
-	for bs, be := 0, size; bs < len(data); bs, be = bs+size, be+size {
-		block.Encrypt(decrypted[bs:be], data[bs:be])
-	}
-
-	return decrypted
-}