Update readme, remove myDialer, add default error response.

Author: cxjava

README.md

@@ -2,27 +2,28 @@
 
 一个自动切换12306 CDN的代理，只需设置浏览器的代理为此软件监听端口，每次查询请求都会更换CDN，达到快速刷票的目的。
 
-思路来自[分享12306秒票杀手锏源码](http://www.cnblogs.com/guozili/p/3512490.html)
-
-# 推荐使用此方法 [Fiddler设置教程](https://github.com/cxjava/AutoChange12306CDN/wiki/Fiddler%E8%AE%BE%E7%BD%AE%E6%95%99%E7%A8%8B)
-
 # 使用方法
 
-* 查找自己当前环境最快的CDN地址，运行findIP/findIP.exe，相同目录下面会生成12306_ip.txt，IP是Ping速度由快到慢进行排列，只需选取前30个IP写入到config.ini里面的cdn= []
-* 添加自己需要查票的起点站和终点站到config.ini，请仔细阅读config.ini里面的相关项配置，如果不清楚，不要随意修改配置
-* 打开本软件，设置谷歌浏览器的代理地址为本软件监听地址：127.0.0.1:8080，修改代理的软件有[Proxy SwitchySharp](https://chrome.google.com/webstore/detail/dpplabbmogkhghncfbfdeeokoefdjegm) 安装教程请参考 [谷歌 Chrome 配合 SwitchySharp 扩展](https://github.com/goagent/goagent/blob/wiki/InstallGuide.md#%E6%B5%8F%E8%A7%88%E5%99%A8%E8%AE%BE%E7%BD%AE%E6%96%B9%E6%B3%95)
-* 如果使用谷歌浏览器订票，请在订票页面，按F12，选择下面的console栏，在光标位置输入：window.autoSearchTime = 2000; 再按回车。此操作为了设置每次查询间隔为2秒，官网默认为5秒，自己可以设置其他值。
-* 如果使用[12306订票助手.NET版](http://www.fishlee.net/soft/12306/#C-308)订票，请设置其中的代理地址为本软件的监听地址:127.0.0.1:8080
-* 谷歌浏览器如果通过本软件访问： https://kyfw.12306.cn/otn/leftTicket/init ，会出现证书错误问题，消息如下：
+* 软件启动后会查找当前环境最快的`12306 CDN`地址，`iprange.conf`是所有的12306的CDN地址。 
+* 打开本软件，设置谷歌浏览器的代理地址为本软件监听地址：`127.0.0.1:8888`，修改代理的软件有[Proxy SwitchySharp](https://chrome.google.com/webstore/detail/proxy-switchyomega/padekgcemlokbadohgkifijomclgjgif) 安装配置教程请参考 [Chrome SwitchySharp配置](https://www.switchyomega.com/settings/)
+* 如果使用谷歌浏览器订票，请在订票页面，按`F12`，选择下面的`console`栏，在光标位置输入：`window.autoSearchTime = 1000`; 再按回车。此操作为了设置每次查询间隔为`1`秒，官网默认为`5`秒，自己可以设置其他值,但是最好不要小于`1`秒（即`1000`），设置太小容易被封IP。
+* 谷歌浏览器如果通过本软件访问： [https://kyfw.12306.cn/otn/leftTicket/init?linktypeid=dc](https://kyfw.12306.cn/otn/leftTicket/init?linktypeid=dc) ，会出现证书错误问题，消息如下：
 
 > #### 您的连接不是私密连接
 > 
 > #### 攻击者可能会试图从kyfw.12306.cn窃取您的信息（例如：密码、通讯内容或信用卡信息）。
 > 
 > #### 高级
-点击 高级 ，再次点击 "继续kyfw.12306.cn（不安全）" 
+点击 *高级* ，再次点击 "继续kyfw.12306.cn（不安全）" 
 
 # 打包好的下载地址
+
+链接：[AutoChange12306CDN](https://github.com/cxjava/AutoChange12306CDN/releases)
+
+## 备用方法(设置稍微复杂一丢丢)[Fiddler抢票设置教程](https://github.com/cxjava/AutoChange12306CDN/wiki/Fiddler%E8%AE%BE%E7%BD%AE%E6%95%99%E7%A8%8B)
+
 链接：[Fiddler抢票需要的软件](https://github.com/cxjava/AutoChange12306CDN/releases/tag/v1.0.1)
 
-#### 最后希望大家都能早日买到火车票票回家团圆
+# 最后希望大家都能早日买到火车票票回家团圆
+
+思路来自[分享12306秒票杀手锏源码](http://www.cnblogs.com/guozili/p/3512490.html)

main.go

@@ -10,10 +10,12 @@ import (
 )
 
 var (
-	logger  *log.Logger
-	cdnChan = make(chan string, 10)
-	addr    = flag.String("a", ":8888", "The proxy listen address")
-	size    = flag.Int("s", 20, "The fastest number of IP")
+	logger   *log.Logger
+	cdnChan  = make(chan string, 10)
+	fastest  = ""
+	addr     = flag.String("a", ":8888", "The proxy listen address")
+	queryURL = flag.String("q", "/otn/leftTicket/query", "The prefix of 12306 query URL")
+	size     = flag.Int("s", 20, "The fastest number of IP")
 )
 
 func init() {
@@ -25,6 +27,7 @@ func addCDN() {
 	fastestCDN := make(map[string]string, *size)
 
 	ips := gscan.ScanIP("./iprange.conf", gscanConf)
+	fastest = ips[0] + ":443"
 	t := 0
 	for _, v := range ips {
 		if t >= *size {
@@ -34,7 +37,7 @@ func addCDN() {
 		fastestCDN[v] = v + ":443"
 		fmt.Println(v)
 	}
-	logger.Println("CDN query is done!")
+	logger.Println("CDN query is done! fastest one is:" + fastest)
 	logger.Println("Server is listening at ", *addr)
 
 	go func() {

mitmserver.go

@@ -14,6 +14,14 @@ import (
 	"time"
 )
 
+var (
+	errorResp = "HTTP/1.0 200 OK\r\n" +
+		"Connection: close\r\n" +
+		"Content-Type: application/json;charset=UTF-8\r\n" +
+		"\r\n" +
+		`{"data":{"flag":"1","map":{"CUW":"重庆北","HKN":"汉口","WCN":"武昌"},"result":["|预订|2400000Z490F|Z49|BXP|CDW|HKN|CUW|22:20|05:32|07:12|N|g%2Bd3SnPhBrp6gzy5Eq4zATL6rGgQn4nznpuJl5niuOcsnDutccVaBIqfJp4%3D|20190101|3|P4|05|08|0|0||||无|||无||无|无|||||10401030|1413|0|0"]},"httpstatus":200,"messages":"","status":true}`
+)
+
 const (
 	Version   = "1.1"
 	ONE_DAY   = 24 * time.Hour
@@ -59,15 +67,6 @@ func (handler *HandlerWrapper) ServeHTTP(resp http.ResponseWriter, req *http.Req
 	}
 }
 
-type myDialer struct {
-	d           *net.Dialer
-	ConnectDial func(network string, addr string) (net.Conn, error)
-}
-
-func (d *myDialer) Dial(network, address string) (net.Conn, error) {
-	return d.ConnectDial(network, address)
-}
-
 // DumpHTTPAndHTTPS function to dump the HTTP request header and body
 func (handler *HandlerWrapper) DumpHTTPAndHTTPS(resp http.ResponseWriter, req *http.Request) {
 	req.Header.Del("Proxy-Connection")
@@ -105,23 +104,35 @@ func (handler *HandlerWrapper) DumpHTTPAndHTTPS(resp http.ResponseWriter, req *h
 		if !matched {
 			host += ":443"
 		}
-		if host == "kyfw.12306.cn:443" && strings.HasPrefix(req.RequestURI, "/otn/leftTicket/query") {
-			host = <-cdnChan
-			logger.Println("current CDN is:", host)
+		if host == "kyfw.12306.cn:443" {
+			host = fastest
+			if strings.HasPrefix(req.RequestURI, *queryURL) {
+				host = <-cdnChan
+				logger.Println("current CDN is:", host)
+				connOut, err = tls.DialWithDialer(&net.Dialer{
+					Timeout:   1 * time.Second,
+					KeepAlive: 0,
+				}, "tcp", host, handler.tlsConfig.ServerTLSConfig)
+				if err != nil {
+					logger.Println("Dial to", host, "error:", err)
+					connHj.Write([]byte(errorResp))
+					return
+				}
+			} else {
+				connOut, err = tls.Dial("tcp", host, handler.tlsConfig.ServerTLSConfig)
+				if err != nil {
+					logger.Println("Dial to", host, "error:", err)
+					return
+				}
+			}
+		} else {
+			connOut, err = tls.Dial("tcp", host, handler.tlsConfig.ServerTLSConfig)
+			if err != nil {
+				logger.Println("Dial to", host, "error:", err)
+				return
+			}
 		}
 
-		connOut, err = tls.DialWithDialer(&net.Dialer{
-			Timeout:   1 * time.Second,
-			KeepAlive: 0,
-		}, "tcp", host, handler.tlsConfig.ServerTLSConfig)
-		if err != nil {
-			logger.Println("Dial to", host, "error:", err)
-			connHj.Write([]byte("HTTP/1.0 200 OK\r\n" +
-				"Connection: close\r\n" +
-				"\r\n" +
-				"Body here\n"))
-			return
-		}
 	}
 
 	// Write writes an HTTP/1.1 request, which is the header and body, in wire format. This method consults the following fields of the request:
@@ -136,22 +147,26 @@ func (handler *HandlerWrapper) DumpHTTPAndHTTPS(resp http.ResponseWriter, req *h
 	*/
 	if err = req.Write(connOut); err != nil {
 		logger.Println("send to server error", err)
+		connHj.Write([]byte(errorResp))
 		return
 	}
 
 	respFromRemote, err := http.ReadResponse(bufio.NewReader(connOut), req)
 	if err != nil && err != io.EOF {
 		logger.Println("Fail to read response from remote server.", err)
+		connHj.Write([]byte(errorResp))
 	}
 
 	respDump, err := httputil.DumpResponse(respFromRemote, true)
 	if err != nil {
 		logger.Println("Fail to dump the response.", err)
+		connHj.Write([]byte(errorResp))
 	}
 	// Send remote response back to client
 	_, err = connHj.Write(respDump)
 	if err != nil {
 		logger.Println("Fail to send response back to client.", err)
+		connHj.Write([]byte(errorResp))
 	}
 
 	<-ch