Modular 、Functional enhancement

cmd/npc/npc.go

@@ -2,11 +2,15 @@ package main
 
 import (
 	"flag"
+	"fmt"
 	"github.com/cnlh/nps/client"
 	"github.com/cnlh/nps/lib/common"
+	"github.com/cnlh/nps/lib/config"
 	"github.com/cnlh/nps/lib/daemon"
+	"github.com/cnlh/nps/lib/file"
 	"github.com/cnlh/nps/lib/version"
 	"github.com/cnlh/nps/vender/github.com/astaxie/beego/logs"
+	"github.com/cnlh/nps/vender/github.com/ccding/go-stun/stun"
 	"os"
 	"strings"
 	"time"
@@ -21,18 +25,33 @@ var (
 	proxyUrl     = flag.String("proxy", "", "proxy socks5 url(eg:socks5://111:222@127.0.0.1:9007)")
 	logLevel     = flag.String("log_level", "7", "log level 0~7")
 	registerTime = flag.Int("time", 2, "register time long /h")
+	localPort    = flag.Int("local_port", 2000, "p2p local port")
+	password     = flag.String("password", "", "p2p password flag")
+	target       = flag.String("target", "", "p2p target")
+	localType    = flag.String("local_type", "p2p", "p2p target")
+	logPath      = flag.String("log_path", "npc.log", "npc log path")
 )
 
 func main() {
 	flag.Parse()
-	if len(os.Args) > 2 {
+	if len(os.Args) >= 2 {
 		switch os.Args[1] {
 		case "status":
-			path := strings.Replace(os.Args[2], "-config=", "", -1)
-			client.GetTaskStatus(path)
+			if len(os.Args) > 2 {
+				path := strings.Replace(os.Args[2], "-config=", "", -1)
+				client.GetTaskStatus(path)
+			}
 		case "register":
 			flag.CommandLine.Parse(os.Args[2:])
 			client.RegisterLocalIp(*serverAddr, *verifyKey, *connType, *proxyUrl, *registerTime)
+		case "nat":
+			nat, host, err := stun.NewClient().Discover()
+			if err != nil || host == nil {
+				logs.Error("get nat type error", err)
+				return
+			}
+			fmt.Printf("nat type: %s \npublic address: %s\n", nat.String(), host.String())
+			os.Exit(0)
 		}
 	}
 	daemon.InitDaemon("npc", common.GetRunPath(), common.GetTmpPath())
@@ -41,7 +60,23 @@ func main() {
 	if *logType == "stdout" {
 		logs.SetLogger(logs.AdapterConsole, `{"level":`+*logLevel+`,"color":true}`)
 	} else {
-		logs.SetLogger(logs.AdapterFile, `{"level":`+*logLevel+`,"filename":"npc_log.log","daily":false,"color":true}`)
+		logs.SetLogger(logs.AdapterFile, `{"level":`+*logLevel+`,"filename":"`+*logPath+`","daily":false,"color":true}`)
+	}
+	//p2p or secret command
+	if *password != "" {
+		commonConfig := new(config.CommonConfig)
+		commonConfig.Server = *serverAddr
+		commonConfig.VKey = *verifyKey
+		commonConfig.Tp = *connType
+		localServer := new(config.LocalServer)
+		localServer.Type = *localType
+		localServer.Password = *password
+		localServer.Target = *target
+		localServer.Port = *localPort
+		commonConfig.Client = new(file.Client)
+		commonConfig.Client.Cnf = new(file.Config)
+		client.StartLocalServer(localServer, commonConfig)
+		return
 	}
 	env := common.GetEnvMap()
 	if *serverAddr == "" {
@@ -50,7 +85,7 @@ func main() {
 	if *verifyKey == "" {
 		*verifyKey, _ = env["NPC_SERVER_VKEY"]
 	}
-	logs.Info("the version of client is %s", version.VERSION)
+	logs.Info("the version of client is %s, the core version of client is %s", version.VERSION, version.GetVersion())
 	if *verifyKey != "" && *serverAddr != "" && *configPath == "" {
 		for {
 			client.NewRPClient(*serverAddr, *verifyKey, *connType, *proxyUrl, nil).Start()

cmd/nps/nps.go

@@ -50,7 +50,7 @@ func main() {
 	if *logType == "stdout" {
 		logs.SetLogger(logs.AdapterConsole, `{"level":`+level+`,"color":true}`)
 	} else {
-		logs.SetLogger(logs.AdapterFile, `{"level":`+level+`,"filename":"nps_log.log","daily":false,"color":true}`)
+		logs.SetLogger(logs.AdapterFile, `{"level":`+level+`,"filename":"`+beego.AppConfig.String("log_path")+`","daily":false,"color":true}`)
 	}
 	task := &file.Tunnel{
 		Mode: "webServer",
@@ -62,7 +62,8 @@ func main() {
 	}
 	logs.Info("the version of server is %s ,allow client version to be %s", version.VERSION, version.GetVersion())
 	connection.InitConnectionService()
-	crypt.InitTls(filepath.Join(beego.AppPath, "conf", "server.pem"), filepath.Join(beego.AppPath, "conf", "server.key"))
+	crypt.InitTls(filepath.Join(common.GetRunPath(), "conf", "server.pem"), filepath.Join(common.GetRunPath(), "conf", "server.key"))
 	tool.InitAllowPort()
+	tool.StartSystemInfo()
 	server.StartNewServer(bridgePort, task, beego.AppConfig.String("bridge_type"))
 }