Move config cache to proxy/common

config/config.go

@@ -1,12 +1,5 @@
 package config
 
-type Type string
-
-const (
-	TypeInbound  = Type("inbound")
-	TypeOutbound = Type("outbound")
-)
-
 type RouterConfig interface {
 	Strategy() string
 	Settings() interface{}

config/json/config_cache.go

@@ -1,20 +0,0 @@
-package json
-
-import (
-	"github.com/v2ray/v2ray-core/config"
-)
-
-type ConfigObjectCreator func() interface{}
-
-var (
-	configCache = make(map[string]ConfigObjectCreator)
-)
-
-func getConfigKey(protocol string, cType config.Type) string {
-	return protocol + "_" + string(cType)
-}
-
-func RegisterConfigType(protocol string, cType config.Type, creator ConfigObjectCreator) {
-	// TODO: check name
-	configCache[getConfigKey(protocol, cType)] = creator
-}

config/json/connection.go

@@ -4,13 +4,14 @@ import (
 	"encoding/json"
 
 	"github.com/v2ray/v2ray-core/common/log"
-	"github.com/v2ray/v2ray-core/config"
+	proxyconfig "github.com/v2ray/v2ray-core/proxy/common/config"
+	proxyjson "github.com/v2ray/v2ray-core/proxy/common/config/json"
 )
 
 type ConnectionConfig struct {
 	ProtocolString  string           `json:"protocol"`
 	SettingsMessage json.RawMessage  `json:"settings"`
-	Type            config.Type     `json:"-"`
+	Type            proxyconfig.Type `json:"-"`
 }
 
 func (c *ConnectionConfig) Protocol() string {
@@ -18,11 +19,10 @@ func (c *ConnectionConfig) Protocol() string {
 }
 
 func (c *ConnectionConfig) Settings() interface{} {
-	creator, found := configCache[getConfigKey(c.Protocol(), c.Type)]
+	configObj := proxyjson.CreateConfig(c.Protocol(), c.Type)
-	if !found {
+	if configObj == nil {
 		panic("Unknown protocol " + c.Protocol())
 	}
-	configObj := creator()
 	err := json.Unmarshal(c.SettingsMessage, configObj)
 	if err != nil {
 		log.Error("Unable to parse connection config: %v", err)

config/json/json.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/v2ray/v2ray-core/common/log"
 	"github.com/v2ray/v2ray-core/config"
+	proxyconfig "github.com/v2ray/v2ray-core/proxy/common/config"
 )
 
 // Config is the config for Point server.
@@ -57,8 +58,8 @@ func LoadConfig(file string) (*Config, error) {
 		return nil, err
 	}
 
-	jsonConfig.InboundConfigValue.Type = config.TypeInbound
+	jsonConfig.InboundConfigValue.Type = proxyconfig.TypeInbound
-	jsonConfig.OutboundConfigValue.Type = config.TypeOutbound
+	jsonConfig.OutboundConfigValue.Type = proxyconfig.TypeOutbound
 
 	return jsonConfig, err
 }

proxy/blackhole/config/json/json.go

@@ -1,15 +1,14 @@
 package json
 
 import (
-	"github.com/v2ray/v2ray-core/config"
+	"github.com/v2ray/v2ray-core/proxy/common/config/json"
-	"github.com/v2ray/v2ray-core/config/json"
 )
 
 type BlackHoleConfig struct {
 }
 
 func init() {
-	json.RegisterConfigType("blackhole", config.TypeInbound, func() interface{} {
+	json.RegisterOutboundConnectionConfig("blackhole", func() interface{} {
 		return new(BlackHoleConfig)
 	})
 }

proxy/common/config/errors.go

@@ -0,0 +1,9 @@
+package config
+
+import (
+	"errors"
+)
+
+var (
+	BadConfiguration = errors.New("Bad proxy configuration.")
+)

proxy/common/config/json/config_cache.go

@@ -0,0 +1,37 @@
+package json
+
+import (
+	"github.com/v2ray/v2ray-core/proxy/common/config"
+)
+
+type ConfigObjectCreator func() interface{}
+
+var (
+	configCache = make(map[string]ConfigObjectCreator)
+)
+
+func getConfigKey(protocol string, cType config.Type) string {
+	return protocol + "_" + string(cType)
+}
+
+func registerConfigType(protocol string, cType config.Type, creator ConfigObjectCreator) error {
+	// TODO: check name
+	configCache[getConfigKey(protocol, cType)] = creator
+	return nil
+}
+
+func RegisterInboundConnectionConfig(protocol string, creator ConfigObjectCreator) error {
+	return registerConfigType(protocol, config.TypeInbound, creator)
+}
+
+func RegisterOutboundConnectionConfig(protocol string, creator ConfigObjectCreator) error {
+	return registerConfigType(protocol, config.TypeOutbound, creator)
+}
+
+func CreateConfig(protocol string, cType config.Type) interface{} {
+	creator, found := configCache[getConfigKey(protocol, cType)]
+	if !found {
+		return nil
+	}
+	return creator()
+}

proxy/common/config/type.go

@@ -0,0 +1,8 @@
+package config
+
+type Type string
+
+const (
+	TypeInbound  = Type("inbound")
+	TypeOutbound = Type("outbound")
+)

proxy/dokodemo/config/json/json.go

@@ -3,8 +3,7 @@ package json
 import (
 	v2net "github.com/v2ray/v2ray-core/common/net"
 	v2netjson "github.com/v2ray/v2ray-core/common/net/json"
-	"github.com/v2ray/v2ray-core/config"
+	"github.com/v2ray/v2ray-core/proxy/common/config/json"
-	"github.com/v2ray/v2ray-core/config/json"
 )
 
 type DokodemoConfig struct {
@@ -17,7 +16,7 @@ type DokodemoConfig struct {
 }
 
 func init() {
-	json.RegisterConfigType("dokodemo-door", config.TypeInbound, func() interface{} {
+	json.RegisterInboundConnectionConfig("dokodemo-door", func() interface{} {
 		return new(DokodemoConfig)
 	})
 }

proxy/freedom/config/json/json.go

@@ -1,15 +1,14 @@
 package json
 
 import (
-	"github.com/v2ray/v2ray-core/config"
+	"github.com/v2ray/v2ray-core/proxy/common/config/json"
-	"github.com/v2ray/v2ray-core/config/json"
 )
 
 type FreedomConfiguration struct {
 }
 
 func init() {
-	json.RegisterConfigType("freedom", config.TypeOutbound, func() interface{} {
+	json.RegisterOutboundConnectionConfig("freedom", func() interface{} {
 		return &FreedomConfiguration{}
 	})
 }

proxy/http/config/json/json.go

@@ -1,15 +1,14 @@
 package json
 
 import (
-	"github.com/v2ray/v2ray-core/config"
+	"github.com/v2ray/v2ray-core/proxy/common/config/json"
-	"github.com/v2ray/v2ray-core/config/json"
 )
 
 type HttpProxyConfig struct {
 }
 
 func init() {
-	json.RegisterConfigType("http", config.TypeInbound, func() interface{} {
+	json.RegisterInboundConnectionConfig("http", func() interface{} {
 		return new(HttpProxyConfig)
 	})
 }

proxy/socks/config/json/config.go

@@ -3,8 +3,7 @@ package json
 import (
 	"net"
 
-	"github.com/v2ray/v2ray-core/config"
+	"github.com/v2ray/v2ray-core/proxy/common/config/json"
-	"github.com/v2ray/v2ray-core/config/json"
 )
 
 const (
@@ -61,7 +60,7 @@ func (sc *SocksConfig) IP() net.IP {
 }
 
 func init() {
-	json.RegisterConfigType("socks", config.TypeInbound, func() interface{} {
+	json.RegisterInboundConnectionConfig("socks", func() interface{} {
 		return new(SocksConfig)
 	})
 }

proxy/vmess/config/json/inbound.go

@@ -1,8 +1,7 @@
 package json
 
 import (
-	"github.com/v2ray/v2ray-core/config"
+	"github.com/v2ray/v2ray-core/proxy/common/config/json"
-	"github.com/v2ray/v2ray-core/config/json"
 	vmessconfig "github.com/v2ray/v2ray-core/proxy/vmess/config"
 )
 
@@ -24,7 +23,7 @@ func (c *Inbound) UDPEnabled() bool {
 }
 
 func init() {
-	json.RegisterConfigType("vmess", config.TypeInbound, func() interface{} {
+	json.RegisterInboundConnectionConfig("vmess", func() interface{} {
 		return new(Inbound)
 	})
 }

proxy/vmess/config/json/outbound.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/v2ray/v2ray-core/common/log"
 	v2net "github.com/v2ray/v2ray-core/common/net"
-	"github.com/v2ray/v2ray-core/config"
+	proxyconfig "github.com/v2ray/v2ray-core/proxy/common/config"
-	jsonconfig "github.com/v2ray/v2ray-core/config/json"
+	jsonconfig "github.com/v2ray/v2ray-core/proxy/common/config/json"
 	vmessconfig "github.com/v2ray/v2ray-core/proxy/vmess/config"
 )
 
@@ -39,7 +39,7 @@ func (t *ConfigTarget) UnmarshalJSON(data []byte) error {
 	ip := net.ParseIP(rawConfig.Address)
 	if ip == nil {
 		log.Error("Unable to parse IP: %s", rawConfig.Address)
-		return config.BadConfiguration
+		return proxyconfig.BadConfiguration
 	}
 	t.Address = v2net.IPAddress(ip, rawConfig.Port)
 	if rawConfig.HasNetwork("tcp") {
@@ -79,7 +79,7 @@ func (o *Outbound) Targets() []*vmessconfig.OutboundTarget {
 }
 
 func init() {
-	jsonconfig.RegisterConfigType("vmess", config.TypeOutbound, func() interface{} {
+	jsonconfig.RegisterOutboundConnectionConfig("vmess", func() interface{} {
 		return new(Outbound)
 	})
 }