♻️ 请求模块重构

2025-12-15 09:48:14 +08:00 · 2024-11-19 09:34:18 +08:00
parent 9b1fa22cbe
commit c6f45f0a35
49 changed files with 660 additions and 1120 deletions
--- a/src/components/config/tc-gameBadge.vue
+++ b/src/components/config/tc-gameBadge.vue
@@ -25,7 +25,7 @@ import { computed } from "vue";
 import { useAppStore } from "../../store/modules/app.js";
 import { useUserStore } from "../../store/modules/user.js";
 import TGLogger from "../../utils/TGLogger.js";
-import TGRequest from "../../web/request/TGRequest.js";
+import PassportApi from "../../web/request/passportReq.js";
 import showSnackbar from "../func/snackbar.js";

 const userStore = storeToRefs(useUserStore());
@@ -50,7 +50,7 @@ async function tryPlayGame(): Promise<void> {
    showSnackbar.warn("未检测到原神本体应用！");
    return;
  }
-  const resp = await TGRequest.User.getAuthTicket(account.value, userStore.cookie.value);
+  const resp = await PassportApi.authTicket(account.value, userStore.cookie.value);
  if (typeof resp !== "string") {
    showSnackbar.error(`[${resp.retcode}] ${resp.message}`);
    await TGLogger.Error(
@@ -104,13 +104,6 @@ async function tryPlayGame(): Promise<void> {
  font-size: 18px;
 }

-.tgb-btns {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  column-gap: 10px;
-}
-
 .tgb-name {
  font-family: var(--font-title);
 }
--- a/src/components/config/tc-userBadge.vue
+++ b/src/components/config/tc-userBadge.vue
@@ -110,7 +110,9 @@ import TSUserAccount from "../../plugins/Sqlite/modules/userAccount.js";
 import { useAppStore } from "../../store/modules/app.js";
 import { useUserStore } from "../../store/modules/user.js";
 import TGLogger from "../../utils/TGLogger.js";
-import TGRequest from "../../web/request/TGRequest.js";
+import BBSApi from "../../web/request/bbsReq.js";
+import PassportApi from "../../web/request/passportReq.js";
+import TakumiApi from "../../web/request/takumiReq.js";
 import showDialog from "../func/dialog.js";
 import showGeetest from "../func/geetest.js";
 import showLoading from "../func/loading.js";
@@ -164,7 +166,7 @@ async function tryCaptchaLogin(): Promise<void> {
    ltoken: "",
  };
  showLoading.update("正在登录...", "正在获取 LToken");
-  const ltokenRes = await TGRequest.User.bySToken.getLToken(ck.mid, ck.stoken);
+  const ltokenRes = await PassportApi.lToken.get(ck);
  if (typeof ltokenRes !== "string") {
    showLoading.end();
    showSnackbar.error(`[${ltokenRes.retcode}]${ltokenRes.message}`);
@@ -174,7 +176,7 @@ async function tryCaptchaLogin(): Promise<void> {
  showSnackbar.success("获取LToken成功");
  ck.ltoken = ltokenRes;
  showLoading.update("正在登录...", "正在获取 CookieToken");
-  const cookieTokenRes = await TGRequest.User.bySToken.getCookieToken(ck.mid, ck.stoken);
+  const cookieTokenRes = await PassportApi.cookieToken(ck);
  if (typeof cookieTokenRes !== "string") {
    showLoading.end();
    showSnackbar.error(`[${cookieTokenRes.retcode}]${cookieTokenRes.message}`);
@@ -186,7 +188,7 @@ async function tryCaptchaLogin(): Promise<void> {
  showSnackbar.success("获取CookieToken成功");
  ck.cookie_token = cookieTokenRes;
  showLoading.update("正在登录...", "正在获取用户信息");
-  const briefRes = await TGRequest.User.byCookie.getUserInfo(ck.cookie_token, ck.account_id);
+  const briefRes = await BBSApi.userInfo(ck);
  if ("retcode" in briefRes) {
    showLoading.end();
    showSnackbar.error(`[${briefRes.retcode}]${briefRes.message}`);
@@ -212,7 +214,7 @@ async function tryCaptchaLogin(): Promise<void> {
  userStore.cookie.value = ck;
  appStore.isLogin.value = true;
  showLoading.update("正在登录...", "正在获取游戏账号");
-  const gameRes = await TGRequest.User.byCookie.getAccounts(ck.cookie_token, ck.account_id);
+  const gameRes = await TakumiApi.bind.gameRoles(userStore.cookie.value);
  if (!Array.isArray(gameRes)) {
    showLoading.end();
    showSnackbar.error(`[${gameRes.retcode}]${gameRes.message}`);
@@ -240,7 +242,7 @@ async function refreshUser(uid: string) {
  }
  let ck = account.cookie;
  showLoading.start("正在刷新用户信息", "正在验证 LToken");
-  const verifyLTokenRes = await TGRequest.User.verifyLToken(ck.ltoken, ck.ltuid);
+  const verifyLTokenRes = await PassportApi.lToken.verify(ck);
  if (typeof verifyLTokenRes === "string") {
    showLoading.update("正在刷新用户信息", "验证 LToken 成功");
    showSnackbar.success("验证 LToken 成功");
@@ -252,7 +254,7 @@ async function refreshUser(uid: string) {
    await TGLogger.Warn(
      `[tc-userBadge][refreshUser] ${verifyLTokenRes.retcode}: ${verifyLTokenRes.message}`,
    );
-    const ltokenRes = await TGRequest.User.bySToken.getLToken(ck.mid, ck.stoken);
+    const ltokenRes = await PassportApi.lToken.get(ck);
    if (typeof ltokenRes === "string") {
      showLoading.update("正在刷新用户信息", "获取 LToken 成功");
      ck.ltoken = ltokenRes;
@@ -267,7 +269,7 @@ async function refreshUser(uid: string) {
    }
  }
  showLoading.update("正在刷新用户信息", "正在获取 CookieToken");
-  const cookieTokenRes = await TGRequest.User.bySToken.getCookieToken(ck.mid, ck.stoken);
+  const cookieTokenRes = await PassportApi.cookieToken(ck);
  if (typeof cookieTokenRes === "string") {
    showLoading.update("正在刷新用户信息", "获取 CookieToken 成功");
    ck.cookie_token = cookieTokenRes;
@@ -282,7 +284,7 @@ async function refreshUser(uid: string) {
  }
  account.cookie = ck;
  showLoading.update("正在刷新用户信息", "正在获取用户信息");
-  const infoRes = await TGRequest.User.byCookie.getUserInfo(ck.cookie_token, ck.account_id);
+  const infoRes = await BBSApi.userInfo(ck);
  if ("retcode" in infoRes) {
    showLoading.update("正在刷新用户信息", "获取用户信息失败");
    showSnackbar.error(`[${infoRes.retcode}]${infoRes.message}`);
@@ -300,7 +302,7 @@ async function refreshUser(uid: string) {
  }
  await TSUserAccount.account.saveAccount(account);
  showLoading.update("正在刷新用户信息", "正在获取账号信息");
-  const accountRes = await TGRequest.User.byCookie.getAccounts(ck.cookie_token, ck.account_id);
+  const accountRes = await TakumiApi.bind.gameRoles(ck);
  if (Array.isArray(accountRes)) {
    showLoading.update("正在刷新用户信息", "获取账号信息成功");
    await TGLogger.Info("[tc-userBadge][refreshUserInfo] 获取账号信息成功");
@@ -453,7 +455,7 @@ async function addByCookie(): Promise<void> {
    ltoken: "",
  };
  showLoading.update("正在添加用户", "正在获取 LToken");
-  const ltokenRes = await TGRequest.User.bySToken.getLToken(ck.mid, ck.stoken);
+  const ltokenRes = await PassportApi.lToken.get(ck);
  if (typeof ltokenRes !== "string") {
    showLoading.end();
    showSnackbar.error(`[${ltokenRes.retcode}]${ltokenRes.message}`);
@@ -462,7 +464,7 @@ async function addByCookie(): Promise<void> {
  }
  ck.ltoken = ltokenRes;
  showLoading.update("正在添加用户", "正在获取 CookieToken");
-  const cookieTokenRes = await TGRequest.User.bySToken.getCookieToken(ck.mid, ck.stoken);
+  const cookieTokenRes = await PassportApi.cookieToken(ck);
  if (typeof cookieTokenRes !== "string") {
    showLoading.end();
    showSnackbar.error(`[${cookieTokenRes.retcode}]${cookieTokenRes.message}`);
@@ -473,7 +475,7 @@ async function addByCookie(): Promise<void> {
  }
  ck.cookie_token = cookieTokenRes;
  showLoading.update("正在添加用户", "正在获取用户信息");
-  const briefRes = await TGRequest.User.byCookie.getUserInfo(ck.cookie_token, ck.account_id);
+  const briefRes = await BBSApi.userInfo(ck);
  if ("retcode" in briefRes) {
    showLoading.end();
    showSnackbar.error(`[${briefRes.retcode}]${briefRes.message}`);
@@ -494,7 +496,7 @@ async function addByCookie(): Promise<void> {
    updated: "",
  });
  showLoading.update("正在添加用户", "正在获取游戏账号");
-  const gameRes = await TGRequest.User.bySToken.getAccounts(ck.stoken, ck.stuid);
+  const gameRes = await TakumiApi.bind.gameRoles(ck);
  if (!Array.isArray(gameRes)) {
    showLoading.end();
    showSnackbar.error(`[${gameRes.retcode}]${gameRes.message}`);
--- a/src/components/main/t-gamenav.vue
+++ b/src/components/main/t-gamenav.vue
@@ -19,7 +19,7 @@ import { useAppStore } from "../../store/modules/app.js";
 import TGClient from "../../utils/TGClient.js";
 import TGLogger from "../../utils/TGLogger.js";
 import { createPost } from "../../utils/TGWindow.js";
-import TGRequest from "../../web/request/TGRequest.js";
+import OtherApi from "../../web/request/otherReq.js";
 import showDialog from "../func/dialog.js";
 import showSnackbar from "../func/snackbar.js";
 import ToLivecode from "../overlay/to-livecode.vue";
@@ -64,7 +64,7 @@ async function tryGetCode(): Promise<void> {
    return;
  }
  actId.value = actIdFind;
-  const res = await TGRequest.Nav.getCode(actIdFind);
+  const res = await OtherApi.code(actIdFind);
  if (!Array.isArray(res)) {
    showSnackbar.warn(`[${res.retcode}] ${res.message}`);
    return;
--- a/src/components/main/t-postcard.vue
+++ b/src/components/main/t-postcard.vue
@@ -82,7 +82,7 @@ interface TPostCardProps {
 }

 interface TPostCardEmits {
-  (e: "update:selected", value: string[]): void;
+  (e: "onSelected", value: string[]): void;
 }

 const props = withDefaults(defineProps<TPostCardProps>(), {
@@ -96,7 +96,7 @@ const selectedList = computed({
  get: () => props.selected,
  set: (v) => {
    if (v === undefined) return;
-    emits("update:selected", v);
+    emits("onSelected", v);
  },
 });
 const cardBg = computed<string>(() => {
--- a/src/components/post/tp-emoticon.vue
+++ b/src/components/post/tp-emoticon.vue
@@ -69,7 +69,7 @@ function getImageUrl(): string {
 async function download(): Promise<void> {
  const image = props.data.insert.custom_emoticon.url;
  if (buffer.value === null) buffer.value = await getImageBuffer(image);
-  let size = 0;
+  let size: number;
  if (props.data.insert.custom_emoticon.size.file_size) {
    size = props.data.insert.custom_emoticon.size.file_size;
  } else {