Schedulers -> Flow

Author: RPRX

infra/conf/vless.go

@@ -48,8 +48,8 @@ func (c *VLessInboundConfig) Build() (proto.Message, error) {
 			return nil, newError(`VLESS clients: invalid user`).Base(err)
 		}
 
-		if account.Schedulers != "" {
-			return nil, newError(`VLESS clients: "schedulers" is not available in this version`)
+		if account.Flow != "" {
+			return nil, newError(`VLESS clients: "flow" is not available in this version`)
 		}
 		if account.Encryption != "" {
 			return nil, newError(`VLESS clients: "encryption" should not in inbound settings`)
@@ -161,8 +161,8 @@ func (c *VLessOutboundConfig) Build() (proto.Message, error) {
 				return nil, newError(`VLESS users: invalid user`).Base(err)
 			}
 
-			if account.Schedulers != "" {
-				return nil, newError(`VLESS users: "schedulers" is not available in this version`)
+			if account.Flow != "" {
+				return nil, newError(`VLESS users: "flow" is not available in this version`)
 			}
 			if account.Encryption != "none" {
 				return nil, newError(`VLESS users: please add/set "encryption":"none" for every user`)

proxy/vless/account.go

@@ -15,7 +15,7 @@ func (a *Account) AsAccount() (protocol.Account, error) {
 	}
 	return &MemoryAccount{
 		ID:         protocol.NewID(id),
-		Schedulers: a.Schedulers, // needs parser here?
+		Flow:       a.Flow,       // needs parser here?
 		Encryption: a.Encryption, // needs parser here?
 	}, nil
 }
@@ -24,8 +24,8 @@ func (a *Account) AsAccount() (protocol.Account, error) {
 type MemoryAccount struct {
 	// ID of the account.
 	ID *protocol.ID
-	// Schedulers of the account.
-	Schedulers string
+	// Flow of the account. May be "xtls-rprx-origin".
+	Flow string
 	// Encryption of the account. Used for client connections, and only accepts "none" for now.
 	Encryption string
 }

proxy/vless/account.pb.go

@@ -9,8 +9,8 @@ option java_multiple_files = true;
 message Account {
   // ID of the account, in the form of a UUID, e.g., "66ad4540-b58c-4ad2-9926-ea63445a9b57".
   string id = 1;
-  // Schedulers settings.
-  string schedulers = 2;
+  // Flow settings. May be "xtls-rprx-origin".
+  string flow = 2;
   // Encryption settings. Only applies to client side, and only accepts "none" for now.
   string encryption = 3;
 }

proxy/vless/account.proto

@@ -13,7 +13,7 @@ import (
 
 func EncodeHeaderAddons(buffer *buf.Buffer, addons *Addons) error {
 
-	switch addons.Scheduler {
+	switch addons.Flow {
 	default:
 
 		if err := buffer.WriteByte(0); err != nil {
@@ -47,7 +47,7 @@ func DecodeHeaderAddons(buffer *buf.Buffer, reader io.Reader) (*Addons, error) {
 		}
 
 		// Verification.
-		switch addons.Scheduler {
+		switch addons.Flow {
 		default:
 
 		}
@@ -61,7 +61,7 @@ func DecodeHeaderAddons(buffer *buf.Buffer, reader io.Reader) (*Addons, error) {
 // EncodeBodyAddons returns a Writer that auto-encrypt content written by caller.
 func EncodeBodyAddons(writer io.Writer, request *protocol.RequestHeader, addons *Addons) buf.Writer {
 
-	switch addons.Scheduler {
+	switch addons.Flow {
 	default:
 
 		return buf.NewWriter(writer)
@@ -73,7 +73,7 @@ func EncodeBodyAddons(writer io.Writer, request *protocol.RequestHeader, addons
 // DecodeBodyAddons returns a Reader from which caller can fetch decrypted body.
 func DecodeBodyAddons(reader io.Reader, request *protocol.RequestHeader, addons *Addons) buf.Reader {
 
-	switch addons.Scheduler {
+	switch addons.Flow {
 	default:
 
 		return buf.NewReader(reader)

proxy/vless/encoding/addons.go

@@ -7,6 +7,6 @@ option java_package = "com.v2ray.core.proxy.vless.encoding";
 option java_multiple_files = true;
 
 message Addons {
-  string Scheduler = 1;
-  bytes SchedulerV = 2;
+  string Flow = 1;
+  bytes Seed = 2;
 }

proxy/vless/encoding/addons.pb.go

@@ -417,7 +417,7 @@ func (h *Handler) Process(ctx context.Context, network net.Network, connection i
 		defer timer.SetTimeout(sessionPolicy.Timeouts.UplinkOnly)
 
 		responseAddons := &encoding.Addons{
-			Scheduler: requestAddons.Scheduler,
+			Flow: requestAddons.Flow,
 		}
 
 		bufferWriter := buf.NewBufferedWriter(buf.NewWriter(connection))
@@ -448,7 +448,7 @@ func (h *Handler) Process(ctx context.Context, network net.Network, connection i
 		}
 
 		// Indicates the end of response payload.
-		switch responseAddons.Scheduler {
+		switch responseAddons.Flow {
 		default:
 
 		}

proxy/vless/encoding/addons.proto

@@ -105,7 +105,7 @@ func (v *Handler) Process(ctx context.Context, link *transport.Link, dialer inte
 	account := request.User.Account.(*vless.MemoryAccount)
 
 	requestAddons := &encoding.Addons{
-		Scheduler: account.Schedulers,
+		Flow: account.Flow,
 	}
 
 	sessionPolicy := v.policyManager.ForLevel(request.User.Level)
@@ -140,7 +140,7 @@ func (v *Handler) Process(ctx context.Context, link *transport.Link, dialer inte
 		}
 
 		// Indicates the end of request payload.
-		switch requestAddons.Scheduler {
+		switch requestAddons.Flow {
 		default:
 
 		}