store outbound traffic in database

database/db.go

@@ -21,6 +21,7 @@ var db *gorm.DB
 var initializers = []func() error{
 	initUser,
 	initInbound,
+	initOutbound,
 	initSetting,
 	initInboundClientIps,
 	initClientTraffic,
@@ -51,6 +52,10 @@ func initInbound() error {
 	return db.AutoMigrate(&model.Inbound{})
 }
 
+func initOutbound() error {
+	return db.AutoMigrate(&model.Outbound{})
+}
+
 func initSetting() error {
 	return db.AutoMigrate(&model.Setting{})
 }

database/model/model.go

@@ -44,6 +44,15 @@ type Inbound struct {
 	Tag            string   `json:"tag" form:"tag" gorm:"unique"`
 	Sniffing       string   `json:"sniffing" form:"sniffing"`
 }
+
+type Outbound struct {
+	Id    int    `json:"id" form:"id" gorm:"primaryKey;autoIncrement"`
+	Tag   string `json:"tag" form:"tag" gorm:"unique"`
+	Up    int64  `json:"up" form:"up" gorm:"default:0"`
+	Down  int64  `json:"down" form:"down" gorm:"default:0"`
+	Total int64  `json:"total" form:"total" gorm:"default:0"`
+}
+
 type InboundClientIps struct {
 	Id          int    `json:"id" gorm:"primaryKey;autoIncrement"`
 	ClientEmail string `json:"clientEmail" form:"clientEmail" gorm:"unique"`

web/job/xray_traffic_job.go

@@ -6,8 +6,9 @@ import (
 )
 
 type XrayTrafficJob struct {
-	xrayService    service.XrayService
+	xrayService     service.XrayService
-	inboundService service.InboundService
+	inboundService  service.InboundService
+	outboundService service.OutboundService
 }
 
 func NewXrayTrafficJob() *XrayTrafficJob {
@@ -24,11 +25,15 @@ func (j *XrayTrafficJob) Run() {
 		logger.Warning("get xray traffic failed:", err)
 		return
 	}
-	err, needRestart := j.inboundService.AddTraffic(traffics, clientTraffics)
+	err, needRestart0 := j.inboundService.AddTraffic(traffics, clientTraffics)
 	if err != nil {
-		logger.Warning("add traffic failed:", err)
+		logger.Warning("add inbound traffic failed:", err)
 	}
-	if needRestart {
+	err, needRestart1 := j.outboundService.AddTraffic(traffics, clientTraffics)
+	if err != nil {
+		logger.Warning("add outbound traffic failed:", err)
+	}
+	if needRestart0 || needRestart1 {
 		j.xrayService.SetToNeedRestart()
 	}
 

web/service/inbound.go

@@ -682,7 +682,7 @@ func (s *InboundService) UpdateInboundClient(data *model.Inbound, clientId strin
 	return needRestart, tx.Save(oldInbound).Error
 }
 
-func (s *InboundService) AddTraffic(inboundTraffics []*xray.Traffic, clientTraffics []*xray.ClientTraffic) (error, bool) {
+func (s *InboundService) AddTraffic(traffics []*xray.Traffic, clientTraffics []*xray.ClientTraffic) (error, bool) {
 	var err error
 	db := database.GetDB()
 	tx := db.Begin()
@@ -694,7 +694,7 @@ func (s *InboundService) AddTraffic(inboundTraffics []*xray.Traffic, clientTraff
 			tx.Commit()
 		}
 	}()
-	err = s.addInboundTraffic(tx, inboundTraffics)
+	err = s.addInboundTraffic(tx, traffics)
 	if err != nil {
 		return err, false
 	}

web/service/outbound.go

@@ -0,0 +1,66 @@
+package service
+
+import (
+	"x-ui/database"
+	"x-ui/database/model"
+	"x-ui/xray"
+
+	"gorm.io/gorm"
+)
+
+type OutboundService struct {
+	xrayApi xray.XrayAPI
+}
+
+func (s *OutboundService) AddTraffic(traffics []*xray.Traffic, clientTraffics []*xray.ClientTraffic) (error, bool) {
+	var err error
+	db := database.GetDB()
+	tx := db.Begin()
+
+	defer func() {
+		if err != nil {
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+
+	err = s.addOutboundTraffic(tx, traffics)
+	if err != nil {
+		return err, false
+	}
+
+	return nil, false
+}
+
+func (s *OutboundService) addOutboundTraffic(tx *gorm.DB, traffics []*xray.Traffic) error {
+	if len(traffics) == 0 {
+		return nil
+	}
+
+	var err error
+
+	for _, traffic := range traffics {
+		if traffic.IsOutbound {
+
+			var outbound model.Outbound
+
+			err = tx.Model(&model.Outbound{}).Where("tag = ?", traffic.Tag).
+				FirstOrCreate(&outbound).Error
+			if err != nil {
+				return err
+			}
+
+			outbound.Tag = traffic.Tag
+			outbound.Up = outbound.Up + traffic.Up
+			outbound.Down = outbound.Down + traffic.Down
+			outbound.Total = outbound.Up + outbound.Down
+
+			err = tx.Save(&outbound).Error
+			if err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}

xray/api.go

@@ -213,6 +213,7 @@ func (x *XrayAPI) GetTraffic(reset bool) ([]*Traffic, []*ClientTraffic, error) {
 			continue
 		}
 		isInbound := matchs[1] == "inbound"
+		isOutbound := matchs[1] == "outbound"
 		tag := matchs[2]
 		isDown := matchs[3] == "downlink"
 		if tag == "api" {
@@ -221,8 +222,9 @@ func (x *XrayAPI) GetTraffic(reset bool) ([]*Traffic, []*ClientTraffic, error) {
 		traffic, ok := tagTrafficMap[tag]
 		if !ok {
 			traffic = &Traffic{
-				IsInbound: isInbound,
+				IsInbound:  isInbound,
-				Tag:       tag,
+				IsOutbound: isOutbound,
+				Tag:        tag,
 			}
 			tagTrafficMap[tag] = traffic
 			traffics = append(traffics, traffic)

xray/traffic.go

@@ -1,8 +1,9 @@
 package xray
 
 type Traffic struct {
-	IsInbound bool
+	IsInbound  bool
-	Tag       string
+	IsOutbound bool
-	Up        int64
+	Tag        string
-	Down      int64
+	Up         int64
+	Down       int64
 }