mirror of
https://github.com/v2fly/v2ray-core.git
synced 2024-06-17 13:05:24 +00:00
isolate jsonv4 format that invalided selective compile
This commit is contained in:
parent
8989dd8336
commit
ca7a16104d
|
@ -16,9 +16,5 @@ var CmdAPI = &base.Command{
|
||||||
cmdBalancerCheck,
|
cmdBalancerCheck,
|
||||||
cmdBalancerInfo,
|
cmdBalancerInfo,
|
||||||
cmdBalancerOverride,
|
cmdBalancerOverride,
|
||||||
cmdAddInbounds,
|
|
||||||
cmdAddOutbounds,
|
|
||||||
cmdRemoveInbounds,
|
|
||||||
cmdRemoveOutbounds,
|
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
package api
|
package jsonv4
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"github.com/v2fly/v2ray-core/v4/main/commands/all/api"
|
||||||
|
|
||||||
handlerService "github.com/v2fly/v2ray-core/v4/app/proxyman/command"
|
handlerService "github.com/v2fly/v2ray-core/v4/app/proxyman/command"
|
||||||
"github.com/v2fly/v2ray-core/v4/main/commands/base"
|
"github.com/v2fly/v2ray-core/v4/main/commands/base"
|
||||||
|
@ -43,10 +44,10 @@ Example:
|
||||||
}
|
}
|
||||||
|
|
||||||
func executeAddInbounds(cmd *base.Command, args []string) {
|
func executeAddInbounds(cmd *base.Command, args []string) {
|
||||||
setSharedFlags(cmd)
|
api.SetSharedFlags(cmd)
|
||||||
setSharedConfigFlags(cmd)
|
api.SetSharedConfigFlags(cmd)
|
||||||
cmd.Flag.Parse(args)
|
cmd.Flag.Parse(args)
|
||||||
c, err := helpers.LoadConfig(cmd.Flag.Args(), apiConfigFormat, apiConfigRecursively)
|
c, err := helpers.LoadConfig(cmd.Flag.Args(), api.ApiConfigFormat, api.ApiConfigRecursively)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
base.Fatalf("failed to load: %s", err)
|
base.Fatalf("failed to load: %s", err)
|
||||||
}
|
}
|
||||||
|
@ -54,7 +55,7 @@ func executeAddInbounds(cmd *base.Command, args []string) {
|
||||||
base.Fatalf("no valid inbound found")
|
base.Fatalf("no valid inbound found")
|
||||||
}
|
}
|
||||||
|
|
||||||
conn, ctx, close := dialAPIServer()
|
conn, ctx, close := api.DialAPIServer()
|
||||||
defer close()
|
defer close()
|
||||||
|
|
||||||
client := handlerService.NewHandlerServiceClient(conn)
|
client := handlerService.NewHandlerServiceClient(conn)
|
|
@ -1,7 +1,8 @@
|
||||||
package api
|
package jsonv4
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"github.com/v2fly/v2ray-core/v4/main/commands/all/api"
|
||||||
|
|
||||||
handlerService "github.com/v2fly/v2ray-core/v4/app/proxyman/command"
|
handlerService "github.com/v2fly/v2ray-core/v4/app/proxyman/command"
|
||||||
"github.com/v2fly/v2ray-core/v4/main/commands/base"
|
"github.com/v2fly/v2ray-core/v4/main/commands/base"
|
||||||
|
@ -47,8 +48,8 @@ Example:
|
||||||
}
|
}
|
||||||
|
|
||||||
func executeRemoveInbounds(cmd *base.Command, args []string) {
|
func executeRemoveInbounds(cmd *base.Command, args []string) {
|
||||||
setSharedFlags(cmd)
|
api.SetSharedFlags(cmd)
|
||||||
setSharedConfigFlags(cmd)
|
api.SetSharedConfigFlags(cmd)
|
||||||
isTags := cmd.Flag.Bool("tags", false, "")
|
isTags := cmd.Flag.Bool("tags", false, "")
|
||||||
cmd.Flag.Parse(args)
|
cmd.Flag.Parse(args)
|
||||||
|
|
||||||
|
@ -56,7 +57,7 @@ func executeRemoveInbounds(cmd *base.Command, args []string) {
|
||||||
if *isTags {
|
if *isTags {
|
||||||
tags = cmd.Flag.Args()
|
tags = cmd.Flag.Args()
|
||||||
} else {
|
} else {
|
||||||
c, err := helpers.LoadConfig(cmd.Flag.Args(), apiConfigFormat, apiConfigRecursively)
|
c, err := helpers.LoadConfig(cmd.Flag.Args(), api.ApiConfigFormat, api.ApiConfigRecursively)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
base.Fatalf("failed to load: %s", err)
|
base.Fatalf("failed to load: %s", err)
|
||||||
}
|
}
|
||||||
|
@ -69,7 +70,7 @@ func executeRemoveInbounds(cmd *base.Command, args []string) {
|
||||||
base.Fatalf("no inbound to remove")
|
base.Fatalf("no inbound to remove")
|
||||||
}
|
}
|
||||||
|
|
||||||
conn, ctx, close := dialAPIServer()
|
conn, ctx, close := api.DialAPIServer()
|
||||||
defer close()
|
defer close()
|
||||||
|
|
||||||
client := handlerService.NewHandlerServiceClient(conn)
|
client := handlerService.NewHandlerServiceClient(conn)
|
12
main/commands/all/api/jsonv4/init.go
Normal file
12
main/commands/all/api/jsonv4/init.go
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
package jsonv4
|
||||||
|
|
||||||
|
import "github.com/v2fly/v2ray-core/v4/main/commands/all/api"
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
api.CmdAPI.Commands = append(api.CmdAPI.Commands,
|
||||||
|
cmdAddInbounds,
|
||||||
|
cmdAddOutbounds,
|
||||||
|
cmdRemoveInbounds,
|
||||||
|
cmdRemoveOutbounds)
|
||||||
|
|
||||||
|
}
|
|
@ -1,7 +1,8 @@
|
||||||
package api
|
package jsonv4
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"github.com/v2fly/v2ray-core/v4/main/commands/all/api"
|
||||||
|
|
||||||
handlerService "github.com/v2fly/v2ray-core/v4/app/proxyman/command"
|
handlerService "github.com/v2fly/v2ray-core/v4/app/proxyman/command"
|
||||||
"github.com/v2fly/v2ray-core/v4/main/commands/base"
|
"github.com/v2fly/v2ray-core/v4/main/commands/base"
|
||||||
|
@ -43,10 +44,10 @@ Example:
|
||||||
}
|
}
|
||||||
|
|
||||||
func executeAddOutbounds(cmd *base.Command, args []string) {
|
func executeAddOutbounds(cmd *base.Command, args []string) {
|
||||||
setSharedFlags(cmd)
|
api.SetSharedFlags(cmd)
|
||||||
setSharedConfigFlags(cmd)
|
api.SetSharedConfigFlags(cmd)
|
||||||
cmd.Flag.Parse(args)
|
cmd.Flag.Parse(args)
|
||||||
c, err := helpers.LoadConfig(cmd.Flag.Args(), apiConfigFormat, apiConfigRecursively)
|
c, err := helpers.LoadConfig(cmd.Flag.Args(), api.ApiConfigFormat, api.ApiConfigRecursively)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
base.Fatalf("failed to load: %s", err)
|
base.Fatalf("failed to load: %s", err)
|
||||||
}
|
}
|
||||||
|
@ -54,7 +55,7 @@ func executeAddOutbounds(cmd *base.Command, args []string) {
|
||||||
base.Fatalf("no valid outbound found")
|
base.Fatalf("no valid outbound found")
|
||||||
}
|
}
|
||||||
|
|
||||||
conn, ctx, close := dialAPIServer()
|
conn, ctx, close := api.DialAPIServer()
|
||||||
defer close()
|
defer close()
|
||||||
|
|
||||||
client := handlerService.NewHandlerServiceClient(conn)
|
client := handlerService.NewHandlerServiceClient(conn)
|
|
@ -1,7 +1,8 @@
|
||||||
package api
|
package jsonv4
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"github.com/v2fly/v2ray-core/v4/main/commands/all/api"
|
||||||
|
|
||||||
handlerService "github.com/v2fly/v2ray-core/v4/app/proxyman/command"
|
handlerService "github.com/v2fly/v2ray-core/v4/app/proxyman/command"
|
||||||
"github.com/v2fly/v2ray-core/v4/main/commands/base"
|
"github.com/v2fly/v2ray-core/v4/main/commands/base"
|
||||||
|
@ -47,8 +48,8 @@ Example:
|
||||||
}
|
}
|
||||||
|
|
||||||
func executeRemoveOutbounds(cmd *base.Command, args []string) {
|
func executeRemoveOutbounds(cmd *base.Command, args []string) {
|
||||||
setSharedFlags(cmd)
|
api.SetSharedFlags(cmd)
|
||||||
setSharedConfigFlags(cmd)
|
api.SetSharedConfigFlags(cmd)
|
||||||
isTags := cmd.Flag.Bool("tags", false, "")
|
isTags := cmd.Flag.Bool("tags", false, "")
|
||||||
cmd.Flag.Parse(args)
|
cmd.Flag.Parse(args)
|
||||||
|
|
||||||
|
@ -56,7 +57,7 @@ func executeRemoveOutbounds(cmd *base.Command, args []string) {
|
||||||
if *isTags {
|
if *isTags {
|
||||||
tags = cmd.Flag.Args()
|
tags = cmd.Flag.Args()
|
||||||
} else {
|
} else {
|
||||||
c, err := helpers.LoadConfig(cmd.Flag.Args(), apiConfigFormat, apiConfigRecursively)
|
c, err := helpers.LoadConfig(cmd.Flag.Args(), api.ApiConfigFormat, api.ApiConfigRecursively)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
base.Fatalf("failed to load: %s", err)
|
base.Fatalf("failed to load: %s", err)
|
||||||
}
|
}
|
||||||
|
@ -69,7 +70,7 @@ func executeRemoveOutbounds(cmd *base.Command, args []string) {
|
||||||
base.Fatalf("no outbound to remove")
|
base.Fatalf("no outbound to remove")
|
||||||
}
|
}
|
||||||
|
|
||||||
conn, ctx, close := dialAPIServer()
|
conn, ctx, close := api.DialAPIServer()
|
||||||
defer close()
|
defer close()
|
||||||
|
|
||||||
client := handlerService.NewHandlerServiceClient(conn)
|
client := handlerService.NewHandlerServiceClient(conn)
|
|
@ -16,13 +16,20 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
apiServerAddrPtr string
|
apiServerAddrPtr string
|
||||||
apiTimeout int
|
apiTimeout int
|
||||||
apiJSON bool
|
apiJSON bool
|
||||||
apiConfigFormat string
|
// ApiConfigFormat is an internal variable
|
||||||
apiConfigRecursively bool
|
ApiConfigFormat string
|
||||||
|
// ApiConfigRecursively is an internal variable
|
||||||
|
ApiConfigRecursively bool
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// SetSharedFlags is an internal API
|
||||||
|
func SetSharedFlags(cmd *base.Command) {
|
||||||
|
setSharedFlags(cmd)
|
||||||
|
}
|
||||||
|
|
||||||
func setSharedFlags(cmd *base.Command) {
|
func setSharedFlags(cmd *base.Command) {
|
||||||
cmd.Flag.StringVar(&apiServerAddrPtr, "s", "127.0.0.1:8080", "")
|
cmd.Flag.StringVar(&apiServerAddrPtr, "s", "127.0.0.1:8080", "")
|
||||||
cmd.Flag.StringVar(&apiServerAddrPtr, "server", "127.0.0.1:8080", "")
|
cmd.Flag.StringVar(&apiServerAddrPtr, "server", "127.0.0.1:8080", "")
|
||||||
|
@ -31,9 +38,19 @@ func setSharedFlags(cmd *base.Command) {
|
||||||
cmd.Flag.BoolVar(&apiJSON, "json", false, "")
|
cmd.Flag.BoolVar(&apiJSON, "json", false, "")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SetSharedConfigFlags is an internal API
|
||||||
|
func SetSharedConfigFlags(cmd *base.Command) {
|
||||||
|
setSharedConfigFlags(cmd)
|
||||||
|
}
|
||||||
|
|
||||||
func setSharedConfigFlags(cmd *base.Command) {
|
func setSharedConfigFlags(cmd *base.Command) {
|
||||||
cmd.Flag.StringVar(&apiConfigFormat, "format", core.FormatAuto, "")
|
cmd.Flag.StringVar(&ApiConfigFormat, "format", core.FormatAuto, "")
|
||||||
cmd.Flag.BoolVar(&apiConfigRecursively, "r", false, "")
|
cmd.Flag.BoolVar(&ApiConfigRecursively, "r", false, "")
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetSharedFlags is an internal API
|
||||||
|
func DialAPIServer() (conn *grpc.ClientConn, ctx context.Context, close func()) {
|
||||||
|
return dialAPIServer()
|
||||||
}
|
}
|
||||||
|
|
||||||
func dialAPIServer() (conn *grpc.ClientConn, ctx context.Context, close func()) {
|
func dialAPIServer() (conn *grpc.ClientConn, ctx context.Context, close func()) {
|
||||||
|
|
|
@ -12,7 +12,6 @@ func init() {
|
||||||
base.RootCommand.Commands = append(
|
base.RootCommand.Commands = append(
|
||||||
base.RootCommand.Commands,
|
base.RootCommand.Commands,
|
||||||
api.CmdAPI,
|
api.CmdAPI,
|
||||||
cmdConvert,
|
|
||||||
cmdLove,
|
cmdLove,
|
||||||
tls.CmdTLS,
|
tls.CmdTLS,
|
||||||
cmdUUID,
|
cmdUUID,
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
package all
|
package jsonv4
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
"github.com/pelletier/go-toml"
|
||||||
"os"
|
"os"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/pelletier/go-toml"
|
|
||||||
"google.golang.org/protobuf/proto"
|
"google.golang.org/protobuf/proto"
|
||||||
|
|
||||||
core "github.com/v2fly/v2ray-core/v4"
|
core "github.com/v2fly/v2ray-core/v4"
|
7
main/commands/all/jsonv4/init.go
Normal file
7
main/commands/all/jsonv4/init.go
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
package jsonv4
|
||||||
|
|
||||||
|
import "github.com/v2fly/v2ray-core/v4/main/commands/base"
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
base.RegisterCommand(cmdConvert)
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user