UPDATE Inbounds. Support http, socks, socks5

conf/conf_val.go

@@ -52,19 +52,21 @@ func (cf Conf) GetSubscribeData() string {
 	}
 	return strings.TrimSpace(string(b))
 }
+
 func (cf Conf) HttpProxySplit() []string {
 	spt := strings.Split(cf.HttpProxy, ":")
 	lensp := len(spt)
 	if lensp != 3 {
 		panic(fmt.Errorf("HttpProxy(%s)设置不正确.例:%s", cf.HttpProxy, DEFAULT_HTTP_PROXY))
 	}
 	protcl := spt[0]
-	okprotcls := []string{"http"} // , "socks"
+	okprotcls := []string{"http", "socks", "socks5"}
 	if miniutils.GetIndexOf(protcl, okprotcls) == -1 {
 		panic(fmt.Errorf("HttpProxy(%s)设置不正确. Protocol Only Support: %v", cf.HttpProxy, okprotcls))
 	}
 	return spt
 }
+
 func (cf Conf) GetHttpProxyPort() int {
 	spt := cf.HttpProxySplit()
 	portStr := spt[2]
@@ -76,8 +78,10 @@ func (cf Conf) GetHttpProxyPort() int {
 }
 
 // GetHttpProxyProtocol. get SystemProxy Inbound Protocol By HttpProxy. Only Support http and socks
+// curl --proxy socks5://127.0.0.1:30000 https://httpbin.org/get -v
+// curl --proxy http://127.0.0.1:30000 https://httpbin.org/get -v
 func (cf Conf) GetHttpProxyProtocol() string {
-	spt := strings.Split(cf.HttpProxy, ":")
+	spt := cf.HttpProxySplit()
 	return spt[0]
 }
 

main/conf.go

@@ -148,6 +148,7 @@ VP_SUBSCRIBE_URL = "%s"
 VP_SUBSCRIBE_DATA_FILE = "%s"
 
 # 设置HTTP代理，代理池每个节点的本地端口号，往后开始累加。为防止与常用端口冲突，尽量设大点。
+# 支持http和socks5入站协议
 VP_HTTP_PROXY = "%s"
 
 # 节点测速的URL

proxy_node.go

@@ -46,8 +46,12 @@ func (p *ProxyNode) SetV2ray(n V2rayNode) *ProxyNode {
 
 func (p *ProxyNode) AddToPool(c *V2rayApiClient) error {
 	tag := getProxyNodeTag(p.Index)
-	// 本地入站协议一律使用http
-	err := c.AddInbound(net.Port(p.LocalPort), tag, "http")
+	cf := getConf()
+	protcl := cf.GetHttpProxyProtocol()
+	if protcl == "socks5" {
+		protcl = "socks"
+	}
+	err := c.AddInbound(net.Port(p.LocalPort), tag, protcl)
 	if err != nil {
 		return err
 	}

v2ray_config.go

@@ -241,6 +241,9 @@ func setV2rayConfigV4Inbounds(confv4 *V2rayConfigV4, inPort int, cf conf.Conf) {
 		// https://www.v2fly.org/config/protocols/http.html#inboundconfigurationobject
 		inset1 := `{"allowTransparent":false,"timeout":30}`
 		protcl := cf.GetHttpProxyProtocol()
+		if protcl == "socks5" {
+			protcl = "socks"
+		}
 		if protcl == "socks" {
 			inset1 = `{"auth":"noauth","ip":"127.0.0.1","udp":true}`
 		}

v2raypool.go

@@ -26,7 +26,6 @@ func GetProxyPool() *ProxyPool {
 }
 
 type ProxyPool struct {
-	cf                             conf.Conf
 	serverMap                      map[int]*V2rayServer
 	startAt                        time.Time
 	activeCmd                      *exec.Cmd
@@ -48,7 +47,7 @@ func (p ProxyPool) GetLocalPortRange() string {
 	return fmt.Sprintf("%d-%d", p.nodes[0].LocalPort, p.nodes[len(p.nodes)-1].LocalPort)
 }
 func (p ProxyPool) GetLocalPortList() (dl []int, err error) {
-	cf := conf.GetConf()
+	cf := getConf()
 	for _, v := range p.serverMap {
 		conf := V2rayConfigV4{}
 		err = v.jconf.Decode(&conf)
@@ -403,8 +402,11 @@ func (p *ProxyPool) SetLocalAddr(n *ProxyNode, port int) string {
 	} else {
 		n.LocalPort = port
 	}
-	// 本地入站协议一律使用http
-	n.localAddr = fmt.Sprintf("http://127.0.0.1:%d", n.LocalPort)
+	protcl := getConf().GetHttpProxyProtocol()
+	if protcl == "socks" {
+		protcl = "socks5"
+	}
+	n.localAddr = fmt.Sprintf("%s://127.0.0.1:%d", protcl, n.LocalPort)
 	return n.localAddr
 }
 
@@ -428,7 +430,7 @@ func (p *ProxyPool) testOneNode(n *ProxyNode, i int) bool {
 func (p *ProxyPool) TestAllForce() {
 	p.IsLock = true
 	runcount := 0
-	logger := p.cf.GetLogger()
+	logger := getConf().GetLogger()
 	for i, n := range p.nodes {
 		if n.IsRunning() {
 			runcount++
@@ -516,7 +518,7 @@ func (p *ProxyPool) StartAll() error {
 		if !n.IsRunning() {
 			err = n.AddToPool(c)
 			if err != nil {
-				logger := p.cf.GetLogger()
+				logger := getConf().GetLogger()
 				logger.Errorf("------StartAll--err--addr(%s)--AddToPool(%v)", n.RemoteAddr, err)
 				break
 			}
@@ -693,11 +695,15 @@ func (p *ProxyPool) ActiveNode(n ProxyNode, globalProxy bool) error {
 	return err
 }
 
+func getConf() conf.Conf {
+	return conf.GetConf()
+}
+
 // proxyPoolInit 初始化代理池
 // 在schedule中更新订阅
 // https://cloud.tencent.com/developer/article/1564128
 func proxyPoolInit() {
-	cf := conf.GetConf()
+	cf := getConf()
 	subscribeRawData := cf.GetSubscribeData()
 	if cf.SubscribeUrl == "" {
 		// subscribeRawData == ""
@@ -706,7 +712,6 @@ func proxyPoolInit() {
 	port := cf.GetHttpProxyPort()
 
 	pp := GetProxyPool()
-	pp.cf = cf
 	pp.SetV2rayPath(cf.V2rayPath).
 		SetTestUrl(cf.TestUrl).
 		SetSubscribeRawData(subscribeRawData).