complete original config support for sing, fix DelUsers for vless

antqfpt · Aug 25, 2023 · cb868c7 · cb868c7
1 parent f6b4c04
commit cb868c7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/core/sing/sing.go b/core/sing/sing.go
@@ -3,6 +3,7 @@ package sing
 import (
 	"context"
 	"fmt"
+	"github.com/goccy/go-json"
 	"io"
 	"os"
 	"runtime/debug"
@@ -41,6 +42,17 @@ func init() {
 
 func New(c *conf.CoreConfig) (vCore.Core, error) {
 	options := option.Options{}
+	if len(c.SingConfig.OriginalPath) != 0 {
+		f, err := os.Open(c.SingConfig.OriginalPath)
+		if err != nil {
+			return nil, fmt.Errorf("open original config error: %s", err)
+		}
+		defer f.Close()
+		err = json.NewDecoder(f).Decode(options)
+		if err != nil {
+			return nil, fmt.Errorf("decode original config error: %s", err)
+		}
+	}
 	options.Log = &option.LogOptions{
 		Disabled:  c.SingConfig.LogConfig.Disabled,
 		Level:     c.SingConfig.LogConfig.Level,

diff --git a/core/sing/user.go b/core/sing/user.go
@@ -98,6 +98,8 @@ func (b *Box) DelUsers(users []panel.UserInfo, tag string) error {
 		switch i.Type() {
 		case "vmess":
 			del = i.(*inbound.VMess)
+		case "vless":
+			del = i.(*inbound.VLESS)
 		case "shadowsocks":
 			del = i.(*inbound.ShadowsocksMulti)
 		case "trojan":