fix country name is none

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)

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

@@ -8,8 +8,6 @@ import (
 	"strconv"
 	"sync"
 
-	"github.com/zu1k/proxypool/checker"
-
 	"github.com/zu1k/proxypool/config"
 	"gopkg.in/yaml.v2"
 
@@ -63,17 +61,19 @@ 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)
-
-	proxies = checker.CleanProxies(provider.Clash{Proxies: proxies}.CleanProxies())
-	log.Println("CrawlGo clash useable node count:", len(proxies))
 	cache.SetString("clashproxies", provider.Clash{Proxies: proxies}.Provide())
 	cache.SetString("surgeproxies", provider.Surge{Proxies: proxies}.Provide())
 }

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

getter/web_fanqiangdang.go

@@ -20,7 +20,7 @@ type WebFanqiangdang struct {
 	results   []string
 }
 
-func NewWebFanqiangdangGetter(options tool.Options) Getter {
+func NewWebFanqiangdangGetter(options tool.Options) (getter Getter, err error) {
 	num, found := options["num"]
 
 	t := 200
@@ -34,15 +34,19 @@ func NewWebFanqiangdangGetter(options tool.Options) Getter {
 	if !found || t <= 0 {
 		t = 200
 	}
-	url, found := options["url"]
+	urlInterface, found := options["url"]
 	if found {
+		url, err := AssertTypeStringNotNull(urlInterface)
+		if err != nil {
+			return nil, err
+		}
 		return &WebFanqiangdang{
 			c:         colly.NewCollector(),
 			NumNeeded: t,
-			Url:       url.(string),
-		}
+			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

@@ -22,12 +22,14 @@ require (
 	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/temoto/robotstxt v1.1.1 // 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

go.sum

@@ -164,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=
@@ -258,6 +260,11 @@ 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=
@@ -277,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=
@@ -298,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=
@@ -396,6 +409,7 @@ golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod h1:h1NjWce9XRLGQEsW7w
 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=
@@ -404,6 +418,8 @@ 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=
@@ -424,6 +440,7 @@ 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=
@@ -492,5 +509,6 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh
 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,22 +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)
+	}
+}

proxy/base.go

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

proxy/check.go

@@ -1,4 +1,4 @@
-package checker
+package proxy
 
 import (
 	"context"
@@ -7,12 +7,11 @@ import (
 	"time"
 
 	"github.com/Dreamacro/clash/adapters/outbound"
-	"github.com/zu1k/proxypool/proxy"
 )
 
 const defaultURLTestTimeout = time.Second * 15
 
-func Check(p proxy.Proxy) (delay uint16, err error) {
+func Check(p Proxy) (delay uint16, err error) {
 	pmap := make(map[string]interface{})
 	err = json.Unmarshal([]byte(p.String()), &pmap)
 	if err != nil {
@@ -30,12 +29,12 @@ func Check(p proxy.Proxy) (delay uint16, err error) {
 		return
 	}
 	ctx, cancel := context.WithTimeout(context.Background(), defaultURLTestTimeout)
+	defer cancel()
 	delay, err = clashProxy.URLTest(ctx, "http://www.gstatic.com/generate_204")
-	cancel()
 	return delay, err
 }
 
-func CleanProxies(proxies []proxy.Proxy) (cproxies []proxy.Proxy) {
+func CleanProxies(proxies []Proxy) (cproxies []Proxy) {
 	c := make(chan checkResult, 40)
 	for _, p := range proxies {
 		go checkProxyWithChan(p, c)
@@ -48,7 +47,7 @@ func CleanProxies(proxies []proxy.Proxy) (cproxies []proxy.Proxy) {
 			okMap[r.name] = struct{}{}
 		}
 	}
-	cproxies = make([]proxy.Proxy, 0)
+	cproxies = make([]Proxy, 0)
 	for _, p := range proxies {
 		if _, ok := okMap[p.Identifier()]; ok {
 			cproxies = append(cproxies, p)
@@ -62,13 +61,14 @@ type checkResult struct {
 	delay uint16
 }
 
-func checkProxyWithChan(p proxy.Proxy, c chan checkResult) {
+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(),

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

@@ -69,6 +69,10 @@ 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

@@ -65,6 +65,10 @@ 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

@@ -90,6 +90,10 @@ 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