all adjustments

backend/service/outbounds.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"encoding/json"
+	"os"
 	"s-ui/database"
 	"s-ui/database/model"
 
@@ -10,24 +11,32 @@ import (
 
 type OutboundService struct{}
 
-func (o *OutboundService) GetAll() ([]*model.Outbound, error) {
+func (o *OutboundService) GetAll() (*[]map[string]interface{}, error) {
 	db := database.GetDB()
 	outbounds := []*model.Outbound{}
 	err := db.Model(model.Outbound{}).Scan(&outbounds).Error
 	if err != nil {
 		return nil, err
 	}
-	return outbounds, nil
-}
-
-func (o *OutboundService) Get(id uint) (*model.Outbound, error) {
-	db := database.GetDB()
-	outbound := &model.Outbound{}
-	err := db.First(outbound, id).Error
-	if err != nil {
-		return nil, err
+	var data []map[string]interface{}
+	for _, outbound := range outbounds {
+		outData := map[string]interface{}{
+			"id":   outbound.Id,
+			"type": outbound.Type,
+			"tag":  outbound.Tag,
+		}
+		if outbound.Options != nil {
+			var restFields map[string]json.RawMessage
+			if err := json.Unmarshal(outbound.Options, &restFields); err != nil {
+				return nil, err
+			}
+			for k, v := range restFields {
+				outData[k] = v
+			}
+		}
+		data = append(data, outData)
 	}
-	return outbound, nil
+	return &data, nil
 }
 
 func (o *OutboundService) GetAllConfig(db *gorm.DB) ([]json.RawMessage, error) {
@@ -46,3 +55,55 @@ func (o *OutboundService) GetAllConfig(db *gorm.DB) ([]json.RawMessage, error) {
 	}
 	return outboundsJson, nil
 }
+
+func (s *OutboundService) Save(tx *gorm.DB, action string, data json.RawMessage) error {
+	var err error
+
+	switch action {
+	case "new", "edit":
+		var outbound model.Outbound
+		err = outbound.UnmarshalJSON(data)
+		if err != nil {
+			return err
+		}
+
+		if corePtr.IsRunning() {
+			configData, err := outbound.MarshalJSON()
+			if err != nil {
+				return err
+			}
+			if action == "edit" {
+				err = corePtr.RemoveOutbound(outbound.Tag)
+				if err != nil && err != os.ErrInvalid {
+					return err
+				}
+			}
+			err = corePtr.AddOutbound(configData)
+			if err != nil {
+				return err
+			}
+		}
+
+		err = tx.Save(&outbound).Error
+		if err != nil {
+			return err
+		}
+	case "del":
+		var tag string
+		err = json.Unmarshal(data, &tag)
+		if err != nil {
+			return err
+		}
+		if corePtr.IsRunning() {
+			err = corePtr.RemoveOutbound(tag)
+			if err != nil && err != os.ErrInvalid {
+				return err
+			}
+		}
+		err = tx.Where("tag = ?", tag).Delete(model.Outbound{}).Error
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}