Revert "multiple config"

main/json/config_json.go

@@ -7,28 +7,22 @@ import (
 
 	"v2ray.com/core"
 	"v2ray.com/core/common"
-	"v2ray.com/core/common/cmdarg"
-	"v2ray.com/core/infra/conf/serial"
-	"v2ray.com/core/main/confloader"
+	"v2ray.com/core/common/buf"
+	"v2ray.com/core/common/platform/ctlcmd"
 )
 
 func init() {
 	common.Must(core.RegisterConfigLoader(&core.ConfigFormat{
 		Name:      "JSON",
 		Extension: []string{"json"},
-		Loader: func(input interface{}) (*core.Config, error) {
-			switch v := input.(type) {
-			case cmdarg.Arg:
-				r, err := confloader.LoadExtConfig(v)
-				if err != nil {
-					return nil, newError("failed to execute v2ctl to convert config file.").Base(err).AtWarning()
-				}
-				return core.LoadConfig("protobuf", "", r)
-			case io.Reader:
-				return serial.LoadJSONConfig(v)
-			default:
-				return nil, newError("unknow type")
+		Loader: func(input io.Reader) (*core.Config, error) {
+			jsonContent, err := ctlcmd.Run([]string{"config"}, input)
+			if err != nil {
+				return nil, newError("failed to execute v2ctl to convert config file.").Base(err).AtWarning()
 			}
+			return core.LoadConfig("protobuf", "", &buf.MultiBufferContainer{
+				MultiBuffer: jsonContent,
+			})
 		},
 	}))
 }