remove old config

Author: lzjluzijie

core/client/app.go renamed to client/app.go

@@ -12,12 +12,3 @@ type WebSocksClientApp struct {
 	//todo multiple client
 	*WebSocksClient
 }
-
-func (app *WebSocksClientApp) GetStatus() (stats *Stats) {
-	if !app.running {
-		return nil
-	}
-
-	stats = app.WebSocksClient.Status()
-	return
-}

core/client/client.go renamed to client/client.go

@@ -6,27 +6,13 @@ import (
 
 	"net/url"
 
-	"crypto/tls"
-
-	"sync"
-
 	"github.com/gorilla/websocket"
 	"github.com/lzjluzijie/websocks/core"
 	"github.com/sirupsen/logrus"
 )
 
 var log = logrus.New()
 
-type WebSocksClientConfig struct {
-	ListenAddr string
-	ServerURL  string
-
-	SNI          string
-	InsecureCert bool
-
-	Mux bool
-}
-
 type WebSocksClient struct {
 	ServerURL  *url.URL
 	ListenAddr *net.TCPAddr
@@ -42,86 +28,18 @@ type WebSocksClient struct {
 	//control
 	stopC chan int
 
-	//statistics
 	CreatedAt time.Time
-
-	Downloaded     uint64
-	DownloadSpeed  uint64
-	downloadMutex  sync.Mutex
-	downloadSpeedA uint64
-
-	Uploaded     uint64
-	UploadSpeed  uint64
-	uploadMutex  sync.Mutex
-	uploadSpeedA uint64
+	Stats     *core.Stats
 }
 
-func NewWebSocksClient(config *WebSocksClientConfig) (client *WebSocksClient) {
-	serverURL, err := url.Parse(config.ServerURL)
-	if err != nil {
-		return
-	}
-
-	laddr, err := net.ResolveTCPAddr("tcp", config.ListenAddr)
-	if err != nil {
-		return
-	}
-
-	tlsConfig := &tls.Config{
-		InsecureSkipVerify: config.InsecureCert,
-		ServerName:         config.SNI,
-	}
-
-	client = &WebSocksClient{
-		ServerURL:  serverURL,
-		ListenAddr: laddr,
-		dialer: &websocket.Dialer{
-			ReadBufferSize:   4 * 1024,
-			WriteBufferSize:  4 * 1024,
-			HandshakeTimeout: 10 * time.Second,
-			TLSClientConfig:  tlsConfig,
-		},
-
-		CreatedAt:     time.Now(),
-		Downloaded:    0,
-		DownloadSpeed: 0,
-		Uploaded:      0,
-		UploadSpeed:   0,
-	}
-	return
-}
-
-func (client *WebSocksClient) Listen() (err error) {
+func (client *WebSocksClient) Run() (err error) {
 	listener, err := net.ListenTCP("tcp", client.ListenAddr)
 	if err != nil {
 		return err
 	}
 
 	log.Infof("Start to listen at %s", client.ListenAddr.String())
 
-	//status
-	go func() {
-		t := time.NewTicker(time.Second)
-		for range t.C {
-			client.downloadMutex.Lock()
-			client.DownloadSpeed = client.downloadSpeedA
-			client.downloadSpeedA = 0
-			client.downloadMutex.Unlock()
-			log.Infof("Download speed: %d", client.DownloadSpeed)
-		}
-	}()
-
-	go func() {
-		t := time.NewTicker(time.Second)
-		for range t.C {
-			client.uploadMutex.Lock()
-			client.UploadSpeed = client.uploadSpeedA
-			client.uploadSpeedA = 0
-			client.uploadMutex.Unlock()
-			log.Infof("Upload speed: %d", client.UploadSpeed)
-		}
-	}()
-
 	if client.Mux {
 		err := client.OpenMux()
 		if err != nil {
@@ -190,9 +108,7 @@ func (client *WebSocksClient) DialWebSocket(header map[string][]string) (ws *cor
 		return
 	}
 
-	ws = core.NewWebSocket(wsConn)
-	ws.AddDownloaded = client.AddDownloaded
-	ws.AddUploaded = client.AddUploaded
+	ws = core.NewWebSocket(wsConn, client.Stats)
 	//client.connMutex.Lock()
 	//client.wsConns = append(client.wsConns, ws)
 	//client.connMutex.Unlock()

core/client/config.go renamed to client/config.go

@@ -2,18 +2,26 @@ package client
 
 import (
 	"crypto/tls"
-	"encoding/json"
-	"io/ioutil"
 	"net"
 	"net/url"
 	"time"
 
 	"github.com/gorilla/websocket"
-	"github.com/urfave/cli"
+	"github.com/lzjluzijie/websocks/core"
 )
 
+type Config struct {
+	ListenAddr string
+	ServerURL  string
+
+	SNI          string
+	InsecureCert bool
+
+	Mux bool
+}
+
 //GetClient return client from path
-func GetClient(config *WebSocksClientConfig) (client *WebSocksClient, err error) {
+func (config *Config) GetClient() (client *WebSocksClient, err error) {
 	//tackle config
 	serverURL, err := url.Parse(config.ServerURL)
 	if err != nil {
@@ -43,30 +51,7 @@ func GetClient(config *WebSocksClientConfig) (client *WebSocksClient, err error)
 		//todo mux
 
 		CreatedAt: time.Now(),
-	}
-	return
-}
-
-//GenerateClientConfig create a client config from cli.Context
-func GenerateClientConfig(c *cli.Context) (err error) {
-	path := c.String("path")
-
-	config := &WebSocksClientConfig{
-		ListenAddr:   c.String("l"),
-		ServerURL:    c.String("s"),
-		SNI:          c.String("sni"),
-		InsecureCert: c.Bool("insecure"),
-		Mux:          c.Bool("mux"),
-	}
-
-	data, err := json.MarshalIndent(config, "", "    ")
-	if err != nil {
-		return
-	}
-
-	err = ioutil.WriteFile(path, data, 600)
-	if err != nil {
-		return
+		Stats:     core.NewStats(),
 	}
 	return
 }

core/client/conn.go renamed to client/conn.go

@@ -15,7 +15,7 @@ func (client *WebSocksClient) OpenMux() (err error) {
 		return
 	}
 
-	ws := core.NewWebSocket(wsConn)
+	ws := core.NewWebSocket(wsConn, client.Stats)
 
 	muxWS := core.NewMuxWebSocket(ws)
 	client.muxWS = muxWS

core/client/mux.go renamed to client/mux.go

@@ -3,7 +3,6 @@ package client
 import (
 	"bytes"
 	"encoding/json"
-	"fmt"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -42,12 +41,11 @@ func (app *WebSocksClientApp) RunWeb() {
 			return
 		})
 		m.Get("/stats", func(ctx *macaron.Context) {
-			stats := app.GetStatus()
-			if stats == nil {
+			if app.WebSocksClient == nil {
 				ctx.Error(403, "websocks client is not running")
 				return
 			}
-			ctx.JSON(200, stats)
+			ctx.JSON(200, app.WebSocksClient.Stats)
 		})
 		m.Post("/start", app.StartClient)
 		m.Post("/stop", app.StopClient)
@@ -71,30 +69,27 @@ func (app *WebSocksClientApp) RunWeb() {
 }
 
 func (app *WebSocksClientApp) StartClient(ctx *macaron.Context) {
-	webSocksClientConfig := &WebSocksClientConfig{}
+	config := &Config{}
 	data, err := ioutil.ReadAll(ctx.Req.Body().ReadCloser())
 	if err != nil {
 		ctx.Error(403, err.Error())
 	}
 
-	err = json.Unmarshal(data, webSocksClientConfig)
+	err = json.Unmarshal(data, config)
 	if err != nil {
 		ctx.Error(403, err.Error())
 	}
 
-	websocksClient, err := GetClient(webSocksClientConfig)
+	websocksClient, err := config.GetClient()
 	if err != nil {
 		ctx.Error(403, err.Error())
 	}
 
 	app.WebSocksClient = websocksClient
 	app.running = true
 
-	ctx.WriteHeader(200)
-	ctx.Write([]byte(fmt.Sprintf("%v", webSocksClientConfig)))
-
 	go func() {
-		err = websocksClient.Listen()
+		err = websocksClient.Run()
 		if err != nil {
 			log.Error(err.Error())
 		}