Better logg, prepare for gui

cmd/goflyway/main.go

@@ -93,7 +93,7 @@ func main() {
 	}
 
 	if *G_Upstream != "" {
-		if !lookup.LoadOrCreateChinaList() {
+		if !lookup.LoadOrCreateChinaList("") {
 			logg.W("cannot read chinalist.txt (but it's fine, you can ignore this msg)")
 		}
 	}

pkg/logg/logg.go

@@ -10,7 +10,9 @@ import (
 )
 
 var ignoreLocalhost = true
+var fatalAsError = false
 var logLevel = 0
+var logCallback func(ts int64, msg string)
 
 func RecordLocalhostError(r bool) {
 	ignoreLocalhost = !r
@@ -33,6 +35,14 @@ func SetLevel(lv string) {
 	}
 }
 
+func SetCallback(f func(ts int64, msg string)) {
+	logCallback = f
+}
+
+func TreatFatalAsError(flag bool) {
+	fatalAsError = flag
+}
+
 func timestamp() string {
 	t := time.Now()
 	mil := t.UnixNano() % 1e9
@@ -73,13 +83,14 @@ func tryShortenWSAError(err interface{}) (ret string) {
 type msg_t struct {
 	dst     string
 	lead    string
+	ts      int64
 	message string
 }
 
 var msgQueue = make(chan msg_t)
 
 func print(l string, params ...interface{}) {
-	m := msg_t{lead: lead(l)}
+	m := msg_t{lead: lead(l), ts: time.Now().UnixNano()}
 
 	for _, p := range params {
 		switch p.(type) {
@@ -137,11 +148,20 @@ func Start() {
 						}
 
 						if count > 0 {
-							fmt.Printf(strings.Repeat(" ", len(m.lead))+"... %d similar message(s)\n", count)
+							str := fmt.Sprintf(strings.Repeat(" ", len(m.lead))+"... %d similar message(s)", count)
+							if logCallback != nil {
+								logCallback(m.ts, str)
+							} else {
+								fmt.Println(str)
+							}
 						}
 					}
 
-					fmt.Println(m.lead + m.message)
+					if logCallback != nil {
+						logCallback(m.ts, m.lead+m.message)
+					} else {
+						fmt.Println(m.lead + m.message)
+					}
 					lastMsg, lastTime, count = &m, time.Now(), 0
 				default:
 					// nothing in queue to print, quit loop
@@ -180,5 +200,8 @@ func E(params ...interface{}) {
 
 func F(params ...interface{}) {
 	print("X", params...)
-	os.Exit(1)
+
+	if !fatalAsError {
+		os.Exit(1)
+	}
 }

pkg/lookup/lookup.go

@@ -47,15 +47,19 @@ func init() {
 	fill(&IPv4PrivateLookupTable, PRIVATE_IP)
 }
 
-func LoadOrCreateChinaList() bool {
-	buf, err := ioutil.ReadFile("./chinalist.txt")
-	if err != nil {
-		return false
+func LoadOrCreateChinaList(raw string) bool {
+	if raw == "" {
+		buf, err := ioutil.ReadFile("./chinalist.txt")
+		if err != nil {
+			return false
+		}
+
+		raw = string(buf)
 	}
 
 	ChinaList = make(China_list_t)
 
-	for _, domain := range strings.Split(string(buf), "\n") {
+	for _, domain := range strings.Split(raw, "\n") {
 		subs := strings.Split(strings.Trim(domain, "\r "), ".")
 		if len(subs) == 0 || len(domain) == 0 || domain[0] == '#' {
 			continue

proxy/client.go

@@ -443,6 +443,7 @@ func NewClient(localaddr string, config *ClientConfig) *ProxyClient {
 	upstreamUrl, err := url.Parse("http://" + config.Upstream)
 	if err != nil {
 		logg.F(err)
+		return nil
 	}
 
 	word := genWord(config.GCipher)
@@ -477,6 +478,7 @@ func NewClient(localaddr string, config *ClientConfig) *ProxyClient {
 
 	if err != nil {
 		logg.F(err)
+		return nil
 	}
 
 	proxy.Listener = &listenerWrapper{Listener: mux, proxy: proxy, obpool: NewOneBytePool(1024)}

proxy/multiplexer.go

@@ -6,6 +6,7 @@ import (
 	"errors"
 	"io"
 	"net"
+	"strings"
 	"time"
 )
 
@@ -118,6 +119,11 @@ CONTINUE:
 	c, err := l.Listener.Accept()
 	if err != nil || c == nil {
 		logg.E("listener: ", err)
+
+		if strings.Contains(err.Error(), "use of closed network connection") {
+			return nil, err
+		}
+
 		goto CONTINUE
 	}