fix(client): use more friendly config (#13)

.gitignore

@@ -28,4 +28,5 @@ dist/
 .secret
 node_modules
 bootstrap
-.s/
+.s/
+.seamoom

pkg/client/config.go

@@ -30,7 +30,7 @@ type proxyConfig struct {
 
 var (
 	singleton  *clientConfig
-	configPath = ".config"
+	configPath = ".seamoom"
 )
 
 func Config() *clientConfig {
@@ -62,6 +62,7 @@ func (c *clientConfig) Save() error {
 	if err := toml.NewEncoder(&buf).Encode(c); err != nil {
 		return err
 	}
+
 	fd, err := os.OpenFile(configPath, os.O_CREATE|os.O_WRONLY, 0644)
 	if err != nil {
 		return err

pkg/client/http.go

@@ -3,15 +3,17 @@ package client
 import (
 	"context"
 	"crypto/tls"
-	"github.com/DVKunion/SeaMoon/pkg/consts"
-	"github.com/DVKunion/SeaMoon/pkg/utils"
-	"github.com/google/martian/v3"
-	log "github.com/sirupsen/logrus"
 	"net"
 	"net/http"
 	"net/url"
 	"strings"
 	"time"
+
+	"github.com/google/martian/v3"
+	log "github.com/sirupsen/logrus"
+
+	"github.com/DVKunion/SeaMoon/pkg/consts"
+	"github.com/DVKunion/SeaMoon/pkg/utils"
 )
 
 func HttpController(ctx context.Context, sg *SigGroup) {
@@ -27,7 +29,9 @@ func HttpController(ctx context.Context, sg *SigGroup) {
 			}
 			var proxyAddr string
 			for _, p := range Config().ProxyAddr {
-				if strings.HasPrefix(p, "http-proxy") {
+				if strings.HasPrefix(p, "http://") || strings.HasPrefix(p, "https://") {
+					proxyAddr = p
+				} else if strings.HasPrefix(p, "http-proxy") {
 					proxyAddr = "http://" + p
 				}
 			}

pkg/client/socks.go

@@ -39,12 +39,10 @@ func Socks5Controller(ctx context.Context, sg *SigGroup) {
 			}
 			var proxyAddr string
 			for _, p := range Config().ProxyAddr {
-				if strings.HasPrefix(p, "socks-proxy") {
-					if consts.Version == "dev" {
-						proxyAddr = "ws://127.0.0.1:8888"
-					} else {
-						proxyAddr = "ws://" + p
-					}
+				if strings.HasPrefix(p, "ws://") || strings.HasPrefix(p, "wss://") {
+					proxyAddr = p
+				} else if strings.HasPrefix(p, "socks-proxy") {
+					proxyAddr = "ws://" + p
 				}
 			}
 			if proxyAddr == "" {