format code

app/point/config/config.go

@@ -16,6 +16,11 @@ type LogConfig interface {
 	AccessLog() string
 }
 
+type InboundDetour interface {
+	Protocol() string
+	Port()
+}
+
 type PointConfig interface {
 	Port() uint16
 	LogConfig() LogConfig

common/net/timed_io.go

@@ -1,7 +1,7 @@
 package net
 
 import (
-  "io"
+	"io"
 	"net"
 	"time"
 )
@@ -11,17 +11,17 @@ var (
 )
 
 type TimeOutReader struct {
-  timeout int
+	timeout    int
 	connection net.Conn
-  worker io.Reader
+	worker     io.Reader
 }
 
 func NewTimeOutReader(timeout int, connection net.Conn) *TimeOutReader {
 	reader := &TimeOutReader{
 		connection: connection,
 	}
-  reader.SetTimeOut(timeout)
+	reader.SetTimeOut(timeout)
-  return reader
+	return reader
 }
 
 func (reader *TimeOutReader) Read(p []byte) (int, error) {
@@ -33,36 +33,36 @@ func (reader *TimeOutReader) GetTimeOut() int {
 }
 
 func (reader *TimeOutReader) SetTimeOut(value int) {
-  reader.timeout = value
+	reader.timeout = value
-  if value > 0 {
+	if value > 0 {
-    reader.worker = &timedReaderWorker{
+		reader.worker = &timedReaderWorker{
-      timeout: value,
+			timeout:    value,
-      connection: reader.connection,
+			connection: reader.connection,
-    }
+		}
-  } else {
+	} else {
-    reader.worker = &noOpReaderWorker{
+		reader.worker = &noOpReaderWorker{
-      connection: reader.connection,
+			connection: reader.connection,
-    }
+		}
-  }
+	}
 }
 
 type timedReaderWorker struct {
-  timeout int
+	timeout    int
-  connection net.Conn
+	connection net.Conn
 }
 
 func (this *timedReaderWorker) Read(p []byte) (int, error) {
-  deadline := time.Duration(this.timeout) * time.Second
+	deadline := time.Duration(this.timeout) * time.Second
 	this.connection.SetReadDeadline(time.Now().Add(deadline))
-  nBytes, err := this.connection.Read(p)
+	nBytes, err := this.connection.Read(p)
-  this.connection.SetReadDeadline(emptyTime)
+	this.connection.SetReadDeadline(emptyTime)
-  return nBytes, err
+	return nBytes, err
 }
 
 type noOpReaderWorker struct {
-  connection net.Conn
+	connection net.Conn
 }
 
 func (this *noOpReaderWorker) Read(p []byte) (int, error) {
-  return this.connection.Read(p)
+	return this.connection.Read(p)
 }

proxy/vmess/config/json/user.go

@@ -8,16 +8,16 @@ import (
 
 // ConfigUser is an user account in VMess configuration.
 type ConfigUser struct {
-	Id    *config.ID
+	Id         *config.ID
-	Email string
+	Email      string
-  LevelValue config.UserLevel
+	LevelValue config.UserLevel
 }
 
 func (u *ConfigUser) UnmarshalJSON(data []byte) error {
 	type rawUser struct {
 		IdString    string `json:"id"`
 		EmailString string `json:"email"`
-    LevelInt int `json:"level"`
+		LevelInt    int    `json:"level"`
 	}
 	var rawUserValue rawUser
 	if err := json.Unmarshal(data, &rawUserValue); err != nil {
@@ -29,7 +29,7 @@ func (u *ConfigUser) UnmarshalJSON(data []byte) error {
 	}
 	u.Id = id
 	u.Email = rawUserValue.EmailString
-  u.LevelValue = config.UserLevel(rawUserValue.LevelInt)
+	u.LevelValue = config.UserLevel(rawUserValue.LevelInt)
 	return nil
 }
 
@@ -38,5 +38,5 @@ func (u *ConfigUser) ID() *config.ID {
 }
 
 func (this *ConfigUser) Level() config.UserLevel {
-  return this.LevelValue
+	return this.LevelValue
-}
+}

proxy/vmess/config/user.go

@@ -3,25 +3,25 @@ package config
 type UserLevel int
 
 const (
-  UserLevelAdmin = UserLevel(999)
+	UserLevelAdmin     = UserLevel(999)
-  UserLevelUntrusted = UserLevel(0)
+	UserLevelUntrusted = UserLevel(0)
 )
 
 type User interface {
 	ID() *ID
-  Level() UserLevel
+	Level() UserLevel
 }
 
 type UserSettings struct {
-  PayloadReadTimeout int
+	PayloadReadTimeout int
 }
 
 func GetUserSettings(level UserLevel) UserSettings {
-  settings := UserSettings {
+	settings := UserSettings{
-    PayloadReadTimeout: 120,
+		PayloadReadTimeout: 120,
-  }
+	}
-  if level > 0 {
+	if level > 0 {
-    settings.PayloadReadTimeout = 0
+		settings.PayloadReadTimeout = 0
-  }
+	}
-  return settings
+	return settings
 }

proxy/vmess/protocol/user/userset.go

@@ -19,7 +19,7 @@ type UserSet interface {
 }
 
 type TimedUserSet struct {
-	validUsers        []config.User
+	validUsers          []config.User
 	userHash            map[string]indexTimePair
 	userHashDeleteQueue *collect.TimedQueue
 	access              sync.RWMutex
@@ -32,7 +32,7 @@ type indexTimePair struct {
 
 func NewTimedUserSet() UserSet {
 	tus := &TimedUserSet{
-		validUsers:        make([]config.User, 0, 16),
+		validUsers:          make([]config.User, 0, 16),
 		userHash:            make(map[string]indexTimePair, 512),
 		userHashDeleteQueue: collect.NewTimedQueue(updateIntervalSec),
 		access:              sync.RWMutex{},

proxy/vmess/protocol/vmess.go

@@ -37,7 +37,7 @@ const (
 // streaming.
 type VMessRequest struct {
 	Version        byte
-	User         config.User
+	User           config.User
 	RequestIV      []byte
 	RequestKey     []byte
 	ResponseHeader []byte
@@ -98,7 +98,7 @@ func (r *VMessRequestReader) Read(reader io.Reader) (*VMessRequest, error) {
 	bufferLen := nBytes
 
 	request := &VMessRequest{
-		User:  userObj,
+		User:    userObj,
 		Version: buffer.Value[0],
 	}
 

proxy/vmess/protocol/vmess_test.go

@@ -13,8 +13,8 @@ import (
 )
 
 type TestUser struct {
-	id *config.ID
+	id    *config.ID
-  level config.UserLevel
+	level config.UserLevel
 }
 
 func (u *TestUser) ID() *config.ID {
@@ -22,7 +22,7 @@ func (u *TestUser) ID() *config.ID {
 }
 
 func (this *TestUser) Level() config.UserLevel {
-  return this.level
+	return this.level
 }
 
 func TestVMessSerialization(t *testing.T) {
@@ -32,10 +32,10 @@ func TestVMessSerialization(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-  
+
-  testUser := &TestUser {
+	testUser := &TestUser{
-    id: userId,
+		id: userId,
-  }
+	}
 
 	userSet := mocks.MockUserSet{[]config.User{}, make(map[string]int), make(map[string]int64)}
 	userSet.AddUser(testUser)
@@ -82,10 +82,10 @@ func TestVMessSerialization(t *testing.T) {
 func BenchmarkVMessRequestWriting(b *testing.B) {
 	userId, _ := config.NewID("2b2966ac-16aa-4fbf-8d81-c5f172a3da51")
 	userSet := mocks.MockUserSet{[]config.User{}, make(map[string]int), make(map[string]int64)}
-  
+
-  testUser := &TestUser{
+	testUser := &TestUser{
-    id: userId,
+		id: userId,
-  }
+	}
 	userSet.AddUser(testUser)
 
 	request := new(VMessRequest)

proxy/vmess/vmessin.go

@@ -91,7 +91,7 @@ func (handler *VMessInboundHandler) HandleConnection(connection *net.TCPConn) er
 	readFinish.Lock()
 	writeFinish.Lock()
 
-  userSettings := config.GetUserSettings(request.User.Level())
+	userSettings := config.GetUserSettings(request.User.Level())
 	connReader.SetTimeOut(userSettings.PayloadReadTimeout)
 	go handleInput(request, connReader, input, &readFinish)
 

proxy/vmess/vmessout.go

@@ -67,7 +67,7 @@ func (handler *VMessOutboundHandler) Dispatch(firstPacket v2net.Packet, ray ray.
 	}
 	request := &protocol.VMessRequest{
 		Version: protocol.Version,
-		User:  vNextUser,
+		User:    vNextUser,
 		Command: command,
 		Address: firstPacket.Destination().Address(),
 	}

testing/mocks/mockuserset.go

@@ -5,7 +5,7 @@ import (
 )
 
 type MockUserSet struct {
-	Users    []config.User
+	Users      []config.User
 	UserHashes map[string]int
 	Timestamps map[string]int64
 }