From 843a3269cf1ab0b6a3a961fa113c9045fcbb28be Mon Sep 17 00:00:00 2001
From: ctrlcvs <1509167646@qq.com>
Date: Fri, 29 Jul 2022 19:12:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3V3=E7=89=88=E6=9C=AC=E5=85=BC?=
 =?UTF-8?q?=E5=AE=B9=E5=AF=BC=E8=87=B4=E6=97=A0=E6=B3=95=E7=AD=BE=E5=88=B0?=
 =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/sign.js            |  9 +++++++--
 model/gsCfg.js          |  3 ++-
 model/mys/mihoyo-api.js | 32 +++++++++++++++++++++-----------
 3 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/apps/sign.js b/apps/sign.js
index dca9d95..2aad6f6 100644
--- a/apps/sign.js
+++ b/apps/sign.js
@@ -166,9 +166,10 @@ async function getDataList(name){
 async function cookie(e) {
 	let cookie, uid;
 	let miHoYoApi = new MihoYoApi(e);
+	let skuid;
 	if (isV3) {
 		// console.log(e)
-		let skuid = await gsCfg.getBingCookie(e.user_id);
+		skuid= await gsCfg.getBingCookie(e.user_id);
 		cookie = skuid.ck;
 		uid = skuid.item;
 	} else {
@@ -180,8 +181,12 @@ async function cookie(e) {
 			uid = BotConfig.dailyNote[e.user_id].uid;
 		}
 	}
+	if(!cookie){
+		e.reply("cookie失效请重新绑定~")
+		return false;
+	}
 	e.uid = uid;
-	if (!cookie.includes("login_ticket")) {
+	if (!cookie.includes("login_ticket")&&(isV3&&!skuid?.login_ticket)) {
 		e.reply("米游社登录cookie不完整，请前往米游社通行证处重新获取cookie~\ncookies必须包含login_ticket")
 		return false;
 	}
diff --git a/model/gsCfg.js b/model/gsCfg.js
index cd6fe17..d94eb8f 100644
--- a/model/gsCfg.js
+++ b/model/gsCfg.js
@@ -145,8 +145,9 @@ class GsCfg {
 			let ck = fs.readFileSync(file, 'utf-8')
 			ck = YAML.parse(ck)
 			for(let item in ck){
+				let login_ticket=ck[item]?.login_ticket
 				ck=ck[item].ck
-				return {ck,item};
+				return {ck,item,login_ticket};
 			}
 		} catch (error) {
 			return {}
diff --git a/model/mys/mihoyo-api.js b/model/mys/mihoyo-api.js
index d4d99b3..bd88d64 100644
--- a/model/mys/mihoyo-api.js
+++ b/model/mys/mihoyo-api.js
@@ -4,7 +4,13 @@ import _ from 'lodash';
 import superagent from 'superagent';
 import fs from "fs";
 import YAML from 'yaml'
-import {Data} from "../../components/index.js";
+import {
+	Data
+} from "../../components/index.js";
+import gsCfg from '../gsCfg.js'
+import {
+	isV3
+} from '../../components/Changelog.js';
 import fetch from "node-fetch"
 const APP_VERSION = "2.2.0";
 const DEVICE_ID = utils.randomString(32).toUpperCase();
@@ -67,13 +73,16 @@ export default class MihoYoApi {
 		return resObj;
 	}
 	async stoken(cookie, e) {
-		this.e=e;
-		if(Object.keys(this.getStoken(e.user_id)).length != 0){
+		this.e = e;
+		if (Object.keys(this.getStoken(e.user_id)).length != 0) {
 			return true;
 		}
 		const map = this.getCookieMap(cookie);
-		const loginTicket = map.get("login_ticket");
-		const loginUid = map.get("login_uid");
+		let loginTicket = map.get("login_ticket");
+		const loginUid = map.get("login_uid") ? map.get("login_uid") : map.get("ltuid");
+		if(isV3){
+			loginTicket=gsCfg.getBingCookie(e.user_id).login_ticket
+		}
 		const url = "https://api-takumi.mihoyo.com/auth/api/getMultiTokenByLoginTicket?login_ticket=" +
 			loginTicket + "&token_types=3&uid=" + loginUid;
 		fetch(url, {
@@ -96,7 +105,7 @@ export default class MihoYoApi {
 				}
 				response.json().then(function(data) {
 					// console.log(data);
-					if(!data.data){
+					if (!data.data) {
 						return false;
 					}
 					let datalist = {
@@ -118,11 +127,11 @@ export default class MihoYoApi {
 	_getHeader() {
 		const randomStr = utils.randomString(6);
 		const timestamp = Math.floor(Date.now() / 1000)
-		let data=this.getStoken(this.e.user_id);
+		let data = this.getStoken(this.e.user_id);
 		// console.log(data)
 		// iOS sign
 		let sign = md5(`salt=b253c83ab2609b1b600eddfe974df47b&t=${timestamp}&r=${randomStr}`);
-		let cookie =`stuid=${data.stuid};stoken=${data.stoken};ltoken=${data.ltoken};`;
+		let cookie = `stuid=${data.stuid};stoken=${data.stoken};ltoken=${data.ltoken};`;
 		return {
 			'Cookie': cookie,
 			'Content-Type': 'application/json',
@@ -140,11 +149,12 @@ export default class MihoYoApi {
 	}
 	getCookieMap(cookie) {
 		let cookiePattern = /^(\S+)=(\S+)$/;
-		let cookieArray = cookie.split("; ");
+		let cookieArray = cookie.replace(/\s*/g,"").split(";");
 		let cookieMap = new Map();
 		for (let item of cookieArray) {
-			let entry = cookiePattern.exec(item);
-			cookieMap.set(entry[1], entry[2]);
+			let entry = item.split("=");
+			if(!entry[0]) continue;
+			cookieMap.set(entry[0], entry[1]);
 		}
 		return cookieMap;
 	}