refa: use ticker for fetchCaptcha()

cmd/gocq/login.go

@@ -221,29 +221,39 @@ func loginResponseProcessor(res *client.LoginResponse) error {
 func getTicket(u string) (str string) {
 	id := utils.RandomString(8)
 	log.Warnf("请前往该地址验证 -> %v <- 或输入手动抓取的 ticket：（Enter 提交）", strings.ReplaceAll(u, "https://ssl.captcha.qq.com/template/wireless_mqq_captcha.html?", fmt.Sprintf("https://captcha.go-cqhttp.org/captcha?id=%v&", id)))
-	r := make(chan string)
-	select {
-	case r <- readLine():
-	case r <- sliderCaptchaProcessor(id):
-	}
-	str = <-r
-	return
-}
-
-func sliderCaptchaProcessor(id string) string {
-	start := time.Now()
-	for time.Since(start).Minutes() < 2 {
-		time.Sleep(time.Second)
-		data, err := global.GetBytes("https://captcha.go-cqhttp.org/captcha/ticket?id=" + id)
-		if err != nil {
-			log.Warnf("获取 Ticket 时出现错误: %v", err)
-			return ""
-		}
-		g := gjson.ParseBytes(data)
-		if g.Get("ticket").Exists() {
-			return g.Get("ticket").String()
+	manual := make(chan string)
+	go func() {
+		str = readLine()
+		manual <- str
+	}()
+	ticker := time.NewTicker(time.Second)
+	for count := 120; count > 0; count-- {
+		select {
+		case <-ticker.C:
+			str = fetchCaptcha(id)
+			if str != "" {
+				ticker.Stop()
+				return
+			}
+		case <-manual:
+			ticker.Stop()
+			return
 		}
 	}
+	ticker.Stop()
 	log.Warnf("验证超时")
 	return ""
 }
+
+func fetchCaptcha(id string) string {
+	data, err := global.GetBytes("https://captcha.go-cqhttp.org/captcha/ticket?id=" + id)
+	if err != nil {
+		log.Warnf("获取 Ticket 时出现错误: %v", err)
+		return ""
+	}
+	g := gjson.ParseBytes(data)
+	if g.Get("ticket").Exists() {
+		return g.Get("ticket").String()
+	}
+	return ""
+}