diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index b777d0b..9af7e3d 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -26,6 +26,12 @@ jobs: run: | go test ./... + - name: gen go-bindata + run: | + go get -u github.com/go-bindata/go-bindata/... + go-bindata -o internal/bindata/geoip/geoip.go -pkg bingeoip assets/GeoLite2-City.mmdb + go-bindata -o internal/bindata/html/html.go -pkg binhtml assets/html/ + - name: Build if: startsWith(github.ref, 'refs/tags/') env: diff --git a/api/router.go b/api/router.go index 835943b..f2a79fc 100644 --- a/api/router.go +++ b/api/router.go @@ -1,13 +1,14 @@ package api import ( + "html/template" "net/http" "os" - "github.com/zu1k/proxypool/config" - "github.com/gin-gonic/gin" _ "github.com/heroku/x/hmetrics/onload" + "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" ) @@ -19,11 +20,15 @@ var router *gin.Engine func setupRouter() { gin.SetMode(gin.ReleaseMode) router = gin.New() - router.Use(gin.Recovery()) - router.LoadHTMLGlob("assets/html/*") + router.Use(gin.Logger(), gin.Recovery()) + temp, err := loadTemplate() + if err != nil { + panic(err) + } + router.SetHTMLTemplate(temp) router.GET("/", func(c *gin.Context) { - c.HTML(http.StatusOK, "index.html", gin.H{ + c.HTML(http.StatusOK, "assets/html/index.html", gin.H{ "domain": config.Config.Domain, "getters_count": cache.GettersCount, "all_proxies_count": cache.AllProxiesCount, @@ -38,25 +43,25 @@ func setupRouter() { }) router.GET("/clash", func(c *gin.Context) { - c.HTML(http.StatusOK, "clash.html", gin.H{ + 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, "surge.html", gin.H{ + 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, "clash-config.yaml", gin.H{ + 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, "surge.conf", gin.H{ + c.HTML(http.StatusOK, "assets/html/surge.conf", gin.H{ "domain": config.Config.Domain, }) }) @@ -104,3 +109,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 +} diff --git a/go.mod b/go.mod index 41c7b87..bb595d9 100644 --- a/go.mod +++ b/go.mod @@ -12,6 +12,7 @@ require ( github.com/cloudflare/cloudflare-go v0.13.0 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 diff --git a/go.sum b/go.sum index f4bf22a..3d35daa 100644 --- a/go.sum +++ b/go.sum @@ -45,6 +45,9 @@ 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-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/go.mod h1:K2Yje0VW/SJzxiyMYu6iPQYa7hMjQX2i/F491VChg1I= github.com/go-chi/render v1.0.1/go.mod h1:pq4Rr7HbnsdaeHagklXub+p6Wd16Af5l9koip1OvJns= diff --git a/internal/bindata/geoip/geoip.go b/internal/bindata/geoip/geoip.go new file mode 100644 index 0000000..fdea675 --- /dev/null +++ b/internal/bindata/geoip/geoip.go @@ -0,0 +1,192 @@ +// Code generated for package bingeoip by go-bindata DO NOT EDIT. (@generated) +// sources: +// assets/GeoLite2-City.mmdb +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 := "D:\\Project\\proxypool\\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 +} + +// 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, +} + +// 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{}}, + }}, +}} + +// 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, "/")...)...) +} diff --git a/internal/bindata/html/html.go b/internal/bindata/html/html.go new file mode 100644 index 0000000..fbca990 --- /dev/null +++ b/internal/bindata/html/html.go @@ -0,0 +1,278 @@ +// Code generated for package binhtml by go-bindata DO NOT EDIT. (@generated) +// sources: +// assets/html/clash-config.yaml +// assets/html/clash.html +// assets/html/index.html +// assets/html/surge.conf +// assets/html/surge.html +package binhtml + +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 +} + +// assetsHtmlClashConfigYaml reads file data from disk. It returns an error on failure. +func assetsHtmlClashConfigYaml() (*asset, error) { + path := "D:\\Project\\proxypool\\assets\\html\\clash-config.yaml" + name := "assets/html/clash-config.yaml" + 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 +} + +// assetsHtmlClashHtml reads file data from disk. It returns an error on failure. +func assetsHtmlClashHtml() (*asset, error) { + path := "D:\\Project\\proxypool\\assets\\html\\clash.html" + name := "assets/html/clash.html" + 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 +} + +// assetsHtmlIndexHtml reads file data from disk. It returns an error on failure. +func assetsHtmlIndexHtml() (*asset, error) { + path := "D:\\Project\\proxypool\\assets\\html\\index.html" + name := "assets/html/index.html" + 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 +} + +// assetsHtmlSurgeConf reads file data from disk. It returns an error on failure. +func assetsHtmlSurgeConf() (*asset, error) { + path := "D:\\Project\\proxypool\\assets\\html\\surge.conf" + name := "assets/html/surge.conf" + 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 +} + +// assetsHtmlSurgeHtml reads file data from disk. It returns an error on failure. +func assetsHtmlSurgeHtml() (*asset, error) { + path := "D:\\Project\\proxypool\\assets\\html\\surge.html" + name := "assets/html/surge.html" + 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/html/clash-config.yaml": assetsHtmlClashConfigYaml, + "assets/html/clash.html": assetsHtmlClashHtml, + "assets/html/index.html": assetsHtmlIndexHtml, + "assets/html/surge.conf": assetsHtmlSurgeConf, + "assets/html/surge.html": assetsHtmlSurgeHtml, +} + +// 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{ + "html": &bintree{nil, map[string]*bintree{ + "clash-config.yaml": &bintree{assetsHtmlClashConfigYaml, map[string]*bintree{}}, + "clash.html": &bintree{assetsHtmlClashHtml, map[string]*bintree{}}, + "index.html": &bintree{assetsHtmlIndexHtml, map[string]*bintree{}}, + "surge.conf": &bintree{assetsHtmlSurgeConf, map[string]*bintree{}}, + "surge.html": &bintree{assetsHtmlSurgeHtml, 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, "/")...)...) +} diff --git a/pkg/proxy/geoip.go b/pkg/proxy/geoip.go index e47005c..bdd45a4 100644 --- a/pkg/proxy/geoip.go +++ b/pkg/proxy/geoip.go @@ -6,11 +6,16 @@ import ( "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) + } geoIp = NewGeoIP("assets/GeoLite2-City.mmdb") }