olivetv: fix kuaishou

Author: luxcgo

foundation/olivetv/kuaishou.go

@@ -2,13 +2,13 @@ package olivetv
 
 import (
 	"errors"
+	"fmt"
 	"regexp"
 	"sort"
 	"time"
 
 	"github.com/imroc/req/v3"
 	jsoniter "github.com/json-iterator/go"
-	"github.com/tidwall/gjson"
 )
 
 func init() {
@@ -47,26 +47,41 @@ func (this *kuaishou) set(tv *TV) error {
 		return err
 	}
 
+	content := resp.String()
+
 	re := regexp.MustCompile(`<script>window.__INITIAL_STATE__=([\s\S]*?);\(function`)
-	caps := re.FindStringSubmatch(resp.String())
+	caps := re.FindStringSubmatch(content)
 	if len(caps) < 2 {
-		return nil
+		return errors.New("kuaishou: content=%s" + content)
 	}
 
 	text := caps[1]
 
-	tv.roomName = gjson.Get(text, "liveroom.liveStream.caption").String()
-	tv.streamerName = gjson.Get(text, "liveroom.author.name").String()
+	// f, _ := os.Create("b.json")
+	// f.WriteString(text)
+	// f.Close()
+
+	var ag KuaishouAutoGenerated
+	err = jsoniter.UnmarshalFromString(text, &ag)
+	if err != nil {
+		return fmt.Errorf("kuaishou: text=%s\nerr=%s", text, err.Error())
+	}
+
+	if len(ag.Liveroom.PlayList) == 0 {
+		return errors.New("kuaishou: empty PlayList")
+	}
+
+	data := ag.Liveroom.PlayList[0]
 
-	tv.roomOn = gjson.Get(text, "liveroom.isLiving").Bool()
-	// fmt.Println("tv.roomOn", tv.roomOn)
+	tv.roomName = data.LiveStream.Caption
+	tv.streamerName = data.Author.Name
+
+	tv.roomOn = data.IsLiving
 	if !tv.roomOn {
 		return nil
 	}
 
-	var ag KuaishouAutoGenerated
-	jsoniter.UnmarshalFromString(text, &ag)
-	playUrls := ag.Liveroom.LiveStream.PlayUrls
+	playUrls := data.LiveStream.PlayUrls
 	if len(playUrls) == 0 {
 		return errors.New("kuaishou: empty playUrls")
 	}
@@ -78,21 +93,27 @@ func (this *kuaishou) set(tv *TV) error {
 		return cands[i].Bitrate > cands[j].Bitrate
 	})
 	tv.streamURL = cands[0].URL
-
 	return nil
 }
 
 type KuaishouAutoGenerated struct {
 	Liveroom struct {
-		LiveStream struct {
-			PlayUrls []struct {
-				AdaptationSet struct {
-					Representation []struct {
-						URL     string `json:"url"`
-						Bitrate int    `json:"bitrate"`
-					} `json:"representation"`
-				} `json:"adaptationSet"`
-			} `json:"playUrls"`
-		} `json:"liveStream"`
+		PlayList []struct {
+			LiveStream struct {
+				Caption  string `json:"caption"`
+				PlayUrls []struct {
+					AdaptationSet struct {
+						Representation []struct {
+							URL     string `json:"url"`
+							Bitrate int    `json:"bitrate"`
+						} `json:"representation"`
+					} `json:"adaptationSet"`
+				} `json:"playUrls"`
+			} `json:"liveStream"`
+			Author struct {
+				Name string `json:"name"`
+			} `json:"author"`
+			IsLiving bool `json:"isLiving"`
+		} `json:"playList"`
 	} `json:"liveroom"`
 }