simplify app design

app/proxy/config.pb.go

@@ -0,0 +1,42 @@
+package proxy
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+
+type Config struct {
+}
+
+func (m *Config) Reset()                    { *m = Config{} }
+func (m *Config) String() string            { return proto.CompactTextString(m) }
+func (*Config) ProtoMessage()               {}
+func (*Config) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+
+func init() {
+	proto.RegisterType((*Config)(nil), "v2ray.core.app.proxy.Config")
+}
+
+func init() { proto.RegisterFile("v2ray.com/core/app/proxy/config.proto", fileDescriptor0) }
+
+var fileDescriptor0 = []byte{
+	// 128 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x52, 0x2d, 0x33, 0x2a, 0x4a,
+	0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x4f, 0x2c, 0x28, 0xd0, 0x2f,
+	0x28, 0xca, 0xaf, 0xa8, 0xd4, 0x4f, 0xce, 0xcf, 0x4b, 0xcb, 0x4c, 0xd7, 0x2b, 0x28, 0xca, 0x2f,
+	0xc9, 0x17, 0x12, 0x81, 0x29, 0x2b, 0x4a, 0xd5, 0x4b, 0x2c, 0x28, 0xd0, 0x03, 0x2b, 0x51, 0xe2,
+	0xe0, 0x62, 0x73, 0x06, 0xab, 0x72, 0x72, 0xe5, 0x92, 0x48, 0xce, 0xcf, 0xd5, 0xc3, 0xa6, 0xca,
+	0x89, 0x1b, 0xa2, 0x26, 0x00, 0x64, 0x50, 0x14, 0x2b, 0x58, 0x6c, 0x15, 0x93, 0x48, 0x98, 0x51,
+	0x50, 0x62, 0xa5, 0x9e, 0x33, 0x48, 0xa9, 0x63, 0x41, 0x81, 0x5e, 0x00, 0x48, 0x38, 0x89, 0x0d,
+	0x6c, 0x9b, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0x16, 0xbe, 0x54, 0x50, 0x96, 0x00, 0x00, 0x00,
+}

app/proxy/config.proto

@@ -0,0 +1,10 @@
+syntax = "proto3";
+
+package v2ray.core.app.proxy;
+option csharp_namespace = "V2Ray.Core.App.Proxy";
+option go_package = "proxy";
+option java_package = "com.v2ray.core.app.proxy";
+option java_outer_classname = "ConfigProto";
+
+message Config {
+}

app/proxy/proxy.go

@@ -7,29 +7,27 @@ import (
 
 	"v2ray.com/core/app"
 	"v2ray.com/core/app/proxyman"
+	"v2ray.com/core/common"
 	"v2ray.com/core/common/buf"
 	"v2ray.com/core/common/errors"
 	"v2ray.com/core/common/log"
 	v2net "v2ray.com/core/common/net"
+	"v2ray.com/core/common/serial"
 	"v2ray.com/core/transport/internet"
 	"v2ray.com/core/transport/ray"
 )
 
-const (
-	APP_ID = 7
-)
-
 type OutboundProxy struct {
 	outboundManager proxyman.OutboundHandlerManager
 }
 
 func NewOutboundProxy(space app.Space) *OutboundProxy {
 	proxy := new(OutboundProxy)
-	space.InitializeApplication(func() error {
-		if !space.HasApp(proxyman.APP_ID_OUTBOUND_MANAGER) {
-			return errors.New("Proxy: Outbound handler manager not found.")
+	space.OnInitialize(func() error {
+		proxy.outboundManager = proxyman.OutboundHandlerManagerFromSpace(space)
+		if proxy.outboundManager == nil {
+			return errors.New("Proxy: Outbound handler manager not found in space.")
 		}
-		proxy.outboundManager = space.GetApp(proxyman.APP_ID_OUTBOUND_MANAGER).(proxyman.OutboundHandlerManager)
 		return nil
 	})
 	return proxy
@@ -133,3 +131,21 @@ func (v *Connection) Reusable() bool {
 func (v *Connection) SetReusable(bool) {
 
 }
+
+type OutboundProxyFactory struct{}
+
+func (OutboundProxyFactory) Create(space app.Space, config interface{}) (app.Application, error) {
+	return NewOutboundProxy(space), nil
+}
+
+func OutboundProxyFromSpace(space app.Space) *OutboundProxy {
+	app := space.(app.AppGetter).GetApp(serial.GetMessageType((*Config)(nil)))
+	if app == nil {
+		return nil
+	}
+	return app.(*OutboundProxy)
+}
+
+func init() {
+	common.Must(app.RegisterApplicationFactory((*Config)(nil), OutboundProxyFactory{}))
+}

app/proxy/proxy_test.go

@@ -6,7 +6,7 @@ import (
 	"v2ray.com/core/app"
 	. "v2ray.com/core/app/proxy"
 	"v2ray.com/core/app/proxyman"
-	"v2ray.com/core/app/proxyman/outbound"
+	_ "v2ray.com/core/app/proxyman/outbound"
 	"v2ray.com/core/common"
 	v2net "v2ray.com/core/common/net"
 	"v2ray.com/core/proxy"
@@ -21,17 +21,17 @@ func TestProxyDial(t *testing.T) {
 	assert := assert.On(t)
 
 	space := app.NewSpace()
-	outboundManager := outbound.New()
+	assert.Error(space.AddApp(new(proxyman.OutboundConfig)))
+	outboundManager := proxyman.OutboundHandlerManagerFromSpace(space)
 	common.Must(outboundManager.SetHandler("tag", freedom.New(&freedom.Config{}, space, &proxy.OutboundHandlerMeta{
 		Tag: "tag",
 		StreamSettings: &internet.StreamConfig{
 			Network: v2net.Network_TCP,
 		},
 	})))
-	space.BindApp(proxyman.APP_ID_OUTBOUND_MANAGER, outboundManager)
 
-	proxy := NewOutboundProxy(space)
-	space.BindApp(APP_ID, proxy)
+	assert.Error(space.AddApp(new(Config))).IsNil()
+	proxy := OutboundProxyFromSpace(space)
 
 	assert.Error(space.Initialize()).IsNil()