From 3cd2586ed497e62c9d082f1e28677957da5f027a Mon Sep 17 00:00:00 2001
From: BTMuli <BT-Muli@outlook.com>
Date: Sat, 30 Sep 2023 21:03:53 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20=E4=BC=98=E5=8C=96=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .eslintrc.yml                       |  1 +
 src/components/func/geetest.ts      |  6 +--
 src/components/func/geetest.vue     | 73 +++++++++++++----------------
 src/pages/common/Test.vue           |  3 +-
 src/types/BBS/Geetest.d.ts          | 13 ++---
 src/web/request/operVerification.ts | 22 +++++----
 src/web/utils/getRequestHeader.ts   | 11 ++---
 7 files changed, 60 insertions(+), 69 deletions(-)

diff --git a/.eslintrc.yml b/.eslintrc.yml
index 637dfb13..2d3d3c19 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -36,5 +36,6 @@ rules:
       leadingUnderscore: "allow"
       trailingUnderscore: "allow"
   "@typescript-eslint/no-non-null-assertion": warn
+  "@typescript-eslint/no-misused-promises": warn
   # Vue
   "vue/multi-word-component-names": off
diff --git a/src/components/func/geetest.ts b/src/components/func/geetest.ts
index 22a778ef..cff1f0ad 100644
--- a/src/components/func/geetest.ts
+++ b/src/components/func/geetest.ts
@@ -5,7 +5,7 @@
  */
 
 import { h, render, type VNode } from "vue";
-import geetest from "./geetest.vue";
+import geetest, { type GeetestParam } from "./geetest.vue";
 
 const geetestId = "tg-func-geetest";
 
@@ -20,13 +20,13 @@ const renderBox = (): VNode => {
 
 let geetestInstance: VNode;
 
-const showGeetest = async (): Promise<string | boolean> => {
+const showGeetest = async (props: GeetestParam): Promise<string | boolean> => {
   if (geetestInstance) {
     const boxVue = geetestInstance.component;
     return boxVue?.exposeProxy?.displayBox();
   } else {
     geetestInstance = renderBox();
-    return await showGeetest();
+    return await showGeetest(props);
   }
 };
 
diff --git a/src/components/func/geetest.vue b/src/components/func/geetest.vue
index cb1d08ca..2e74b899 100644
--- a/src/components/func/geetest.vue
+++ b/src/components/func/geetest.vue
@@ -1,6 +1,6 @@
 <template>
   <transition name="func-geetest-outer">
-    <div v-show="show || showOuter" class="geetest-overlay" @click.self.prevent="handleOuter">
+    <div v-show="show || showOuter" class="geetest-overlay" @click.self.prevent>
       <transition name="func-geetest-inner">
         <div v-show="showInner" class="geetest-box">
           <div class="geetest-top">
@@ -26,7 +26,11 @@ const showInner = ref<boolean>(false);
 
 const userStore = useUserStore();
 
-const geetestRef = ref<HTMLElement | null>(null);
+export interface GeetestParam {
+  urlOri: string;
+}
+
+const geetestRef = ref<HTMLElement>(<HTMLElement>document.getElementById("geetest"));
 
 watch(show, () => {
   if (show.value) {
@@ -44,7 +48,7 @@ watch(show, () => {
   }
 });
 
-async function displayBox(): Promise<void> {
+async function displayBox(urlOri: string): Promise<boolean> {
   const cookie = userStore.getCookieGroup3();
   const res = await TGRequest.User.verification.get(cookie.ltoken, cookie.ltuid);
   if ("retcode" in res) {
@@ -52,48 +56,35 @@ async function displayBox(): Promise<void> {
       text: `[${res.retcode}]${res.message}`,
       color: "error",
     });
-    return;
+    return false;
   }
   show.value = true;
-  // @ts-expect-error Cannot find name 'initGeetest'.
-  initGeetest(
-    {
-      gt: res.gt,
-      challenge: res.challenge,
-      offline: false,
-      new_captcha: true,
-      product: "custom",
-      area: "#verify",
-      width: "250px",
-    },
-    (captchaObj: TGApp.BBS.Geetest.GeetestCaptcha) => {
-      geetestRef.value = document.getElementById("geetest");
-      if (geetestRef.value === null) throw new Error("Cannot find element with id 'geetest'.");
-      geetestRef.value.innerHTML = "";
-      captchaObj.appendTo("#geetest");
-      captchaObj
-        .onReady(() => {
-          console.log("ready");
-        })
-        .onSuccess(() => {
+  return await new Promise((resolve) => {
+    // @ts-expect-error Cannot find name 'initGeetest'.
+    initGeetest(
+      {
+        gt: res.gt,
+        challenge: res.challenge,
+        offline: false,
+        new_captcha: true,
+        product: "custom",
+        area: "#verify",
+        width: "250px",
+      },
+      (captchaObj: TGApp.BBS.Geetest.GeetestCaptcha) => {
+        geetestRef.value.innerHTML = "";
+        captchaObj.appendTo("#geetest");
+        captchaObj.onSuccess(async () => {
           const validate = captchaObj.getValidate();
-          (async () => {
-            await TGRequest.User.verification.verify(userStore.cookie, validate);
-            show.value = false;
-          })().catch(() => {}); // 防止报错
-        })
-        .onError(() => {
-          console.log("error");
-        })
-        .onClose(() => {
-          console.log("close");
+          const res = TGRequest.User.verification.verify(urlOri, userStore.cookie, validate);
+          resolve(res);
         });
-    },
-  );
-}
-
-function handleOuter(): void {
-  show.value = false;
+        captchaObj.onClose(() => {
+          show.value = false;
+        });
+      },
+    );
+  });
 }
 
 defineExpose({
diff --git a/src/pages/common/Test.vue b/src/pages/common/Test.vue
index 255c2e94..d817af2e 100644
--- a/src/pages/common/Test.vue
+++ b/src/pages/common/Test.vue
@@ -30,7 +30,8 @@ onMounted(async () => {
 });
 
 async function getGC(): Promise<void> {
-  await showGeetest();
+  const res = await showGeetest();
+  console.log(res);
 }
 </script>
 <style lang="css" scoped>
diff --git a/src/types/BBS/Geetest.d.ts b/src/types/BBS/Geetest.d.ts
index 3b969581..553f718d 100644
--- a/src/types/BBS/Geetest.d.ts
+++ b/src/types/BBS/Geetest.d.ts
@@ -2,7 +2,7 @@
  * @file types BBS Geetest.d.ts
  * @description BBS 极验相关类型定义文件
  * @author BTMuli<bt-muli@outlook.com>
- * @since Alpha v0.2.2
+ * @since Beta v0.3.3
  */
 
 declare namespace TGApp.BBS.Geetest {
@@ -76,22 +76,19 @@ declare namespace TGApp.BBS.Geetest {
    * @since Beta v0.3.3
    * @todo 完善
    * @interface GeetestCaptcha
-   * @property {string} getValidate
-   * @property {Function} onReady
+   * @property {Function} appendTo
+   * @property {Function} getValidate
    * @property {Function} onRefresh
    * @property {Function} onSuccess
-   * @property {Function} onError
    * @property {Function} onClose
    * @return GeetestCaptcha
    */
   export interface GeetestCaptcha {
     appendTo: (selector: string) => void;
     getValidate: () => GeetestValidate;
-    onReady: (callback: () => void) => GeetestCaptcha;
     onRefresh: (callback: () => void) => GeetestCaptcha;
-    onSuccess: (callback: () => void) => GeetestCaptcha;
-    onError: (callback: () => void) => GeetestCaptcha;
-    onClose: (callback: () => void) => GeetestCaptcha;
+    onSuccess: (callback: () => void) => void;
+    onClose: (callback: () => void) => void;
   }
 
   /**
diff --git a/src/web/request/operVerification.ts b/src/web/request/operVerification.ts
index 1709cd7d..0d1fa69a 100644
--- a/src/web/request/operVerification.ts
+++ b/src/web/request/operVerification.ts
@@ -41,44 +41,48 @@ export async function getVerification(
  * @description 将验证完的参数提交给米游社
  * @since Beta v0.3.3
  * @todo 待测试
+ * @param {string} urlOri 原始 url
  * @param {Record<string, string>} cookie cookie
  * @param {TGApp.BBS.Geetest.GeetestValidate} validate 验证码参数
- * @return {Promise<TGApp.BBS.Response.Base|unknown>} 提交结果
+ * @return {Promise<boolean>} 提交结果
  */
 export async function submitVerification(
+  urlOri: string,
   cookie: Record<string, string>,
   validate: TGApp.BBS.Geetest.GeetestValidate,
-): Promise<TGApp.BBS.Response.Base | unknown> {
+): Promise<boolean> {
   const url = "https://api-takumi-record.mihoyo.com/game_record/app/card/wapi/verifyVerification";
-  const data = {
+  const dataRaw = {
     geetest_challenge: validate.geetest_challenge,
     geetest_validate: validate.geetest_validate,
     geetest_seccode: validate.geetest_seccode,
   };
-  console.log(data);
-  const header = TGUtils.User.getHeader(cookie, "POST", data, "lk2", true);
+  const data = JSON.stringify(dataRaw);
+  const header = TGUtils.User.getHeader(cookie, "POST", data, "common", false);
   const reqHeader = {
     ...header,
     "x-rpc-challenge_game": "2",
-    "x-rpc-challenge_trace": validate.geetest_challenge,
+    "x-rpc-challenge": validate.geetest_challenge,
     "x-rpc-validate": validate.geetest_validate,
     "x-rpc-seccode": validate.geetest_seccode,
+    "x-rpc-challenge_path": urlOri,
   };
   console.log(reqHeader);
   return await http
     .fetch<TGApp.BBS.Response.Base>(url, {
       method: "POST",
       headers: reqHeader,
-      body: http.Body.json(data),
+      body: http.Body.json(dataRaw),
     })
     .then((res) => {
+      console.log(res.rawHeaders);
       if (res.data.retcode !== 0) {
         showSnackbar({
           text: `[${res.data.retcode}] ${res.data.message}`,
           color: "error",
         });
-        console.error(res.data);
+        return false;
       }
-      return res.data;
+      return true;
     });
 }
diff --git a/src/web/utils/getRequestHeader.ts b/src/web/utils/getRequestHeader.ts
index e7b1b764..5d2b20b1 100644
--- a/src/web/utils/getRequestHeader.ts
+++ b/src/web/utils/getRequestHeader.ts
@@ -1,13 +1,10 @@
 /**
  * @file web utils getRequestHeader.ts
  * @description 获取请求头
- * @author BTMuli <bt-muli@outlook.com>
- * @since Beta v0.3.0
+ * @since Beta v0.3.3
  */
 
-// Node
-import md5 from "js-md5";
-// Tauri.Genshin
+import Md5 from "js-md5";
 import TGConstant from "../constant/TGConstant";
 import { transCookie, transParams } from "./tools";
 
@@ -59,7 +56,7 @@ export function getRandomString(length: number): string {
 
 /**
  * @description 获取 ds
- * @since Beta v0.3.0
+ * @since Beta v0.3.3
  * @version 2.50.1
  * @param {string} method 请求方法
  * @param {string} data 请求数据
@@ -76,7 +73,7 @@ function getDS(method: string, data: string, saltType: string, isSign: boolean):
   const query = method === "GET" ? data : "";
   let hashStr = `salt=${salt}&t=${time}&r=${random}&b=${body}&q=${query}`;
   if (isSign) hashStr = `salt=${salt}&t=${time}&r=${random}`;
-  const md5Str = md5.update(hashStr).hex();
+  const md5Str = Md5.md5.update(hashStr).hex();
   return `${time},${random},${md5Str}`;
 }