fix country name is none

fix type assert and Dockerfile

Dockerfile

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

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节点信息，聚合去重测试可用性后提供节点列表</h5>
 
 <p align="center">
   <a href="https://github.com/zu1k/proxypool/actions">
@@ -16,6 +16,8 @@
   </a>
 </p>
 
+![Star](https://img.shields.io/github/stars/zu1k/proxypool.svg?style=social&label=Star) 来都来了，不点个Star再走？ 
+
 ## 支持
 
 - 支持ss、ssr、vmess节点链接与订阅
@@ -26,6 +28,7 @@
 - 其他节点分享网站
 - 定时抓取更新
 - 使用配置文件提供抓取源
+- 自动检测节点可用性
 
 ## 安装
 
@@ -73,4 +76,6 @@ proxypool -c source.yaml
 
 ## 截图
 
-![测速](docs/run.png)
+![Speedtest](docs/speedtest.png)
+
+![Fast](docs/fast.png)

api/router.go

@@ -19,12 +19,20 @@ func setupRouter() {
 	router.StaticFile("/clash/config", "assets/clash-config.yaml")
 	router.StaticFile("/surge/config", "assets/surge.conf")
 	router.GET("/clash/proxies", func(c *gin.Context) {
-		text := cache.GetString("clashproxies")
-		if text == "" {
+		proxyTypes := c.DefaultQuery("type", "")
+		text := ""
+		if proxyTypes == "all" || proxyTypes == "" {
+			text = cache.GetString("clashproxies")
+			if text == "" {
+				proxies := cache.GetProxies()
+				clash := provider.Clash{Proxies: proxies}
+				text = clash.Provide()
+				cache.SetString("clashproxies", text)
+			}
+		} else {
 			proxies := cache.GetProxies()
-			clash := provider.Clash{Proxies: proxies}
+			clash := provider.Clash{Proxies: proxies, Types: proxyTypes}
 			text = clash.Provide()
-			cache.SetString("clashproxies", text)
 		}
 		c.String(200, text)
 	})

app/config_test.go

@@ -0,0 +1,36 @@
+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/getter.go

@@ -1,8 +1,8 @@
 package app
 
 import (
+	"errors"
 	"fmt"
-	"os"
 
 	"github.com/zu1k/proxypool/config"
 	"github.com/zu1k/proxypool/getter"
@@ -10,24 +10,23 @@ import (
 
 var Getters = make([]getter.Getter, 0)
 
-func InitConfigAndGetters(path string) {
+func InitConfigAndGetters(path string) (err error) {
 	c, err := config.Parse(path)
 	if err != nil {
-		fmt.Println("Error: ", err.Error())
-		os.Exit(1)
+		return err
 	}
 	if c == nil {
-		fmt.Println("Error: no sources")
-		os.Exit(2)
+		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 := getter.NewGetter(source.Type, source.Options)
-		if g != nil {
+		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)
 		}

app/global.go

@@ -0,0 +1,12 @@
+package app
+
+import "github.com/zu1k/proxypool/proxy"
+
+var (
+	GeoIp       proxy.GeoIP
+	ProjectName = "proxypool"
+)
+
+func InitGeoIpDB() {
+	GeoIp = proxy.NewGeoIP("assets/GeoLite2-City.mmdb")
+}

app/task.go

@@ -61,12 +61,18 @@ func CrawlGo() {
 		}
 	}
 	proxies = proxy.Deduplication(proxies)
+	log.Println("CrawlGo node count:", len(proxies))
+	proxies = proxy.CleanProxies(provider.Clash{Proxies: proxies}.CleanProxies())
+	log.Println("CrawlGo clash useable node count:", len(proxies))
 
 	num := len(proxies)
 	for i := 0; i < num; i++ {
-		proxies[i].SetName(strconv.Itoa(rand.Int()))
+		country, err := GeoIp.Find(proxies[i].BaseInfo().Server)
+		if err != nil || country == "" {
+			country = "Earth"
+		}
+		proxies[i].SetName(fmt.Sprintf("%s_%d_%s", ProjectName, i+1, country))
 	}
-	log.Println("CrawlGo node count:", num)
 	cache.SetProxies(proxies)
 	cache.SetString("clashproxies", provider.Clash{Proxies: proxies}.Provide())
 	cache.SetString("surgeproxies", provider.Surge{Proxies: proxies}.Provide())

assets/clash.html

@@ -1,86 +1,118 @@
 <!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; }
+    <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>
+        .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：<a href="https://proxy.tgbot.co/clash/proxies">https://proxy.tgbot.co/clash/proxies</a></p>
-		<br>
-	  <p>抓取程序已开源：<a href="https://github.com/zu1k/proxypool">https://github.com/zu1k/proxypool</a></p>
-	</div>
-  </div>
+    <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>
+            <br>
+            <p>抓取程序已开源：<a href="https://github.com/zu1k/proxypool">https://github.com/zu1k/proxypool</a></p>
+        </div>
+    </div>
 </div>
 </body>
 </html>

assets/index.html

@@ -76,7 +76,7 @@
 	  <p>自动抓取tg频道、订阅地址、公开互联网上的ss、ssr、vmess节点信息，聚合去重后提供节点列表，每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：<a href="https://proxy.tgbot.co/clash/proxies">https://proxy.tgbot.co/clash/proxies</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>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>

getter/base.go

@@ -1,6 +1,7 @@
 package getter
 
 import (
+	"errors"
 	"strings"
 	"sync"
 
@@ -13,7 +14,7 @@ type Getter interface {
 	Get2Chan(pc chan proxy.Proxy, wg *sync.WaitGroup)
 }
 
-type creator func(options tool.Options) Getter
+type creator func(options tool.Options) (getter Getter, err error)
 
 var creatorMap = make(map[string]creator)
 
@@ -21,12 +22,12 @@ func Register(sourceType string, c creator) {
 	creatorMap[sourceType] = c
 }
 
-func NewGetter(sourceType string, options tool.Options) Getter {
+func NewGetter(sourceType string, options tool.Options) (getter Getter, err error) {
 	c, ok := creatorMap[sourceType]
 	if ok {
 		return c(options)
 	}
-	return nil
+	return nil, ErrorCreaterNotSupported
 }
 
 func String2Proxy(link string) proxy.Proxy {
@@ -63,3 +64,22 @@ func GrepLinksFromString(text string) []string {
 func FuzzParseProxyFromString(text string) []proxy.Proxy {
 	return StringArray2ProxyArray(GrepLinksFromString(text))
 }
+
+var (
+	ErrorUrlNotFound         = errors.New("url should be specified")
+	ErrorCreaterNotSupported = errors.New("type not supported")
+)
+
+func AssertTypeStringNotNull(i interface{}) (str string, err error) {
+	switch i.(type) {
+	case string:
+		str = i.(string)
+		if str == "" {
+			return "", errors.New("string is null")
+		}
+		return str, nil
+	default:
+		return "", errors.New("type is not string")
+	}
+	return "", nil
+}

getter/subscribe.go

@@ -46,12 +46,16 @@ func (s *Subscribe) Get2Chan(pc chan proxy.Proxy, wg *sync.WaitGroup) {
 	}
 }
 
-func NewSubscribe(options tool.Options) Getter {
-	url, found := options["url"]
+func NewSubscribe(options tool.Options) (getter Getter, err error) {
+	urlInterface, found := options["url"]
 	if found {
-		return &Subscribe{
-			Url: url.(string),
+		url, err := AssertTypeStringNotNull(urlInterface)
+		if err != nil {
+			return nil, err
 		}
+		return &Subscribe{
+			Url: url,
+		}, nil
 	}
-	return nil
+	return nil, ErrorUrlNotFound
 }

getter/tgchannel.go

@@ -20,20 +20,32 @@ type TGChannelGetter struct {
 	Url       string
 }
 
-func NewTGChannelGetter(options tool.Options) Getter {
+func NewTGChannelGetter(options tool.Options) (getter Getter, err error) {
 	num, found := options["num"]
-	if !found || num.(int) <= 0 {
-		num = 200
+	t := 200
+	switch num.(type) {
+	case int:
+		t = num.(int)
+	case float64:
+		t = int(num.(float64))
 	}
-	url, found := options["channel"]
+
+	if !found || t <= 0 {
+		t = 200
+	}
+	urlInterface, found := options["channel"]
 	if found {
+		url, err := AssertTypeStringNotNull(urlInterface)
+		if err != nil {
+			return nil, err
+		}
 		return &TGChannelGetter{
 			c:         colly.NewCollector(),
-			NumNeeded: num.(int),
-			Url:       "https://t.me/s/" + url.(string),
-		}
+			NumNeeded: t,
+			Url:       "https://t.me/s/" + url,
+		}, nil
 	}
-	return nil
+	return nil, ErrorUrlNotFound
 }
 
 func (g *TGChannelGetter) Get() []proxy.Proxy {

getter/web_fanqiangdang.go

@@ -20,20 +20,33 @@ type WebFanqiangdang struct {
 	results   []string
 }
 
-func NewWebFanqiangdangGetter(options tool.Options) Getter {
+func NewWebFanqiangdangGetter(options tool.Options) (getter Getter, err error) {
 	num, found := options["num"]
-	if !found || num.(int) <= 0 {
-		num = 200
+
+	t := 200
+	switch num.(type) {
+	case int:
+		t = num.(int)
+	case float64:
+		t = int(num.(float64))
 	}
-	url, found := options["url"]
+
+	if !found || t <= 0 {
+		t = 200
+	}
+	urlInterface, found := options["url"]
 	if found {
+		url, err := AssertTypeStringNotNull(urlInterface)
+		if err != nil {
+			return nil, err
+		}
 		return &WebFanqiangdang{
 			c:         colly.NewCollector(),
-			NumNeeded: num.(int),
-			Url:       url.(string),
-		}
+			NumNeeded: t,
+			Url:       url,
+		}, nil
 	}
-	return nil
+	return nil, ErrorUrlNotFound
 }
 
 func (w *WebFanqiangdang) Get() []proxy.Proxy {

getter/web_free_ssr_xyz.go

@@ -21,8 +21,8 @@ const (
 type WebFreessrXyz struct {
 }
 
-func NewWebFreessrxyzGetter(options tool.Options) Getter {
-	return &WebFreessrXyz{}
+func NewWebFreessrxyzGetter(options tool.Options) (getter Getter, err error) {
+	return &WebFreessrXyz{}, nil
 }
 
 func (w *WebFreessrXyz) Get() []proxy.Proxy {

getter/web_fuzz.go

@@ -37,10 +37,14 @@ func (w *WebFuzz) Get2Chan(pc chan proxy.Proxy, wg *sync.WaitGroup) {
 	}
 }
 
-func NewWebFuzzGetter(options tool.Options) Getter {
-	url, found := options["url"]
+func NewWebFuzzGetter(options tool.Options) (getter Getter, err error) {
+	urlInterface, found := options["url"]
 	if found {
-		return &WebFuzz{Url: url.(string)}
+		url, err := AssertTypeStringNotNull(urlInterface)
+		if err != nil {
+			return nil, err
+		}
+		return &WebFuzz{Url: url}, nil
 	}
-	return nil
+	return nil, ErrorUrlNotFound
 }

getter/web_lucn_org.go

@@ -19,8 +19,8 @@ const lucnorgSsrLink = "https://lncn.org/api/ssrList"
 type WebLucnOrg struct {
 }
 
-func NewWebLucnorg(options tool.Options) Getter {
-	return &WebLucnOrg{}
+func NewWebLucnorg(options tool.Options) (getter Getter, err error) {
+	return &WebLucnOrg{}, nil
 }
 
 func (w *WebLucnOrg) Get() []proxy.Proxy {

go.mod

@@ -3,6 +3,7 @@ module github.com/zu1k/proxypool
 go 1.14
 
 require (
+	github.com/Dreamacro/clash v1.0.1-0.20200812125056-8b7c731fd629
 	github.com/PuerkitoBio/goquery v1.5.1 // indirect
 	github.com/andybalholm/cascadia v1.2.0 // indirect
 	github.com/antchfx/htmlquery v1.2.3 // indirect
@@ -18,16 +19,21 @@ require (
 	github.com/json-iterator/go v1.1.10 // indirect
 	github.com/kennygrant/sanitize v1.2.4 // indirect
 	github.com/kr/pretty v0.1.0 // indirect
+	github.com/miekg/dns v1.1.31 // indirect
 	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/spf13/cobra v1.0.0 // indirect
 	github.com/spf13/viper v1.7.1 // indirect
-	github.com/stretchr/testify v1.5.1 // indirect
 	github.com/temoto/robotstxt v1.1.1 // indirect
-	golang.org/x/net v0.0.0-20200625001655-4c5254603344 // indirect
-	golang.org/x/sys v0.0.0-20200810151505-1b9f1253b3ed // indirect
+	github.com/zu1k/nali v0.2.2 // indirect
+	golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de // indirect
+	golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc // indirect
+	golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 // indirect
+	golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed // 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

go.sum

@@ -13,6 +13,10 @@ cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiy
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/Dreamacro/clash v1.0.1-0.20200812125056-8b7c731fd629 h1:876g402+S9ROmgHU7wGdSssWz/TNiJJsDsphd2qsbRc=
+github.com/Dreamacro/clash v1.0.1-0.20200812125056-8b7c731fd629/go.mod h1:LMbDBvj4kuiE5TGhZ8JxhEdRpBtZRjQllo2r7RfUw1c=
+github.com/Dreamacro/go-shadowsocks2 v0.1.6-0.20200722122336-8e5c7db4f96a h1:JhQFrFOkCpRB8qsN6PrzHFzjy/8iQpFFk5cbOiplh6s=
+github.com/Dreamacro/go-shadowsocks2 v0.1.6-0.20200722122336-8e5c7db4f96a/go.mod h1:LSXCjyHesPY3pLjhwff1mQX72ItcBT/N2xNC685cYeU=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/PuerkitoBio/goquery v1.5.1 h1:PSPBGne8NIUWw+/7vFBV+kG2J/5MOjbzc7154OaKCSE=
 github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
@@ -52,6 +56,8 @@ 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/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
+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.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/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
@@ -63,6 +69,12 @@ 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-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-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
@@ -83,6 +95,8 @@ github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
 github.com/gocolly/colly v1.2.0 h1:qRz9YAn8FIH0qzgNUw+HT9UN7wm1oF9OBAilwEWpyrI=
 github.com/gocolly/colly v1.2.0/go.mod h1:Hof5T3ZswNVsOHYmba1u03W65HDWgpV5HifSuueE0EA=
+github.com/gofrs/uuid v3.3.0+incompatible h1:8K4tyRfvU1CYPgJsveYFQMhpFd/wXNM7iK6rR7UHz84=
+github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
@@ -121,6 +135,7 @@ github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
+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.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
@@ -149,6 +164,8 @@ github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/J
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
+github.com/ipipdotnet/ipdb-go v1.3.0 h1:FfkSkAI1do3bZ7F35ueGuF7Phur64jmikQ1C4IPl/gc=
+github.com/ipipdotnet/ipdb-go v1.3.0/go.mod h1:yZ+8puwe3R37a/3qRftXo40nZVQbxYDLqls9o5foexs=
 github.com/jasonlvhit/gocron v0.0.1 h1:qTt5qF3b3srDjeOIR4Le1LfeyvoYzJlYpqvG7tJX5YU=
 github.com/jasonlvhit/gocron v0.0.1/go.mod h1:k9a3TV8VcU73XZxfVHCHWMWF9SOqgoku0/QlY2yvlA4=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
@@ -165,6 +182,8 @@ github.com/kennygrant/sanitize v1.2.4/go.mod h1:LGsjYYtgxbetdg5owWB2mpgUL6e2nfw2
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 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.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=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -182,6 +201,10 @@ github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHX
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
+github.com/miekg/dns v1.1.29 h1:xHBEhR+t5RzcFJjBLJlax2daXOrTYtr9z4WdKEfWFzg=
+github.com/miekg/dns v1.1.29/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
+github.com/miekg/dns v1.1.31 h1:sJFOl9BgwbYAWOGEwr61FU28pqsBNdpRBnhGXtO06Oo=
+github.com/miekg/dns v1.1.31/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
@@ -205,6 +228,12 @@ github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn
 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/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=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
@@ -231,9 +260,16 @@ github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 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/saracen/go7z v0.0.0-20191010121135-9c09b6bd7fda h1:h+YpzUB/bGVJcLqW+d5GghcCmE/A25KbzjXvWJQi/+o=
+github.com/saracen/go7z v0.0.0-20191010121135-9c09b6bd7fda/go.mod h1:MSotTrCv1PwoR8QgU1JurEx+lNNbtr25I+m0zbLyAGw=
+github.com/saracen/go7z-fixtures v0.0.0-20190623165746-aa6b8fba1d2f/go.mod h1:6Ff0ADODZ6S3gYepgZ2w7OqFrTqtFcfwDUhmm8jsUhs=
+github.com/saracen/solidblock v0.0.0-20190426153529-45df20abab6f h1:1cJITU3JUI8qNS5T0BlXwANsVdyoJQHQ4hvOxbunPCw=
+github.com/saracen/solidblock v0.0.0-20190426153529-45df20abab6f/go.mod h1:LyBTue+RWeyIfN3ZJ4wVxvDuvlGJtDgCLgCb6HCPgps=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+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 v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
@@ -248,6 +284,8 @@ github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9
 github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
 github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
+github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/spf13/viper v1.7.1 h1:pM5oEahlgWv/WnHXpgbKz7iLIxRf65tye2Ci+XFK5sk=
 github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
@@ -258,6 +296,7 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/temoto/robotstxt v1.1.1 h1:Gh8RCs8ouX3hRSxxK7B1mO5RFByQ4CmJZDwgom++JaA=
@@ -268,8 +307,12 @@ github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
 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/ulikunitz/xz v0.5.7 h1:YvTNdFzX6+W5m9msiYg/zpkSURPPtOlzbqYjrFn7Yt4=
+github.com/ulikunitz/xz v0.5.7/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
+github.com/zu1k/nali v0.2.2 h1:LRo52LXqdhwbjCFOs5Bl9XGewvJnd3MC92m5hDPFHyc=
+github.com/zu1k/nali v0.2.2/go.mod h1:5BILGeMPfJz+sv3Sov25g8kkNGgB/ouj5lYSD39SUuc=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
@@ -281,7 +324,13 @@ golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnf
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+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=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -300,6 +349,7 @@ golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU
 golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
 golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
 golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
+golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -317,11 +367,15 @@ golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 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-20200625001655-4c5254603344 h1:vGXIOMxbNfDTk/aXCmfdLgkrSV+Z2tcbze+pEc3v5W4=
 golang.org/x/net v0.0.0-20200625001655-4c5254603344/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/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=
@@ -331,6 +385,10 @@ 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/sync v0.0.0-20200625203802-6e8e738ad208 h1:qwRHBd0NqMbJxfbotnDhm2ByMI1Shq4Y6oRJo21SGJA=
+golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -341,19 +399,27 @@ golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/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-20200810151505-1b9f1253b3ed h1:WBkVNH1zd9jg/dK4HCM4lNANnmd12EHC9z+LmcCG4ns=
 golang.org/x/sys v0.0.0-20200810151505-1b9f1253b3ed/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-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -374,7 +440,10 @@ golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+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-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+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=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
@@ -397,6 +466,7 @@ google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
 google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+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.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
@@ -419,6 +489,8 @@ 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/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno=
@@ -432,9 +504,11 @@ gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=

main.go

@@ -3,21 +3,38 @@ package main
 import (
 	"flag"
 	"fmt"
+	"net/http"
+	_ "net/http/pprof"
 
 	"github.com/zu1k/proxypool/api"
 	"github.com/zu1k/proxypool/app"
 )
 
 func main() {
+	go pprof()
+
 	filePath := flag.String("c", "", "path to config file: source.yaml")
 	flag.Parse()
 	if *filePath == "" {
 		app.NeedFetchNewConfigFile = true
 	} else {
-		app.InitConfigAndGetters(*filePath)
+		err := app.InitConfigAndGetters(*filePath)
+		if err != nil {
+			fmt.Println(err)
+		}
 	}
+	app.InitGeoIpDB()
+
 	go app.Cron()
 	fmt.Println("Do the first crawl...")
 	app.CrawlGo()
+
 	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)
+	}
+}

provider/clash.go

@@ -8,15 +8,39 @@ import (
 
 type Clash struct {
 	Proxies []proxy.Proxy `yaml:"proxies"`
+	Types   string        `yaml:"type"`
+}
+
+func (c Clash) CleanProxies() (proxies []proxy.Proxy) {
+	proxies = make([]proxy.Proxy, 0)
+	for _, p := range c.Proxies {
+		if checkClashSupport(p) {
+			proxies = append(proxies, p)
+		}
+	}
+	return
 }
 
 func (c Clash) Provide() string {
 	var resultBuilder strings.Builder
-
 	resultBuilder.WriteString("proxies:\n")
-	for _, p := range c.Proxies {
-		if checkClashSupport(p) {
-			resultBuilder.WriteString(p.ToClash() + "\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.Type() == t {
+						resultBuilder.WriteString(p.ToClash() + "\n")
+					}
+				}
+			}
 		}
 	}
 
@@ -24,18 +48,18 @@ func (c Clash) Provide() string {
 }
 
 func checkClashSupport(p proxy.Proxy) bool {
-	switch p.(type) {
-	case *proxy.ShadowsocksR:
+	switch p.Type() {
+	case "ssr":
 		ssr := p.(*proxy.ShadowsocksR)
 		if checkInList(ssrCipherList, ssr.Cipher) && checkInList(ssrProtocolList, ssr.Protocol) && checkInList(ssrObfsList, ssr.Obfs) {
 			return true
 		}
-	case *proxy.Vmess:
+	case "vmess":
 		vmess := p.(*proxy.Vmess)
 		if checkInList(vmessCipherList, vmess.Cipher) {
 			return true
 		}
-	case *proxy.Shadowsocks:
+	case "ss":
 		ss := p.(*proxy.Shadowsocks)
 		if checkInList(ssCipherList, ss.Cipher) {
 			return true

proxy/base.go

@@ -14,6 +14,8 @@ type Proxy interface {
 	ToSurge() string
 	Identifier() string
 	SetName(name string)
+	Type() string
+	BaseInfo() *Base
 }
 
 func Deduplication(src []Proxy) []Proxy {

proxy/check.go

@@ -0,0 +1,77 @@
+package proxy
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"time"
+
+	"github.com/Dreamacro/clash/adapters/outbound"
+)
+
+const defaultURLTestTimeout = time.Second * 15
+
+func Check(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.Type() == "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)
+	defer cancel()
+	delay, err = clashProxy.URLTest(ctx, "http://www.gstatic.com/generate_204")
+	return delay, err
+}
+
+func CleanProxies(proxies []Proxy) (cproxies []Proxy) {
+	c := make(chan checkResult, 40)
+	for _, p := range proxies {
+		go checkProxyWithChan(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 checkProxyWithChan(p Proxy, c chan checkResult) {
+	delay, err := Check(p)
+	if err != nil {
+		c <- checkResult{
+			name:  p.Identifier(),
+			delay: 0,
+		}
+		return
+	}
+	c <- checkResult{
+		name:  p.Identifier(),
+		delay: delay,
+	}
+}

proxy/geoip.go

@@ -0,0 +1,45 @@
+package proxy
+
+import (
+	"log"
+	"net"
+	"os"
+
+	"github.com/oschwald/geoip2-golang"
+)
+
+// 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/shadowsocks.go

@@ -65,6 +65,14 @@ func (ss *Shadowsocks) SetName(name string) {
 	ss.Name = name
 }
 
+func (ss *Shadowsocks) Type() string {
+	return "ss"
+}
+
+func (ss *Shadowsocks) BaseInfo() *Base {
+	return &ss.Base
+}
+
 func ParseSSLink(link string) (*Shadowsocks, error) {
 	if !strings.HasPrefix(link, "ss://") {
 		return nil, ErrorNotSSRLink

proxy/shadowsocksr.go

@@ -61,6 +61,14 @@ func (ssr *ShadowsocksR) SetName(name string) {
 	ssr.Name = name
 }
 
+func (ssr *ShadowsocksR) Type() string {
+	return "ssr"
+}
+
+func (ssr *ShadowsocksR) BaseInfo() *Base {
+	return &ssr.Base
+}
+
 func ParseSSRLink(link string) (*ShadowsocksR, error) {
 	if !strings.HasPrefix(link, "ssr") {
 		return nil, ErrorNotSSRLink

proxy/vmess.go

@@ -86,6 +86,14 @@ func (v *Vmess) SetName(name string) {
 	v.Name = name
 }
 
+func (v *Vmess) Type() string {
+	return "vmess"
+}
+
+func (v *Vmess) BaseInfo() *Base {
+	return &v.Base
+}
+
 type vmessLinkJson struct {
 	Add  string      `json:"add"`
 	V    string      `json:"v"`

source.yaml

@@ -1,4 +1,5 @@
 sources:
+  # 订阅链接
   - type: subscribe
     options:
       url: https://suda.sub.koicloud.pw/link/K9vz0uFPe9ULfdqX?sub=3
@@ -173,31 +174,37 @@ sources:
   - 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: 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/
 
+  # tg频道
   - type: tgchannel
     options:
       channel: ssrList
@@ -206,67 +213,60 @@ sources:
     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: 200
-
   - 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