Merge remote-tracking branch 'upstream/main'

# Conflicts:
#	core.go
#	go.mod
#	go.sum
#	v2ray.go

Author: nekohasekai

go.mod

@@ -4,6 +4,7 @@ go 1.17
 
 require (
 	github.com/Dreamacro/clash v1.7.1
+	github.com/golang/protobuf v1.5.2
 	github.com/miekg/dns v1.1.43
 	github.com/pkg/errors v0.9.1
 	github.com/sagernet/gomobile v0.0.0-20210905032500-701a995ff844
@@ -21,7 +22,7 @@ require (
 replace gvisor.dev/gvisor v0.0.0 => github.com/sagernet/gvisor v0.0.0-20211022025201-1cae8baac6b3
 
 //replace github.com/xtls/xray-core v1.4.5 => ../Xray-core
-replace github.com/xtls/xray-core v1.5.0 => github.com/xtls/xray-core v1.5.1-0.20211022054941-db69818f3719
+replace github.com/xtls/xray-core v1.5.0 => github.com/xtls/xray-core v1.5.1-0.20211022092228-bbea20a8f112
 
 replace github.com/Dreamacro/clash v1.7.1 => github.com/sagernet/clash v1.6.5-0.20210913182617-681dd3780179
 
@@ -37,7 +38,6 @@ require (
 	github.com/geeksbaek/seed v0.0.0-20180909040025-2a7f5fb92e22 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
 	github.com/gofrs/uuid v4.1.0+incompatible // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/btree v1.0.1 // indirect
 	github.com/gorilla/websocket v1.4.2 // indirect
 	github.com/kierdavis/cfb8 v0.0.0-20180105024805-3a17c36ee2f8 // indirect

go.sum

@@ -686,8 +686,8 @@ github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:
 github.com/xtls/go v0.0.0-20201118062508-3632bf3b7499/go.mod h1:5TB2+k58gx4A4g2Nf5miSHNDF6CuAzHKpWBooLAshTs=
 github.com/xtls/go v0.0.0-20210920065950-d4af136d3672 h1:4mkzGhKqt3JO1BWYjtD3iRFyAx4ow67hmSqOcGjuxqQ=
 github.com/xtls/go v0.0.0-20210920065950-d4af136d3672/go.mod h1:YGGVbz9cOxyKFUmhW7LGaLZaMA0cPlHJinvAmVxEMSU=
-github.com/xtls/xray-core v1.5.1-0.20211022054941-db69818f3719 h1:FX71ANRcMGcEGTWgJyRicGkNdA6E8ZQzZXzpbnNnDsk=
-github.com/xtls/xray-core v1.5.1-0.20211022054941-db69818f3719/go.mod h1:t5GTnutkWucuqQoAg81vNoGbq8JY6AxOgd2F0xenA0E=
+github.com/xtls/xray-core v1.5.1-0.20211022092228-bbea20a8f112 h1:YF8X1QNYWbpf3PAHhkgyKcCL/B64x2VAPAK1PHfHahU=
+github.com/xtls/xray-core v1.5.1-0.20211022092228-bbea20a8f112/go.mod h1:t5GTnutkWucuqQoAg81vNoGbq8JY6AxOgd2F0xenA0E=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

observatory.go

@@ -1,9 +1,9 @@
 package libcore
 
-/*import (
+import (
 	"github.com/golang/protobuf/proto"
 	"github.com/pkg/errors"
-	"github.com/v2fly/v2ray-core/v4/app/observatory"
+	"github.com/xtls/xray-core/app/observatory"
 )
 
 func (instance *V2RayInstance) GetObservatoryStatus() ([]byte, error) {
@@ -17,7 +17,7 @@ func (instance *V2RayInstance) GetObservatoryStatus() ([]byte, error) {
 	return proto.Marshal(resp)
 }
 
-func (instance *V2RayInstance) UpdateStatus(outbound string, status []byte) error {
+func (instance *V2RayInstance) UpdateStatus(status []byte) error {
 	if instance.observatory == nil {
 		return errors.New("observatory unavailable")
 	}
@@ -26,7 +26,21 @@ func (instance *V2RayInstance) UpdateStatus(outbound string, status []byte) erro
 	if err != nil {
 		return err
 	}
-	instance.observatory.UpdateStatus(outbound, s)
+	instance.observatory.UpdateStatus(s)
 	return err
 }
-*/
+
+type StatusUpdateListener interface {
+	OnUpdate(status []byte)
+}
+
+func (instance *V2RayInstance) SetStatusUpdateListener(listener StatusUpdateListener) {
+	if listener == nil {
+		instance.observatory.StatusUpdate = nil
+	} else {
+		instance.observatory.StatusUpdate = func(result *observatory.OutboundStatus) {
+			status, _ := proto.Marshal(result)
+			listener.OnUpdate(status)
+		}
+	}
+}

v2ray.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"github.com/xtls/xray-core/app/observatory"
 	"github.com/xtls/xray-core/common"
 	"github.com/xtls/xray-core/common/buf"
 	"github.com/xtls/xray-core/common/net"
@@ -12,6 +13,7 @@ import (
 	"github.com/xtls/xray-core/common/signal"
 	"github.com/xtls/xray-core/core"
 	"github.com/xtls/xray-core/features/dns"
+	"github.com/xtls/xray-core/features/extension"
 	"github.com/xtls/xray-core/features/routing"
 	"github.com/xtls/xray-core/features/stats"
 	"github.com/xtls/xray-core/infra/conf/serial"
@@ -32,9 +34,9 @@ type V2RayInstance struct {
 	started      bool
 	core         *core.Instance
 	statsManager stats.Manager
-	//observatory  *observatory.Observer
-	dispatcher routing.Dispatcher
-	dnsClient  dns.Client
+	observatory  *observatory.Observer
+	dispatcher   routing.Dispatcher
+	dnsClient    dns.Client
 }
 
 func NewV2rayInstance() *V2RayInstance {
@@ -71,10 +73,10 @@ func (instance *V2RayInstance) LoadConfig(content string) error {
 	instance.dispatcher = c.GetFeature(routing.DispatcherType()).(routing.Dispatcher)
 	instance.dnsClient = c.GetFeature(dns.ClientType()).(dns.Client)
 
-	/*o := c.GetFeature(extension.ObservatoryType())
+	o := c.GetFeature(extension.ObservatoryType())
 	if o != nil {
 		instance.observatory = o.(*observatory.Observer)
-	}*/
+	}
 	return nil
 }