fix kuwo;

optimized the rules;

Author: cnsilvan

README.md

@@ -65,6 +65,7 @@ sudo ./UnblockNeteaseMusic
 4. 开启多个源会自动选择最优匹配歌曲，并发的支持使得同时多个源获取并不会增加多少耗时，如果发现一直获取很慢，使用排除法来检查是否某一个源无法使用
 6. 0.2.3版本后默认音质将根据客户端选择的音质，启动参数加上`-b`可以设置强制音质优先
 7. 0.2.5版本后支持直接在搜索页面显示其他平台搜索结果，如遇错误，请关闭该功能(参数为 `-sl 0`)
+
 ### IOS信任证书步骤
 
 1. 安装证书--设置-描述文件-安装
@@ -79,6 +80,7 @@ sudo ./UnblockNeteaseMusic
 5. 咪咕源貌似部分宽带无法使用
 6. 最新版app采用第三方登录会失败，失败的同学选择手机号登录吧
 7. Android7.0后默认不信任用户证书，解决办法自行谷歌
+8. 咪咕已无法使用，需要登录，没空写了。且用且珍惜。
 
 # 感谢
 

app.go

@@ -19,7 +19,6 @@ import (
 )
 
 func main() {
-
 	//log.Println("--------------------Version--------------------")
 	//fmt.Println(version.AppVersion())
 	defer func() {
@@ -60,7 +59,7 @@ func main() {
 				restoreHosts()
 				exit <- true
 			}()
-			signal.Notify(signalChan, syscall.SIGHUP, syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGSEGV)
+			signal.Notify(signalChan, syscall.SIGHUP, syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGSEGV, syscall.SIGKILL)
 			proxy.InitProxy()
 			provider.Init()
 			<-exit

build.sh

@@ -1,4 +1,4 @@
-CurrentVersion=0.2.9
+CurrentVersion=0.2.10
 Project=github.com/cnsilvan/UnblockNeteaseMusic
 Path="$Project/version"
 ExecName="UnblockNeteaseMusic"

network/network.go

@@ -3,6 +3,7 @@ package network
 import (
 	"bytes"
 	"crypto/tls"
+	"github.com/cnsilvan/UnblockNeteaseMusic/common"
 	"io"
 	"io/ioutil"
 	"log"
@@ -11,12 +12,12 @@ import (
 	"strings"
 	"time"
 
-	"github.com/cnsilvan/UnblockNeteaseMusic/common"
 	"github.com/cnsilvan/UnblockNeteaseMusic/utils"
 )
 
 var (
-	httpClient *http.Client
+	httpClient   *http.Client
+	directClient *http.Client
 )
 
 func init() {
@@ -34,9 +35,14 @@ func init() {
 		ResponseHeaderTimeout: 5 * time.Second,
 		MaxConnsPerHost:       100,
 	}
+	directClient = &http.Client{
+		Transport: tr.Clone(),
+	}
+	tr.TLSClientConfig = &tls.Config{InsecureSkipVerify: true}
 	httpClient = &http.Client{
 		Transport: tr,
 	}
+
 }
 
 type ClientRequest struct {
@@ -84,18 +90,6 @@ func Request(clientRequest *ClientRequest) (*http.Response, error) {
 			request.URL.Scheme = "http"
 		}
 	}
-	tr := httpClient.Transport.(*http.Transport)
-	tr.TLSClientConfig = nil
-	// if request.URL.Scheme == "https" || request.TLS != nil {
-	// fix redirect to https://music.163.com
-	if _, ok := common.HostDomain[request.Host]; ok {
-		tr.TLSClientConfig = &tls.Config{}
-		// verify music.163.com certificate
-		tr.TLSClientConfig.ServerName = request.Host //it doesn't contain any IP SANs
-		// redirect to music.163.com will need verify self
-		tr.TLSClientConfig.InsecureSkipVerify = true
-	}
-	// }
 
 	if proxy { //keep headers&cookies for Direct
 		if header != nil {
@@ -137,7 +131,12 @@ func Request(clientRequest *ClientRequest) (*http.Response, error) {
 	request.Header.Set("accept-encoding", acceptEncoding)
 	request.Header.Set("accept-language", acceptLanguage)
 	request.Header.Set("user-agent", userAgent)
-	resp, err = httpClient.Do(request)
+	client := directClient
+	if _, ok := common.HostDomain[request.Host]; ok {
+		client = httpClient
+	}
+	// }
+	resp, err = client.Do(request)
 	if err != nil {
 		//log.Println(request.Method, request.URL.String(), host)
 		log.Printf("http.Client.Do fail:%v\n", err)

processor/processor.go

@@ -100,7 +100,6 @@ func RequestBefore(request *http.Request) *Netease {
 			decryptECBBytes, _ := crypto.AesDecryptECB(requestBodyH[:length], []byte(linuxApiKey))
 			var result common.MapType
 			result = utils.ParseJson(decryptECBBytes)
-			//log.Println(utils.ToJson(result))
 			urlM, ok := result["url"].(string)
 			if ok {
 				netease.Path = urlM
@@ -109,9 +108,6 @@ func RequestBefore(request *http.Request) *Netease {
 			if ok {
 				netease.Params = params
 			}
-
-			//log.Println("forward")
-			//log.Printf("path:%s \nparams:%s\n", netease.Path, netease.Params)
 		} else if len(requestBody) > 7 {
 			requestBodyH := make([]byte, len(requestBody))
 			length, _ := hex.Decode(requestBodyH, requestBody[7:len(requestBody)-len(pad)])
@@ -120,9 +116,7 @@ func RequestBefore(request *http.Request) *Netease {
 			data := strings.Split(decryptString, "-36cd479b6b5-")
 			netease.Path = data[0]
 			netease.Params = utils.ParseJson(bytes.NewBufferString(data[1]).Bytes())
-			// log.Println(utils.ToJson(netease))
-			//log.Printf("path:%s \nparams:%s\n", netease.Path, netease.Params)
-		}
+			}
 		netease.Path = strings.ReplaceAll(netease.Path, "https://music.163.com", "")
 		netease.Path = strings.ReplaceAll(netease.Path, "http://music.163.com", "")
 		netease.Path = utils.ReplaceAll(netease.Path, `\/\d*$`, "")
@@ -154,7 +148,6 @@ func RequestAfter(request *http.Request, response *http.Response, netease *Netea
 	pass := false
 	if _, ok := Path[netease.Path]; ok {
 		pass = true
-		//log.Println(utils.ToJson(netease))
 	}
 	if pass && response.StatusCode == 200 {
 
@@ -172,7 +165,6 @@ func RequestAfter(request *http.Request, response *http.Response, netease *Netea
 			if enableGzip {
 				decryptECBBytes, _ = utils.UnGzip(decryptECBBytes)
 			}
-			//log.Println(string(decryptECBBytes), netease)
 			aeskey := eApiKey
 			if netease.Forward {
 				aeskey = linuxApiKey
@@ -182,16 +174,12 @@ func RequestAfter(request *http.Request, response *http.Response, netease *Netea
 			result := utils.ParseJson(decryptECBBytes)
 			netease.JsonBody = result
 
-			//if strings.Contains(netease.Path,"batch"){
-			// log.Println(utils.ToJson(netease))
-			//}
 			modified := false
 			codeN, ok := netease.JsonBody["code"].(json.Number)
 			code := "200"
 			if ok {
 				code = codeN.String()
 			}
-			//log.Println(utils.ToJson(netease))
 			if !netease.Web && (code == "401" || code == "512") && strings.Contains(netease.Path, "manipulate") {
 				modified = tryCollect(netease, request)
 			} else if !netease.Web && (code == "401" || code == "512") && strings.EqualFold(netease.Path, "/api/song/like") {

provider/base/base.go

@@ -0,0 +1,74 @@
+package base
+
+import (
+	"errors"
+	"github.com/cnsilvan/UnblockNeteaseMusic/common"
+	"github.com/cnsilvan/UnblockNeteaseMusic/network"
+	"github.com/cnsilvan/UnblockNeteaseMusic/utils"
+	"net/http"
+	"sort"
+	"strconv"
+	"strings"
+)
+
+func PreSearchSong(song common.SearchSong) common.SearchSong {
+	song.Keyword = strings.ToUpper(song.Keyword)
+	song.Name = strings.ToUpper(song.Name)
+	song.ArtistsName = strings.ToUpper(song.ArtistsName)
+	return song
+}
+func Fetch(url string, cookies []*http.Cookie, header http.Header, proxy bool) (result map[string]interface{}, err error) {
+	clientRequest := network.ClientRequest{
+		Method:    http.MethodGet,
+		RemoteUrl: url,
+		Cookies:   cookies,
+		Header:    header,
+		Proxy:     proxy,
+	}
+	resp, err := network.Request(&clientRequest)
+	if err != nil {
+		return nil, err
+	}
+	if resp.StatusCode != http.StatusOK {
+		err = errors.New("StatusCode :" + strconv.Itoa(resp.StatusCode))
+		return nil, err
+	}
+	defer resp.Body.Close()
+	body, err := network.StealResponseBody(resp)
+	if err != nil {
+		return nil, err
+	}
+	result = utils.ParseJsonV2(body)
+	return result, nil
+}
+func CalScore(song common.SearchSong, songName string, singerName string, index int, maxIndex int) (float32, bool) {
+	if song.OrderBy == common.MatchedScoreDesc {
+		if strings.Contains(songName, "伴奏") && !strings.Contains(song.Keyword, "伴奏") {
+			return 0, false
+		}
+		var songNameSores float32 = 0.0
+		if len(songName) > 0 {
+			songNameSores = utils.CalMatchScoresV2(song.Name, songName, "songName")
+		}
+		var artistsNameSores float32 = 0.0
+		if len(singerName) > 0 {
+			singerName = strings.ReplaceAll(singerName, "&", "、")
+			singerName = strings.ReplaceAll(singerName, "·", "、")
+			artistsNameSores = utils.CalMatchScoresV2(song.ArtistsName, singerName, "singerName")
+		}
+		songMatchScore := songNameSores*0.55 + artistsNameSores*0.35 + 0.1*float32(maxIndex-index)/float32(maxIndex)
+		return songMatchScore, true
+	} else if song.OrderBy == common.PlatformDefault {
+
+	}
+	return 0, true
+}
+func AfterSearchSong(song common.SearchSong, songs []*common.Song) []*common.Song {
+	if song.OrderBy == common.MatchedScoreDesc && len(songs) > 1 {
+		sort.Sort(common.SongSlice(songs))
+	}
+	if song.Limit > 0 && len(songs) > song.Limit {
+		songs = songs[:song.Limit]
+	}
+	return songs
+}