Fix: Direct & Reject name

adapters/outbound/direct.go

@@ -24,7 +24,7 @@ func (d *DirectAdapter) Conn() net.Conn {
 type Direct struct{}
 
 func (d *Direct) Name() string {
-	return "Direct"
+	return "DIRECT"
 }
 
 func (d *Direct) Type() C.AdapterType {

adapters/outbound/reject.go

@@ -25,7 +25,7 @@ type Reject struct {
 }
 
 func (r *Reject) Name() string {
-	return "Reject"
+	return "REJECT"
 }
 
 func (r *Reject) Type() C.AdapterType {

adapters/outbound/selector.go

@@ -52,21 +52,20 @@ func (s *Selector) Set(name string) error {
 	return nil
 }
 
-func NewSelector(name string, proxies map[string]C.Proxy) (*Selector, error) {
+func NewSelector(name string, proxies []C.Proxy) (*Selector, error) {
 	if len(proxies) == 0 {
 		return nil, errors.New("Provide at least one proxy")
 	}
 
 	mapping := make(map[string]C.Proxy)
-	var init string
+	for _, proxy := range proxies {
-	for k, v := range proxies {
+		mapping[proxy.Name()] = proxy
-		mapping[k] = v
-		init = k
 	}
+
 	s := &Selector{
 		name:     name,
 		proxies:  mapping,
-		selected: proxies[init],
+		selected: proxies[0],
 	}
 	return s, nil
 }

config/config.go

@@ -312,13 +312,9 @@ func (c *Config) parseProxies(cfg *RawConfig) error {
 				break
 			}
 
-			var ps []C.Proxy
+			ps, err := getProxies(proxies, urlTestOption.Proxies)
-			for _, name := range urlTestOption.Proxies {
+			if err != nil {
-				p, ok := proxies[name]
+				return fmt.Errorf("ProxyGroup %s: %s", groupName, err.Error())
-				if !ok {
-					return fmt.Errorf("ProxyGroup %s: proxy or proxy group '%s' not found", groupName, name)
-				}
-				ps = append(ps, p)
 			}
 			group, err = adapters.NewURLTest(*urlTestOption, ps)
 		case "select":
@@ -327,28 +323,22 @@ func (c *Config) parseProxies(cfg *RawConfig) error {
 			if err != nil {
 				break
 			}
-			selectProxy := make(map[string]C.Proxy)
+
-			for _, name := range selectorOption.Proxies {
+			ps, err := getProxies(proxies, selectorOption.Proxies)
-				proxy, exist := proxies[name]
+			if err != nil {
-				if !exist {
+				return fmt.Errorf("ProxyGroup %s: %s", groupName, err.Error())
-					return fmt.Errorf("ProxyGroup %s: proxy or proxy group '%s' not found", groupName, name)
 			}
-				selectProxy[name] = proxy
+			group, err = adapters.NewSelector(selectorOption.Name, ps)
-			}
-			group, err = adapters.NewSelector(selectorOption.Name, selectProxy)
 		case "fallback":
 			fallbackOption := &adapters.FallbackOption{}
 			err = decoder.Decode(mapping, fallbackOption)
 			if err != nil {
 				break
 			}
-			var ps []C.Proxy
+
-			for _, name := range fallbackOption.Proxies {
+			ps, err := getProxies(proxies, fallbackOption.Proxies)
-				p, ok := proxies[name]
+			if err != nil {
-				if !ok {
+				return fmt.Errorf("ProxyGroup %s: %s", groupName, err.Error())
-					return fmt.Errorf("ProxyGroup %s: proxy or proxy group '%s' not found", groupName, name)
-				}
-				ps = append(ps, p)
 			}
 			group, err = adapters.NewFallback(*fallbackOption, ps)
 		}
@@ -358,7 +348,12 @@ func (c *Config) parseProxies(cfg *RawConfig) error {
 		proxies[groupName] = group
 	}
 
-	proxies["GLOBAL"], _ = adapters.NewSelector("GLOBAL", proxies)
+	var ps []C.Proxy
+	for _, v := range proxies {
+		ps = append(ps, v)
+	}
+
+	proxies["GLOBAL"], _ = adapters.NewSelector("GLOBAL", ps)
 
 	// close old goroutine
 	for _, proxy := range c.proxies {

config/utils.go

@@ -3,6 +3,8 @@ package config
 import (
 	"fmt"
 	"strings"
+
+	C "github.com/Dreamacro/clash/constant"
 )
 
 func trimArr(arr []string) (r []string) {
@@ -19,6 +21,18 @@ func genAddr(port int, allowLan bool) string {
 	return fmt.Sprintf("127.0.0.1:%d", port)
 }
 
+func getProxies(mapping map[string]C.Proxy, list []string) ([]C.Proxy, error) {
+	var ps []C.Proxy
+	for _, name := range list {
+		p, ok := mapping[name]
+		if !ok {
+			return nil, fmt.Errorf("'%s' not found", name)
+		}
+		ps = append(ps, p)
+	}
+	return ps, nil
+}
+
 func or(pointers ...*int) *int {
 	for _, p := range pointers {
 		if p != nil {

go.mod

@@ -1,7 +1,7 @@
 module github.com/Dreamacro/clash
 
 require (
-	github.com/Dreamacro/go-shadowsocks2 v0.1.2-0.20181016063207-89bf7cffdaf4
+	github.com/Dreamacro/go-shadowsocks2 v0.1.2-0.20181019110427-0a03f1a25270
 	github.com/eapache/queue v1.1.0 // indirect
 	github.com/go-chi/chi v3.3.3+incompatible
 	github.com/go-chi/cors v1.0.0

go.sum

@@ -1,5 +1,5 @@
-github.com/Dreamacro/go-shadowsocks2 v0.1.2-0.20181016063207-89bf7cffdaf4 h1:n+F4LoHdFCwsGohVN+4dwfmmx0h2uvdPEeiwdhFeH8g=
+github.com/Dreamacro/go-shadowsocks2 v0.1.2-0.20181019110427-0a03f1a25270 h1:ugkI+Yw5ArFnhF8KTbJxyWIyvxMCa8jWyUF+wIAulhM=
-github.com/Dreamacro/go-shadowsocks2 v0.1.2-0.20181016063207-89bf7cffdaf4/go.mod h1:DlkXRxmh5K+99aTPQaVjsZ1fAZNFw42vXGcOjR3Otps=
+github.com/Dreamacro/go-shadowsocks2 v0.1.2-0.20181019110427-0a03f1a25270/go.mod h1:DlkXRxmh5K+99aTPQaVjsZ1fAZNFw42vXGcOjR3Otps=
 github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY=
 github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=