|
@@ -6,28 +6,31 @@ import (
|
|
E "github.com/sagernet/sing/common/exceptions"
|
|
E "github.com/sagernet/sing/common/exceptions"
|
|
)
|
|
)
|
|
|
|
|
|
-type _V2RayInboundTransportOptions struct {
|
|
|
|
- Type string `json:"type,omitempty"`
|
|
|
|
- GRPCOptions V2RayGRPCOptions `json:"-"`
|
|
|
|
|
|
+type _V2RayTransportOptions struct {
|
|
|
|
+ Type string `json:"type,omitempty"`
|
|
|
|
+ GRPCOptions V2RayGRPCOptions `json:"-"`
|
|
|
|
+ WebsocketOptions V2RayWebsocketOptions `json:"-"`
|
|
}
|
|
}
|
|
|
|
|
|
-type V2RayInboundTransportOptions _V2RayOutboundTransportOptions
|
|
|
|
|
|
+type V2RayTransportOptions _V2RayTransportOptions
|
|
|
|
|
|
-func (o V2RayInboundTransportOptions) MarshalJSON() ([]byte, error) {
|
|
|
|
|
|
+func (o V2RayTransportOptions) MarshalJSON() ([]byte, error) {
|
|
var v any
|
|
var v any
|
|
switch o.Type {
|
|
switch o.Type {
|
|
case "":
|
|
case "":
|
|
return nil, nil
|
|
return nil, nil
|
|
case C.V2RayTransportTypeGRPC:
|
|
case C.V2RayTransportTypeGRPC:
|
|
v = o.GRPCOptions
|
|
v = o.GRPCOptions
|
|
|
|
+ case C.V2RayTransportTypeWebsocket:
|
|
|
|
+ v = o.WebsocketOptions
|
|
default:
|
|
default:
|
|
return nil, E.New("unknown transport type: " + o.Type)
|
|
return nil, E.New("unknown transport type: " + o.Type)
|
|
}
|
|
}
|
|
- return MarshallObjects((_V2RayOutboundTransportOptions)(o), v)
|
|
|
|
|
|
+ return MarshallObjects((_V2RayTransportOptions)(o), v)
|
|
}
|
|
}
|
|
|
|
|
|
-func (o *V2RayInboundTransportOptions) UnmarshalJSON(bytes []byte) error {
|
|
|
|
- err := json.Unmarshal(bytes, (*_V2RayOutboundTransportOptions)(o))
|
|
|
|
|
|
+func (o *V2RayTransportOptions) UnmarshalJSON(bytes []byte) error {
|
|
|
|
+ err := json.Unmarshal(bytes, (*_V2RayTransportOptions)(o))
|
|
if err != nil {
|
|
if err != nil {
|
|
return err
|
|
return err
|
|
}
|
|
}
|
|
@@ -38,16 +41,17 @@ func (o *V2RayInboundTransportOptions) UnmarshalJSON(bytes []byte) error {
|
|
default:
|
|
default:
|
|
return E.New("unknown transport type: " + o.Type)
|
|
return E.New("unknown transport type: " + o.Type)
|
|
}
|
|
}
|
|
- err = UnmarshallExcluded(bytes, (*_V2RayOutboundTransportOptions)(o), v)
|
|
|
|
|
|
+ err = UnmarshallExcluded(bytes, (*_V2RayTransportOptions)(o), v)
|
|
if err != nil {
|
|
if err != nil {
|
|
return E.Cause(err, "vmess transport options")
|
|
return E.Cause(err, "vmess transport options")
|
|
}
|
|
}
|
|
return nil
|
|
return nil
|
|
}
|
|
}
|
|
|
|
|
|
-type _V2RayOutboundTransportOptions struct {
|
|
|
|
- Type string `json:"type,omitempty"`
|
|
|
|
- GRPCOptions V2RayGRPCOptions `json:"-"`
|
|
|
|
|
|
+/*type _V2RayOutboundTransportOptions struct {
|
|
|
|
+ Type string `json:"type,omitempty"`
|
|
|
|
+ GRPCOptions V2RayGRPCOptions `json:"-"`
|
|
|
|
+ WebsocketOptions V2RayWebsocketOptions `json:"-"`
|
|
}
|
|
}
|
|
|
|
|
|
type V2RayOutboundTransportOptions _V2RayOutboundTransportOptions
|
|
type V2RayOutboundTransportOptions _V2RayOutboundTransportOptions
|
|
@@ -59,6 +63,8 @@ func (o V2RayOutboundTransportOptions) MarshalJSON() ([]byte, error) {
|
|
return nil, nil
|
|
return nil, nil
|
|
case C.V2RayTransportTypeGRPC:
|
|
case C.V2RayTransportTypeGRPC:
|
|
v = o.GRPCOptions
|
|
v = o.GRPCOptions
|
|
|
|
+ case C.V2RayTransportTypeWebsocket:
|
|
|
|
+ v = o.WebsocketOptions
|
|
default:
|
|
default:
|
|
return nil, E.New("unknown transport type: " + o.Type)
|
|
return nil, E.New("unknown transport type: " + o.Type)
|
|
}
|
|
}
|
|
@@ -74,6 +80,8 @@ func (o *V2RayOutboundTransportOptions) UnmarshalJSON(bytes []byte) error {
|
|
switch o.Type {
|
|
switch o.Type {
|
|
case C.V2RayTransportTypeGRPC:
|
|
case C.V2RayTransportTypeGRPC:
|
|
v = &o.GRPCOptions
|
|
v = &o.GRPCOptions
|
|
|
|
+ case C.V2RayTransportTypeWebsocket:
|
|
|
|
+ v = &o.WebsocketOptions
|
|
default:
|
|
default:
|
|
return E.New("unknown transport type: " + o.Type)
|
|
return E.New("unknown transport type: " + o.Type)
|
|
}
|
|
}
|
|
@@ -82,8 +90,15 @@ func (o *V2RayOutboundTransportOptions) UnmarshalJSON(bytes []byte) error {
|
|
return E.Cause(err, "vmess transport options")
|
|
return E.Cause(err, "vmess transport options")
|
|
}
|
|
}
|
|
return nil
|
|
return nil
|
|
-}
|
|
|
|
|
|
+}*/
|
|
|
|
|
|
type V2RayGRPCOptions struct {
|
|
type V2RayGRPCOptions struct {
|
|
ServiceName string `json:"service_name,omitempty"`
|
|
ServiceName string `json:"service_name,omitempty"`
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+type V2RayWebsocketOptions struct {
|
|
|
|
+ Path string `json:"path,omitempty"`
|
|
|
|
+ Headers map[string]string `json:"headers,omitempty"`
|
|
|
|
+ MaxEarlyData uint32 `json:"max_early_data,omitempty"`
|
|
|
|
+ EarlyDataHeaderName string `json:"early_data_header_name,omitempty"`
|
|
|
|
+}
|