feat/refactor: refactor outbound and support v2ray-plugin (daeunivers…

…e#390)

component/outbound/dialer/block.go

@@ -6,45 +6,14 @@
 package dialer
 
 import (
-	"fmt"
-	"net"
-
+	D "github.com/daeuniverse/outbound/dialer"
 	"github.com/daeuniverse/softwind/netproxy"
 )
 
-type blockDialer struct {
-	DialCallback func()
-}
-
-func (d *blockDialer) Dial(network, addr string) (c netproxy.Conn, err error) {
-	magicNetwork, err := netproxy.ParseMagicNetwork(network)
-	if err != nil {
-		return nil, err
-	}
-	switch magicNetwork.Network {
-	case "tcp":
-		return d.DialTcp(addr)
-	case "udp":
-		return d.DialUdp(addr)
-	default:
-		return nil, fmt.Errorf("%w: %v", netproxy.UnsupportedTunnelTypeError, network)
-	}
-}
-
-func (d *blockDialer) DialTcp(addr string) (c netproxy.Conn, err error) {
-	d.DialCallback()
-	return nil, net.ErrClosed
-}
-func (d *blockDialer) DialUdp(addr string) (c netproxy.PacketConn, err error) {
-	d.DialCallback()
-	return nil, net.ErrClosed
-}
-
 func NewBlockDialer(option *GlobalOption, dialCallback func()) (netproxy.Dialer, *Property) {
-	return &blockDialer{DialCallback: dialCallback}, &Property{
-		Name:     "block",
-		Address:  "",
-		Protocol: "",
-		Link:     "",
+	d, _p := D.NewBlockDialer(&option.ExtraOption, dialCallback)
+	return d, &Property{
+		Property:        *_p,
+		SubscriptionTag: "",
 	}
 }

component/outbound/dialer/dialer.go

@@ -6,6 +6,7 @@ import (
 	"sync"
 	"time"
 
+	D "github.com/daeuniverse/outbound/dialer"
 	"github.com/daeuniverse/softwind/netproxy"
 	"github.com/sirupsen/logrus"
 )
@@ -32,26 +33,21 @@ type Dialer struct {
 }
 
 type GlobalOption struct {
+	D.ExtraOption
 	Log               *logrus.Logger
 	TcpCheckOptionRaw TcpCheckOptionRaw // Lazy parse
 	CheckDnsOptionRaw CheckDnsOptionRaw // Lazy parse
 	CheckInterval     time.Duration
 	CheckTolerance    time.Duration
 	CheckDnsTcp       bool
-	AllowInsecure     bool
-	TlsImplementation string
-	UtlsImitate       string
 }
 
 type InstanceOption struct {
 	CheckEnabled bool
 }
 
 type Property struct {
-	Name            string
-	Address         string
-	Protocol        string
-	Link            string
+	D.Property
 	SubscriptionTag string
 }
 

component/outbound/dialer/direct.go

@@ -1,20 +1,14 @@
 package dialer
 
 import (
+	D "github.com/daeuniverse/outbound/dialer"
 	"github.com/daeuniverse/softwind/netproxy"
-	softwindDirect "github.com/daeuniverse/softwind/protocol/direct"
 )
 
 func NewDirectDialer(option *GlobalOption, fullcone bool) (netproxy.Dialer, *Property) {
-	property := &Property{
-		Name:     "direct",
-		Address:  "",
-		Protocol: "",
-		Link:     "",
-	}
-	if fullcone {
-		return softwindDirect.FullconeDirect, property
-	} else {
-		return softwindDirect.SymmetricDirect, property
+	d, _p := D.NewDirectDialer(&option.ExtraOption, fullcone)
+	return d, &Property{
+		Property:        *_p,
+		SubscriptionTag: "",
 	}
 }