initializable apps

app/router/router.go

@@ -2,6 +2,7 @@ package router
 
 import (
 	"github.com/v2ray/v2ray-core/app"
+	"github.com/v2ray/v2ray-core/common"
 	v2net "github.com/v2ray/v2ray-core/common/net"
 )
 
@@ -10,6 +11,7 @@ const (
 )
 
 type Router interface {
+	common.Releasable
 	TakeDetour(v2net.Destination) (string, error)
 }
 

app/router/router_test.go

@@ -1,31 +0,0 @@
-package router_test
-
-import (
-	"net"
-	"path/filepath"
-	"testing"
-
-	. "github.com/v2ray/v2ray-core/app/router"
-	_ "github.com/v2ray/v2ray-core/app/router/rules"
-	v2net "github.com/v2ray/v2ray-core/common/net"
-	"github.com/v2ray/v2ray-core/shell/point"
-	v2testing "github.com/v2ray/v2ray-core/testing"
-	"github.com/v2ray/v2ray-core/testing/assert"
-)
-
-func TestRouter(t *testing.T) {
-	v2testing.Current(t)
-
-	baseDir := "$GOPATH/src/github.com/v2ray/v2ray-core/release/config"
-
-	pointConfig, err := point.LoadConfig(filepath.Join(baseDir, "vpoint_socks_vmess.json"))
-	assert.Error(err).IsNil()
-
-	router, err := CreateRouter(pointConfig.RouterConfig.Strategy, pointConfig.RouterConfig.Settings, nil)
-	assert.Error(err).IsNil()
-
-	dest := v2net.TCPDestination(v2net.IPAddress(net.ParseIP("120.135.126.1")), 80)
-	tag, err := router.TakeDetour(dest)
-	assert.Error(err).IsNil()
-	assert.StringLiteral(tag).Equals("direct")
-}

app/router/rules/router.go

@@ -41,23 +41,34 @@ func (this *cacheEntry) Extend() {
 }
 
 type Router struct {
-	config *RouterRuleConfig
-	cache  *collect.ValidityMap
-	space  app.Space
+	config    *RouterRuleConfig
+	cache     *collect.ValidityMap
+	dnsServer dns.Server
 }
 
 func NewRouter(config *RouterRuleConfig, space app.Space) *Router {
-	return &Router{
+	r := &Router{
 		config: config,
 		cache:  collect.NewValidityMap(3600),
-		space:  space,
 	}
+	space.InitializeApplication(func() error {
+		if !space.HasApp(dns.APP_ID) {
+			log.Error("DNS: Router is not found in the space.")
+			return app.ErrorMissingApplication
+		}
+		r.dnsServer = space.GetApp(dns.APP_ID).(dns.Server)
+		return nil
+	})
+	return r
+}
+
+func (this *Router) Release() {
+
 }
 
 // @Private
 func (this *Router) ResolveIP(dest v2net.Destination) []v2net.Destination {
-	dnsServer := this.space.GetApp(dns.APP_ID).(dns.Server)
-	ips := dnsServer.Get(dest.Address().Domain())
+	ips := this.dnsServer.Get(dest.Address().Domain())
 	if len(ips) == 0 {
 		return nil
 	}

app/router/rules/router_test.go

@@ -3,6 +3,12 @@ package rules_test
 import (
 	"testing"
 
+	"github.com/v2ray/v2ray-core/app"
+	"github.com/v2ray/v2ray-core/app/dispatcher"
+	dispatchers "github.com/v2ray/v2ray-core/app/dispatcher/impl"
+	"github.com/v2ray/v2ray-core/app/dns"
+	"github.com/v2ray/v2ray-core/app/proxyman"
+	"github.com/v2ray/v2ray-core/app/router"
 	. "github.com/v2ray/v2ray-core/app/router/rules"
 	v2net "github.com/v2ray/v2ray-core/common/net"
 	v2testing "github.com/v2ray/v2ray-core/testing"
@@ -21,9 +27,15 @@ func TestSimpleRouter(t *testing.T) {
 		},
 	}
 
-	router := NewRouter(config, nil)
+	space := app.NewSpace()
+	space.BindApp(dns.APP_ID, dns.NewCacheServer(space, &dns.Config{}))
+	space.BindApp(dispatcher.APP_ID, dispatchers.NewDefaultDispatcher(space))
+	space.BindApp(proxyman.APP_ID_OUTBOUND_MANAGER, proxyman.NewDefaultOutboundHandlerManager())
+	r := NewRouter(config, space)
+	space.BindApp(router.APP_ID, r)
+	assert.Error(space.Initialize()).IsNil()
 
-	tag, err := router.TakeDetour(v2net.TCPDestination(v2net.DomainAddress("v2ray.com"), 80))
+	tag, err := r.TakeDetour(v2net.TCPDestination(v2net.DomainAddress("v2ray.com"), 80))
 	assert.Error(err).IsNil()
 	assert.StringLiteral(tag).Equals("test")
 }