build: migrate from github.com/golang/protobuf to google.golang.org/protobuf

README.md

@@ -36,7 +36,6 @@ This repo relies on the following third-party projects:
   - [pires/go-proxyproto](https://github.com/pires/go-proxyproto)
   - [seiflotfy/cuckoofilter](https://github.com/seiflotfy/cuckoofilter)
   - [google/starlark-go](https://github.com/google/starlark-go)
-  - [jhump/protoreflect](https://github.com/jhump/protoreflect)
   - [inetaf/netaddr](https://github.com/inetaf/netaddr)
 
 - For testing only:

app/observatory/burst/burstobserver.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"sync"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	core "github.com/v2fly/v2ray-core/v5"
 	"github.com/v2fly/v2ray-core/v5/app/observatory"

app/observatory/command/command.go

@@ -8,8 +8,8 @@ package command
 import (
 	"context"
 
-	"github.com/golang/protobuf/proto"
 	"google.golang.org/grpc"
+	"google.golang.org/protobuf/proto"
 
 	core "github.com/v2fly/v2ray-core/v5"
 	"github.com/v2fly/v2ray-core/v5/app/observatory"

app/observatory/multiobservatory/multi.go

@@ -3,8 +3,8 @@ package multiobservatory
 import (
 	"context"
 
-	"github.com/golang/protobuf/jsonpb"
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/encoding/protojson"
+	"google.golang.org/protobuf/proto"
 
 	"github.com/v2fly/v2ray-core/v5/common"
 	"github.com/v2fly/v2ray-core/v5/common/taggedfeatures"
@@ -34,7 +34,7 @@ func New(ctx context.Context, config *Config) (*Observer, error) {
 	return &Observer{config: config, ctx: ctx, TaggedFeatures: holder}, nil
 }
 
-func (x *Config) UnmarshalJSONPB(unmarshaler *jsonpb.Unmarshaler, bytes []byte) error {
+func (x *Config) UnmarshalJSONPB(unmarshaler *protojson.UnmarshalOptions, bytes []byte) error {
 	var err error
 	x.Holders, err = taggedfeatures.LoadJSONConfig(context.TODO(), "service", "background", bytes)
 	return err

app/observatory/observer.go

@@ -12,7 +12,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	core "github.com/v2fly/v2ray-core/v5"
 	"github.com/v2fly/v2ray-core/v5/common"

app/router/config.go

@@ -7,7 +7,7 @@ import (
 	"context"
 	"encoding/json"
 
-	"github.com/golang/protobuf/jsonpb"
+	"google.golang.org/protobuf/encoding/protojson"
 
 	"github.com/v2fly/v2ray-core/v5/app/router/routercommon"
 	"github.com/v2fly/v2ray-core/v5/common/net"
@@ -186,7 +186,7 @@ func (br *BalancingRule) Build(ohm outbound.Manager, dispatcher routing.Dispatch
 	}
 }
 
-func (br *BalancingRule) UnmarshalJSONPB(unmarshaler *jsonpb.Unmarshaler, bytes []byte) error {
+func (br *BalancingRule) UnmarshalJSONPB(unmarshaler *protojson.UnmarshalOptions, bytes []byte) error {
 	type BalancingRuleStub struct {
 		Tag              string          `protobuf:"bytes,1,opt,name=tag,proto3" json:"tag,omitempty"`
 		OutboundSelector []string        `protobuf:"bytes,2,rep,name=outbound_selector,json=outboundSelector,proto3" json:"outbound_selector,omitempty"`

app/router/strategy_leastload.go

@@ -6,7 +6,7 @@ import (
 	"sort"
 	"time"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	core "github.com/v2fly/v2ray-core/v5"
 	"github.com/v2fly/v2ray-core/v5/app/observatory"

app/router/strategy_random.go

@@ -3,7 +3,7 @@ package router
 import (
 	"context"
 
-	"google.golang.org/protobuf/runtime/protoiface"
+	"google.golang.org/protobuf/proto"
 
 	core "github.com/v2fly/v2ray-core/v5"
 	"github.com/v2fly/v2ray-core/v5/app/observatory"
@@ -47,7 +47,7 @@ func (s *RandomStrategy) PickOutbound(candidates []string) string {
 			})
 		}
 		if s.observatory != nil {
-			var observeReport protoiface.MessageV1
+			var observeReport proto.Message
 			var err error
 			if s.settings.ObserverTag == "" {
 				observeReport, err = s.observatory.GetObservation(s.ctx)

app/subscription/specs/outbound_parser.go

@@ -5,7 +5,7 @@ import (
 	"context"
 	"encoding/json"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	"github.com/v2fly/v2ray-core/v5/common/registry"
 	"github.com/v2fly/v2ray-core/v5/common/serial"

common/net/address.go

@@ -6,7 +6,7 @@ import (
 	"net"
 	"strings"
 
-	"github.com/golang/protobuf/jsonpb"
+	"google.golang.org/protobuf/encoding/protojson"
 )
 
 var (
@@ -212,7 +212,7 @@ func NewIPOrDomain(addr Address) *IPOrDomain {
 	}
 }
 
-func (d *IPOrDomain) UnmarshalJSONPB(unmarshaler *jsonpb.Unmarshaler, bytes []byte) error {
+func (d *IPOrDomain) UnmarshalJSONPB(unmarshaler *protojson.UnmarshalOptions, bytes []byte) error {
 	var ipOrDomain string
 	if err := json.Unmarshal(bytes, &ipOrDomain); err != nil {
 		return err

common/net/network.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"strings"
 
-	"github.com/golang/protobuf/jsonpb"
+	"google.golang.org/protobuf/encoding/protojson"
 )
 
 func (n Network) SystemString() string {
@@ -20,7 +20,7 @@ func (n Network) SystemString() string {
 	}
 }
 
-func (nl *NetworkList) UnmarshalJSONPB(unmarshaler *jsonpb.Unmarshaler, bytes []byte) error {
+func (nl *NetworkList) UnmarshalJSONPB(unmarshaler *protojson.UnmarshalOptions, bytes []byte) error {
 	var networkStrList []string
 	if err := json.Unmarshal(bytes, &networkStrList); err == nil {
 		nl.Network = ParseNetworkStringList(networkStrList)

common/protoext/extensions.go

@@ -1,7 +1,7 @@
 package protoext
 
 import (
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/reflect/protoreflect"
 	"google.golang.org/protobuf/types/descriptorpb"
 )
@@ -10,18 +10,12 @@ import (
 
 func GetMessageOptions(msgDesc protoreflect.MessageDescriptor) (*MessageOpt, error) {
 	msgOpt := msgDesc.Options().(*descriptorpb.MessageOptions)
-	msgOptRet, err := proto.GetExtension(msgOpt, E_MessageOpt)
-	if err != nil {
-		return nil, newError("unable to parse extension from message").Base(err)
-	}
+	msgOptRet := proto.GetExtension(msgOpt, E_MessageOpt)
 	return msgOptRet.(*MessageOpt), nil
 }
 
 func GetFieldOptions(fieldDesc protoreflect.FieldDescriptor) (*FieldOpt, error) {
 	fieldOpt := fieldDesc.Options().(*descriptorpb.FieldOptions)
-	msgOptRet, err := proto.GetExtension(fieldOpt, E_FieldOpt)
-	if err != nil {
-		return nil, newError("unable to parse extension from message").Base(err)
-	}
+	msgOptRet := proto.GetExtension(fieldOpt, E_FieldOpt)
 	return msgOptRet.(*FieldOpt), nil
 }

common/registry/implementation_set.go

@@ -1,7 +1,7 @@
 package registry
 
 import (
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	"github.com/v2fly/v2ray-core/v5/common/protoext"
 )

common/registry/registry.go

@@ -1,15 +1,12 @@
 package registry
 
 import (
-	"bytes"
 	"context"
-	"reflect"
 	"strings"
 	"sync"
 
-	"github.com/golang/protobuf/jsonpb"
-	"github.com/golang/protobuf/proto"
-	protov2 "google.golang.org/protobuf/proto"
+	"google.golang.org/protobuf/encoding/protojson"
+	"google.golang.org/protobuf/proto"
 
 	"github.com/v2fly/v2ray-core/v5/common/protoext"
 	"github.com/v2fly/v2ray-core/v5/common/protofilter"
@@ -65,25 +62,23 @@ func (i *implementationRegistry) LoadImplementationByAlias(ctx context.Context,
 		return nil, newError("unable to create implementation config instance").Base(err)
 	}
 
-	unmarshaler := jsonpb.Unmarshaler{AllowUnknownFields: false}
-	err = unmarshaler.Unmarshal(bytes.NewReader(data), implementationConfigInstance.(proto.Message))
+	unmarshaler := protojson.UnmarshalOptions{DiscardUnknown: false}
+	err = unmarshaler.Unmarshal(data, implementationConfigInstance)
 	if err != nil {
 		return nil, newError("unable to parse json content").Base(err)
 	}
 
-	implementationConfigInstancev2 := proto.MessageV2(implementationConfigInstance)
-
 	if isRestrictedModeContext(ctx) {
-		if err := enforceRestriction(implementationConfigInstancev2); err != nil {
+		if err := enforceRestriction(implementationConfigInstance); err != nil {
 			return nil, err
 		}
 	}
 
-	if err := protofilter.FilterProtoConfig(ctx, implementationConfigInstancev2); err != nil {
+	if err := protofilter.FilterProtoConfig(ctx, implementationConfigInstance); err != nil {
 		return nil, err
 	}
 
-	return implementationConfigInstance.(proto.Message), nil
+	return implementationConfigInstance, nil
 }
 
 func newImplementationRegistry() *implementationRegistry {
@@ -95,26 +90,24 @@ var globalImplementationRegistry = newImplementationRegistry()
 var initialized = &sync.Once{}
 
 type registerRequest struct {
-	proto  interface{}
+	proto  proto.Message
 	loader CustomLoader
 }
 
 var registerRequests []registerRequest
 
 // RegisterImplementation register an implementation of a type of interface
 // loader(CustomLoader) is a private API, its interface is subject to breaking changes
-func RegisterImplementation(proto interface{}, loader CustomLoader) error {
+func RegisterImplementation(proto proto.Message, loader CustomLoader) error {
 	registerRequests = append(registerRequests, registerRequest{
 		proto:  proto,
 		loader: loader,
 	})
 	return nil
 }
 
-func registerImplementation(proto interface{}, loader CustomLoader) error {
-	protoReflect := reflect.New(reflect.TypeOf(proto).Elem())
-	proto2 := protoReflect.Interface().(protov2.Message)
-	msgDesc := proto2.ProtoReflect().Descriptor()
+func registerImplementation(proto proto.Message, loader CustomLoader) error {
+	msgDesc := proto.ProtoReflect().Descriptor()
 	fullName := string(msgDesc.FullName())
 	msgOpts, err := protoext.GetMessageOptions(msgDesc)
 	if err != nil {

common/serial/resolver.go

@@ -1,21 +1,31 @@
 package serial
 
 import (
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/reflect/protoreflect"
+	"google.golang.org/protobuf/reflect/protoregistry"
 )
 
 type AnyResolver interface {
-	Resolve(typeURL string) (proto.Message, error)
+	protoregistry.MessageTypeResolver
+	protoregistry.ExtensionTypeResolver
 }
 
 type serialResolver struct{}
 
-func (s serialResolver) Resolve(typeURL string) (proto.Message, error) {
-	instance, err := GetInstance(typeURL)
-	if err != nil {
-		return nil, err
-	}
-	return instance.(proto.Message), nil
+func (s serialResolver) FindMessageByName(messageName protoreflect.FullName) (protoreflect.MessageType, error) {
+	return protoregistry.GlobalTypes.FindMessageByName(messageName)
+}
+
+func (s serialResolver) FindMessageByURL(url string) (protoreflect.MessageType, error) {
+	return protoregistry.GlobalTypes.FindMessageByURL(url)
+}
+
+func (s serialResolver) FindExtensionByName(field protoreflect.FullName) (protoreflect.ExtensionType, error) {
+	return protoregistry.GlobalTypes.FindExtensionByName(field)
+}
+
+func (s serialResolver) FindExtensionByNumber(message protoreflect.FullName, field protoreflect.FieldNumber) (protoreflect.ExtensionType, error) {
+	return protoregistry.GlobalTypes.FindExtensionByNumber(message, field)
 }
 
 func GetResolver() AnyResolver {

common/serial/typed_message.go

@@ -2,10 +2,11 @@ package serial
 
 import (
 	"errors"
-	"reflect"
 	"strings"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
+	"google.golang.org/protobuf/reflect/protoreflect"
+	"google.golang.org/protobuf/reflect/protoregistry"
 	"google.golang.org/protobuf/types/known/anypb"
 )
 
@@ -25,28 +26,43 @@ func ToTypedMessage(message proto.Message) *anypb.Any {
 
 // GetMessageType returns the name of this proto Message.
 func GetMessageType(message proto.Message) string {
-	return proto.MessageName(message)
+	return string(message.ProtoReflect().Descriptor().FullName())
+}
+
+// GetMessageDescriptor returns the MessageDescriptor of the message with fullName.
+func GetMessageDescriptor(fullName string) (protoreflect.MessageDescriptor, error) {
+	mt, err := protoregistry.GlobalFiles.FindDescriptorByName(protoreflect.FullName(fullName))
+	if err != nil {
+		return nil, errors.New("Serial: Unknown message name: " + fullName)
+	}
+
+	message, ok := mt.(protoreflect.MessageDescriptor)
+	if !ok {
+		return nil, errors.New("Serial: Message with name: " + fullName + " is not a MessageDescriptor")
+	}
+	return message, nil
 }
 
 // GetInstance creates a new instance of the message with messageType.
-func GetInstance(messageType string) (interface{}, error) {
-	mType := proto.MessageType(messageType)
-	if mType == nil || mType.Elem() == nil {
+func GetInstance(messageType string) (proto.Message, error) {
+	// mType := proto.MessageType(messageType)
+	mType, err := protoregistry.GlobalTypes.FindMessageByName(protoreflect.FullName(messageType))
+	if err != nil {
 		return nil, errors.New("Serial: Unknown type: " + messageType)
 	}
-	return reflect.New(mType.Elem()).Interface(), nil
+
+	return mType.New().Interface(), nil
 }
 
 func GetInstanceOf(v *anypb.Any) (proto.Message, error) {
 	instance, err := GetInstance(V2TypeFromURL(v.TypeUrl))
 	if err != nil {
 		return nil, err
 	}
-	protoMessage := instance.(proto.Message)
-	if err := proto.Unmarshal(v.Value, protoMessage); err != nil {
+	if err := proto.Unmarshal(v.Value, instance); err != nil {
 		return nil, err
 	}
-	return protoMessage, nil
+	return instance, nil
 }
 
 func V2Type(v *anypb.Any) string {

common/serial/typed_message_test.go

@@ -22,3 +22,19 @@ func TestConvertingNilMessage(t *testing.T) {
 		t.Error("expect nil, but actually not")
 	}
 }
+
+func TestGetMessageDescriptor(t *testing.T) {
+	_, err := GetMessageDescriptor("")
+	if err == nil {
+		t.Error("expect non-nil error, but got nil")
+	}
+
+	md, err := GetMessageDescriptor("google.protobuf.Any")
+	if err != nil {
+		t.Error("expect nil error, but got ", err)
+	}
+
+	if md == nil || md.FullName() != "google.protobuf.Any" {
+		t.Error("expect google.protobuf.Any, but got ", md)
+	}
+}