♻️ Hutao 类型重构，优化目录结构

src/pages/User/Abyss.vue

@@ -77,7 +77,7 @@ import { useUserStore } from "../../store/modules/user";
 import TGRequest from "../../web/request/TGRequest";
 import TGSqlite from "../../plugins/Sqlite";
 import { generateShareImg } from "../../utils/TGShare";
-import HutaoRequest from "../../plugins/Hutao";
+import Hutao from "../../plugins/Hutao";
 
 // store
 const userStore = useUserStore();
@@ -155,7 +155,7 @@ async function uploadAbyss(): Promise<void> {
   const abyssData = curAbyss.value;
   loadingTitle.value = "正在转换深渊数据";
   loading.value = true;
-  let transAbyss = HutaoRequest.Abyss.utils.transData(abyssData);
+  let transAbyss = Hutao.Abyss.utils.transData(abyssData);
   loadingTitle.value = "正在获取角色数据";
   const roles = await TGSqlite.getUserCharacter(user.value.gameUid);
   if (!roles) {
@@ -163,9 +163,9 @@ async function uploadAbyss(): Promise<void> {
     return;
   }
   loadingTitle.value = "正在转换角色数据";
-  transAbyss.avatars = HutaoRequest.Abyss.utils.transAvatars(roles);
+  transAbyss.avatars = Hutao.Abyss.utils.transAvatars(roles);
   loadingTitle.value = "正在上传深渊数据";
-  const res = await HutaoRequest.Abyss.postData(transAbyss);
+  const res = await Hutao.Abyss.postData(transAbyss);
   console.log(res);
   loading.value = false;
 }

src/pages/WIKI/Abyss.vue

@@ -9,7 +9,7 @@
 // vue
 import { onMounted, ref } from "vue";
 // utils
-import HutaoRequest from "../../plugins/Hutao";
+import Hutao from "../../plugins/Hutao";
 import HtaOverlayOverview from "../../components/hutaoAbyss/hta-overlay-overview.vue";
 
 const showDialog = ref(false);
@@ -18,7 +18,7 @@ const showDialog = ref(false);
 const overview = ref({} as TGApp.Plugins.Hutao.AbyssOverview);
 
 onMounted(async () => {
-  overview.value = await HutaoRequest.Abyss.getOverview();
+  overview.value = await Hutao.Abyss.getOverview();
 });
 
 function getUpdated() {

src/plugins/Hutao/index.ts

@@ -16,7 +16,7 @@ import getWeaponCollect from "./request/getWeaponCollect";
 import uploadData from "./request/uploadData";
 import { transAvatars, transLocal } from "./utils/transLocal";
 
-const HutaoRequest = {
+const Hutao = {
   Abyss: {
     avatar: {
       getCollect: getAvatarCollect,
@@ -39,4 +39,4 @@ const HutaoRequest = {
   },
 };
 
-export default HutaoRequest;
+export default Hutao;

src/plugins/Hutao/request/getAvatarCollect.ts

@@ -13,12 +13,12 @@ import HutaoApi from "../api";
 /**
  * @description 获取角色搭配数据
  * @since Alpha v0.2.0
- * @return {Promise<TGApp.Plugins.Hutao.AbyssAvatarCollocation[]>}
+ * @return {Promise<TGApp.Plugins.Hutao.Abyss.AvatarCollocation[]>}
  */
-async function getAvatarCollect(): Promise<TGApp.Plugins.Hutao.AbyssAvatarCollocation[]> {
+async function getAvatarCollect(): Promise<TGApp.Plugins.Hutao.Abyss.AvatarCollocation[]> {
   const url = HutaoApi.Abyss.avatar.collect;
   return await http
-    .fetch<TGApp.Plugins.Hutao.AbyssAvatarCollocationResponse>(url, {
+    .fetch<TGApp.Plugins.Hutao.Abyss.AvatarCollocationResponse>(url, {
       method: "GET",
     })
     .then((res) => {

src/plugins/Hutao/request/getAvatarHoldRate.ts

@@ -13,12 +13,12 @@ import HutaoApi from "../api";
 /**
  * @description 获取角色持有率数据
  * @since Alpha v0.2.0
- * @returns {Promise<TGApp.Plugins.Hutao.AbyssAvatarHoldRate[]>}
+ * @returns {Promise<TGApp.Plugins.Hutao.Abyss.AvatarHold[]>}
  */
-async function getAvatarHoldRate(): Promise<TGApp.Plugins.Hutao.AbyssAvatarHoldRate[]> {
+async function getAvatarHoldRate(): Promise<TGApp.Plugins.Hutao.Abyss.AvatarHold[]> {
   const url = HutaoApi.Abyss.avatar.holdRate;
   return await http
-    .fetch<TGApp.Plugins.Hutao.AbyssAvatarHoldRateResponse>(url, {
+    .fetch<TGApp.Plugins.Hutao.Abyss.AvatarHoldResponse>(url, {
       method: "GET",
     })
     .then((res) => {

src/plugins/Hutao/request/getAvatarUpRate.ts

@@ -13,12 +13,12 @@ import HutaoApi from "../api";
 /**
  * @description 获取角色上场率数据
  * @since Alpha v0.2.0
- * @return {Promise<TGApp.Plugins.Hutao.AbyssAvatarUpRate[]>}
+ * @return {Promise<TGApp.Plugins.Hutao.Abyss.AvatarUp[]>}
  */
-async function getAvatarUpRate(): Promise<TGApp.Plugins.Hutao.AbyssAvatarUpRate[]> {
+async function getAvatarUpRate(): Promise<TGApp.Plugins.Hutao.Abyss.AvatarUp[]> {
   const url = HutaoApi.Abyss.avatar.upRate;
   return await http
-    .fetch<TGApp.Plugins.Hutao.AbyssAvatarUpRateResponse>(url, {
+    .fetch<TGApp.Plugins.Hutao.Abyss.AvatarUpResponse>(url, {
       method: "GET",
     })
     .then((res) => {

src/plugins/Hutao/request/getAvatarUseRate.ts

@@ -13,12 +13,12 @@ import HutaoApi from "../api";
 /**
  * @description 获取角色使用率
  * @since Alpha v0.2.0
- * @return {Promise<TGApp.Plugins.Hutao.AbyssAvatarUseRate[]>}
+ * @return {Promise<TGApp.Plugins.Hutao.Abyss.AvatarUse[]>}
  */
-async function getAvatarUseRate(): Promise<TGApp.Plugins.Hutao.AbyssAvatarUseRate[]> {
+async function getAvatarUseRate(): Promise<TGApp.Plugins.Hutao.Abyss.AvatarUse[]> {
   const url = HutaoApi.Abyss.avatar.useRate;
   return await http
-    .fetch<TGApp.Plugins.Hutao.AbyssAvatarUseRateResponse>(url, {
+    .fetch<TGApp.Plugins.Hutao.Abyss.AvatarUseResponse>(url, {
       method: "GET",
     })
     .then((res) => {

src/plugins/Hutao/request/getOverview.ts

@@ -13,12 +13,12 @@ import HutaoApi from "../api";
 /**
  * @description 获取深渊概览数据
  * @since Alpha v0.2.0
- * @return {Promise<TGApp.Plugins.Hutao.AbyssOverview>}
+ * @return {Promise<TGApp.Plugins.Hutao.Abyss.OverviewData>}
  */
-async function getOverview(): Promise<TGApp.Plugins.Hutao.AbyssOverview> {
+async function getOverview(): Promise<TGApp.Plugins.Hutao.Abyss.OverviewData> {
   const url = HutaoApi.Abyss.overview;
   return await http
-    .fetch<TGApp.Plugins.Hutao.AbyssOverviewResponse>(url, {
+    .fetch<TGApp.Plugins.Hutao.Abyss.OverviewResponse>(url, {
       method: "GET",
     })
     .then((res) => {

src/plugins/Hutao/request/getTeamCollect.ts

@@ -13,12 +13,12 @@ import HutaoApi from "../api";
 /**
  * @description 获取队伍搭配数据
  * @since Alpha v0.2.0
- * @return {Promise<TGApp.Plugins.Hutao.AbyssTeamCombination[]>}
+ * @return {Promise<TGApp.Plugins.Hutao.Abyss.TeamCombination[]>}
  */
-async function getTeamCollect(): Promise<TGApp.Plugins.Hutao.AbyssTeamCombination[]> {
+async function getTeamCollect(): Promise<TGApp.Plugins.Hutao.Abyss.TeamCombination[]> {
   const url = HutaoApi.Abyss.team;
   return await http
-    .fetch<TGApp.Plugins.Hutao.AbyssTeamCombinationResponse>(url, {
+    .fetch<TGApp.Plugins.Hutao.Abyss.TeamCombinationResponse>(url, {
       method: "GET",
     })
     .then((res) => {

src/plugins/Hutao/request/getUserData.ts

@@ -20,7 +20,7 @@ import HutaoApi from "../api";
 export async function checkUid(uid: string): Promise<boolean> {
   const url = HutaoApi.Abyss.user.check.replace("{uid}", uid);
   return await http
-    .fetch<TGApp.Plugins.Hutao.AbyssRecordExistResponse>(url, {
+    .fetch<TGApp.Plugins.Hutao.Abyss.ExistResponse>(url, {
       method: "GET",
     })
     .then((res) => {
@@ -33,12 +33,12 @@ export async function checkUid(uid: string): Promise<boolean> {
  * @since Alpha v0.2.0
  * @todo 未完成
  * @param {string} uid
- * @return {Promise<TGApp.Plugins.Hutao.AbyssRecordRank>}
+ * @return {Promise<TGApp.Plugins.Hutao.Abyss.RankData>}
  */
-export async function getUserData(uid: string): Promise<TGApp.Plugins.Hutao.AbyssRecordRank> {
+export async function getUserData(uid: string): Promise<TGApp.Plugins.Hutao.Abyss.RankData> {
   const url = HutaoApi.Abyss.user.rank.replace("{uid}", uid);
   return await http
-    .fetch<TGApp.Plugins.Hutao.AbyssRecordRankResponse>(url, {
+    .fetch<TGApp.Plugins.Hutao.Abyss.RecordRankResponse>(url, {
       method: "GET",
     })
     .then((res) => {

src/plugins/Hutao/request/getWeaponCollect.ts

@@ -13,12 +13,12 @@ import HutaoApi from "../api";
 /**
  * @description 获取武器搭配
  * @since Alpha v0.2.0
- * @return {Promise<TGApp.Plugins.Hutao.AbyssWeaponCollocation[]>}
+ * @return {Promise<TGApp.Plugins.Hutao.Abyss.WeaponCollocation[]>}
  */
-async function getWeaponCollect(): Promise<TGApp.Plugins.Hutao.AbyssWeaponCollocation[]> {
+async function getWeaponCollect(): Promise<TGApp.Plugins.Hutao.Abyss.WeaponCollocation[]> {
   const url = HutaoApi.Abyss.weapon;
   return await http
-    .fetch<TGApp.Plugins.Hutao.AbyssWeaponCollocationResponse>(url, {
+    .fetch<TGApp.Plugins.Hutao.Abyss.WeaponCollocationResponse>(url, {
       method: "GET",
     })
     .then((res) => {

src/plugins/Hutao/request/uploadData.ts

@@ -13,15 +13,15 @@ import HutaoApi from "../api";
 /**
  * @description 上传用户数据
  * @since Alpha v0.2.1
- * @param {TGApp.Plugins.Hutao.AbyssRecordUpload} data 用户数据
+ * @param {TGApp.Plugins.Hutao.Abyss.RecordUpload} data 用户数据
- * @returns {Promise<TGApp.Plugins.Hutao.HutaoResponse>} 上传结果
+ * @returns {Promise<TGApp.Plugins.Hutao.Abyss.UploadResponse>} 上传结果
  */
 async function uploadData(
-  data: TGApp.Plugins.Hutao.AbyssRecordUpload,
+  data: TGApp.Plugins.Hutao.Abyss.RecordUpload,
-): Promise<TGApp.Plugins.Hutao.HutaoResponse> {
+): Promise<TGApp.Plugins.Hutao.Abyss.UploadResponse> {
   const url = HutaoApi.Abyss.upload;
   return await http
-    .fetch<TGApp.Plugins.Hutao.HutaoResponse>(url, {
+    .fetch<TGApp.Plugins.Hutao.Abyss.UploadResponse>(url, {
       method: "POST",
       body: http.Body.json(data),
     })

src/plugins/Hutao/types/Abyss.d.ts

@@ -1,49 +1,42 @@
 /**
- * @file types Plugins Hutao.d.ts
+ * @file src plugins Hutao types Abyss.d.ts
- * @description Hutao API
+ * @description Hutao 插件深渊类型定义文件
- * @see HutaoRequest
  * @author BTMuli <bt-muli@outlook.com>
  * @since Alpha v0.2.1
  */
 
-declare namespace TGApp.Plugins.Hutao {
+/**
-  /**
+ * @description Hutao 深渊类型定义
-   * @description Hutao API 响应数据
+ * @since Alpha v0.2.1
-   * @since Alpha v0.2.0
+ * @namespace Abyss
-   * @interface HutaoResponse
+ * @exports TGApp.Plugins.Hutao.Abyss
-   * @property {number} retcode - 状态码
+ * @return Abyss
-   * @property {string} message - 状态信息
+ */
-   * @property {any} data - 数据
+declare namespace TGApp.Plugins.Hutao.Abyss {
-   */
-  export interface HutaoResponse {
-    retcode?: number;
-    message?: string;
-    data?: any;
-  }
   /**
    * @description 深渊记录上传数据
-   * @since Alpha v0.2.0
+   * @since Alpha v0.2.1
    * @see HutaoRequest.Abyss.postData
-   * @interface AbyssRecordUpload
+   * @interface RecordUpload
    * @property {string} uid - UID
    * @property {string} identity - 身份标识
-   * @property {AbyssRecord} spiralAbyss - 深渊记录
+   * @property {RecordData} spiralAbyss - 深渊记录
-   * @property {AbyssAvatar[]} avatars - 角色信息
+   * @property {Avatar[]} avatars - 角色信息
    * @property {string} reservedUserName - 保留用户名
-   * @return AbyssRecordUpload
+   * @return RecordUpload
    */
-  export interface AbyssRecordUpload {
+  export interface RecordUpload {
     uid: string;
     identity: string;
-    spiralAbyss: AbyssRecord;
+    spiralAbyss: RecordData;
-    avatars: AbyssAvatar[];
+    avatars: Avatar[];
     reservedUserName: string;
   }
 
   /**
    * @description 深渊记录
    * @since Alpha v0.2.0
-   * @interface AbyssRecord
+   * @interface RecordData
    * @property {number} scheduleId - 深渊期数
    * @property {number} totalBattleTimes - 总战斗次数
    * @property {number} totalWinTimes - 总胜利次数
@@ -51,10 +44,10 @@ declare namespace TGApp.Plugins.Hutao {
    * @property {number} damage.value - 最大伤害
    * @property {number} takeDamage.avatarId - 最大承伤角色ID
    * @property {number} takeDamage.value - 最大承伤
-   * @property {AbyssFloor[]} floors - 楼层信息
+   * @property {Floor[]} floors - 楼层信息
-   * @return AbyssRecord
+   * @return RecordData
    */
-  export interface AbyssRecord {
+  export interface RecordData {
     scheduleId: number;
     totalBattleTimes: number;
     totalWinTimes: number;
@@ -66,35 +59,35 @@ declare namespace TGApp.Plugins.Hutao {
       avatarId: number;
       value: number;
     };
-    floors: AbyssFloor[];
+    floors: Floor[];
   }
 
   /**
    * @description 深渊楼层信息
    * @since Alpha v0.2.0
-   * @interface AbyssFloor
+   * @interface Floor
    * @property {number} index - 楼层索引
    * @property {number} star - 楼层星数
-   * @property {AbyssLevel[]} levels - 楼层关卡信息
+   * @property {Level[]} levels - 楼层关卡信息
-   * @return AbyssFloor
+   * @return Floor
    */
-  export interface AbyssFloor {
+  export interface Floor {
     index: number;
     star: number;
-    levels: AbyssLevel[];
+    levels: Level[];
   }
 
   /**
-   * @description 深渊关卡信息
+   * @description 深渊房间信息
    * @since Alpha v0.2.0
-   * @interface AbyssLevel
+   * @interface Level
    * @property {number} index - 关卡索引
    * @property {number} star - 关卡星数
    * @property {number} battles[].index - 战斗索引
    * @property {number[]} battles[].avatars - 战斗角色ID
-   * @return AbyssLevel
+   * @return Level
    */
-  export interface AbyssLevel {
+  export interface Level {
     index: number;
     star: number;
     battles: Array<{
@@ -106,14 +99,14 @@ declare namespace TGApp.Plugins.Hutao {
   /**
    * @description 角色信息
    * @since Alpha v0.2.1
-   * @interface AbyssAvatar
+   * @interface Avatar
    * @property {number} avatarId - 角色ID
    * @property {number} weaponId - 武器ID
    * @property {number[]} reliquarySetIds - 圣遗物套装ID
    * @property {number} activedConstellationNumber - 已激活命座数量
-   * @return AbyssAvatar
+   * @return Avatar
    */
-  export interface AbyssAvatar {
+  export interface Avatar {
     avatarId: number;
     weaponId: number;
     reliquarySetIds: number[];
@@ -121,40 +114,49 @@ declare namespace TGApp.Plugins.Hutao {
   }
 
   /**
-   * @description 查询 uid 对应记录是否存在返回
+   * @description 深渊记录上传返回
-   * @since Alpha v0.2.0
+   * @since Alpha v0.2.1
-   * @see HutaoRequest.Abyss.user.checkExist
+   * @see HutaoRequest.Abyss.postData
-   * @interface AbyssRecordExistResponse
+   * @interface UploadResponse
-   * @extends HutaoResponse
+   * @extends TGApp.Plugins.Hutao.Base.Response
-   * @property {boolean} data - 是否存在
+   * @return UploadResponse
-   * @return AbyssRecordExistResponse
    */
-  export interface AbyssRecordExistResponse extends HutaoResponse {
+  export interface UploadResponse extends TGApp.Plugins.Hutao.Base.Response {}
+
+  /**
+   * @description 是否存在深渊记录返回
+   * @since Alpha v0.2.1
+   * @see HutaoRequest.Abyss.user.checkExist
+   * @interface ExistResponse
+   * @extends TGApp.Plugins.Hutao.Base.Response
+   * @property {boolean} data - 是否存在深渊记录
+   * @return ExistResponse
+   */
+  export interface ExistResponse extends TGApp.Plugins.Hutao.Base.Response {
     data: boolean;
   }
 
   /**
    * @description 获取深渊记录返回
-   * @todo 暂时缺乏数据
+   * @since Alpha v0.2.1
-   * @since Alpha v0.2.0
    * @see HutaoRequest.Abyss.user.getRecord
-   * @interface AbyssRecordRankResponse
+   * @interface RecordRankResponse
-   * @extends HutaoResponse
+   * @extends TGApp.Plugins.Hutao.Base.Response
-   * @property {AbyssRecordRank} data - 深渊记录
+   * @property {RankData} data - 深渊记录
-   * @return AbyssRecordRankResponse
+   * @return RecordRankResponse
    */
-  export interface AbyssRecordRankResponse extends HutaoResponse {
+  export interface RecordRankResponse extends TGApp.Plugins.Hutao.Base.Response {
-    data: AbyssRecordRank;
+    data: RankData;
   }
 
   /**
    * @description 深渊记录
-   * @since Alpha v0.2.0
+   * @since Alpha v0.2.1
-   * @interface AbyssRecordRank
+   * @interface RankData
    * @todo 暂时缺乏数据
-   * @return AbyssRecordRank
+   * @return RankData
    */
-  export interface AbyssRecordRank {
+  export interface RankData {
     // todo
   }
 
@@ -162,19 +164,19 @@ declare namespace TGApp.Plugins.Hutao {
    * @description 获取深渊总览数据返回
    * @since Alpha v0.2.0
    * @see HutaoRequest.Abyss.getOverview
-   * @interface AbyssOverviewResponse
+   * @interface OverviewResponse
-   * @extends HutaoResponse
+   * @extends TGApp.Plugins.Hutao.Base.Response
-   * @property {AbyssOverview} data - 深渊总览数据
+   * @property {OverviewData} data - 深渊总览数据
-   * @return AbyssOverviewResponse
+   * @return OverviewResponse
    */
-  export interface AbyssOverviewResponse extends HutaoResponse {
+  export interface OverviewResponse extends TGApp.Plugins.Hutao.Base.Response {
-    data: AbyssOverview;
+    data: OverviewData;
   }
 
   /**
    * @description 深渊总览数据
    * @since Alpha v0.2.0
-   * @interface AbyssOverview
+   * @interface OverviewData
    * @property {number} scheduleId - 深渊期数
    * @property {number} recordTotal - 总记录数
    * @property {number} spiralAbyssTotal - 总计深渊记录
@@ -185,9 +187,9 @@ declare namespace TGApp.Plugins.Hutao {
    * @property {number} timestamp - 时间戳
    * @property {number} timeTotal - 总耗时
    * @property {number} timeAverage - 平均耗时
-   * @return AbyssOverview
+   * @return OverviewData
    */
-  export interface AbyssOverview {
+  export interface OverviewData {
     scheduleId: number;
     recordTotal: number;
     spiralAbyssTotal: number;
@@ -204,26 +206,25 @@ declare namespace TGApp.Plugins.Hutao {
    * @description 获取角色深渊上场率返回
    * @since Alpha v0.2.0
    * @see HutaoRequest.Abyss.avatar.getUpRate
-   * @method GET
+   * @interface AvatarUpResponse
-   * @interface AbyssAvatarUpRateResponse
+   * @extends TGApp.Plugins.Hutao.Base.Response
-   * @extends HutaoResponse
+   * @property {AvatarUp[]} data - 角色深渊上场率
-   * @property {AbyssAvatarUpRate[]} data - 角色深渊上场率
+   * @return AvatarUpResponse
-   * @return AbyssAvatarUpRateResponse
    */
-  export interface AbyssAvatarUpRateResponse extends HutaoResponse {
+  export interface AvatarUpResponse extends TGApp.Plugins.Hutao.Base.Response {
-    data: AbyssAvatarUpRate[];
+    data: AvatarUp[];
   }
 
   /**
    * @description 角色深渊上场率
    * @since Alpha v0.2.0
-   * @interface AbyssAvatarUpRate
+   * @interface AvatarUp
    * @property {number} floor - 楼层
    * @property {number} ranks[].item - 角色ID
    * @property {number} ranks[].rate - 上场率
-   * @return AbyssAvatarUpRate
+   * @return AvatarUp
    */
-  export interface AbyssAvatarUpRate {
+  export interface AvatarUp {
     floor: number;
     ranks: {
       item: number;
@@ -235,25 +236,25 @@ declare namespace TGApp.Plugins.Hutao {
    * @description 获取角色深渊使用率返回
    * @since Alpha v0.2.0
    * @see HutaoRequest.Abyss.avatar.getUseRate
-   * @interface AbyssAvatarUseRateResponse
+   * @interface AvatarUseResponse
-   * @extends HutaoResponse
+   * @extends TGApp.Plugins.Hutao.Base.Response
-   * @property {AbyssAvatarUseRate[]} data - 角色深渊使用率
+   * @property {AvatarUse[]} data - 角色深渊使用率
-   * @return AbyssAvatarUseRateResponse
+   * @return AvatarUseResponse
    */
-  export interface AbyssAvatarUseRateResponse extends HutaoResponse {
+  export interface AvatarUseResponse extends TGApp.Plugins.Hutao.Base.Response {
-    data: AbyssAvatarUseRate[];
+    data: AvatarUse[];
   }
 
   /**
    * @description 角色深渊使用率
    * @since Alpha v0.2.0
-   * @interface AbyssAvatarUseRate
+   * @interface AvatarUse
    * @property {number} floor - 楼层
    * @property {number} ranks[].item - 角色ID
    * @property {number} ranks[].rate - 使用率
-   * @return AbyssAvatarUseRate
+   * @return AvatarUse
    */
-  export interface AbyssAvatarUseRate {
+  export interface AvatarUse {
     floor: number;
     ranks: Array<{
       item: number;
@@ -265,26 +266,26 @@ declare namespace TGApp.Plugins.Hutao {
    * @description 获取角色深渊持有率返回
    * @since Alpha v0.2.0
    * @see HutaoRequest.Abyss.avatar.getHoldRate
-   * @interface AbyssAvatarHoldRateResponse
+   * @interface AvatarHoldResponse
-   * @extends HutaoResponse
+   * @extends TGApp.Plugins.Hutao.Base.Response
-   * @property {AbyssAvatarHoldRate[]} data - 角色深渊持有率
+   * @property {AvatarHold[]} data - 角色深渊持有率
-   * @return AbyssAvatarHoldRateResponse
+   * @return AvatarHoldResponse
    */
-  export interface AbyssAvatarHoldRateResponse extends HutaoResponse {
+  export interface AvatarHoldResponse extends TGApp.Plugins.Hutao.Base.Response {
-    data: AbyssAvatarHoldRate[];
+    data: AvatarHold[];
   }
 
   /**
    * @description 角色深渊持有率
    * @since Alpha v0.2.0
-   * @interface AbyssAvatarHoldRate
+   * @interface AvatarHold
    * @property {number} holdingRate - 持有率
    * @property {number} constellations[].item - 命座ID
    * @property {number} constellations[].rate - 持有率
    * @property {number} avatarId - 角色ID
-   * @return AbyssAvatarHoldRate
+   * @return AvatarHold
    */
-  export interface AbyssAvatarHoldRate {
+  export interface AvatarHold {
     holdingRate: number;
     constellations: Array<{
       item: number;
@@ -297,19 +298,19 @@ declare namespace TGApp.Plugins.Hutao {
    * @description 获取角色的圣遗物、武器搭配
    * @since Alpha v0.2.0
    * @see HutaoRequest.Abyss.avatar.getCollect
-   * @interface AbyssAvatarCollocationResponse
+   * @interface AvatarCollocationResponse
-   * @extends HutaoResponse
+   * @extends TGApp.Plugins.Hutao.Base.Response
-   * @property {AbyssAvatarCollocation[]} data - 角色搭配
+   * @property {AvatarCollocation[]} data - 角色搭配
-   * @return AbyssAvatarCollocationResponse
+   * @return AvatarCollocationResponse
    */
-  export interface AbyssAvatarCollocationResponse extends HutaoResponse {
+  export interface AvatarCollocationResponse extends TGApp.Plugins.Hutao.Base.Response {
-    data: AbyssAvatarCollocation[];
+    data: AvatarCollocation[];
   }
 
   /**
    * @description 角色搭配
    * @since Alpha v0.2.0
-   * @interface AbyssAvatarCollocation
+   * @interface AvatarCollocation
    * @property {number} avatarId - 角色ID
    * @property {number} avatars[].item - 角色ID
    * @property {number} avatars[].rate - 角色搭配率
@@ -317,9 +318,9 @@ declare namespace TGApp.Plugins.Hutao {
    * @property {number} reliquaries[].rate - 圣遗物套装搭配率
    * @property {number} weapons[].item - 武器ID
    * @property {number} weapons[].rate - 武器搭配率
-   * @return AbyssAvatarCollocation
+   * @return AvatarCollocation
    */
-  export interface AbyssAvatarCollocation {
+  export interface AvatarCollocation {
     avatarId: number;
     avatars: Array<{
       item: number;
@@ -339,24 +340,24 @@ declare namespace TGApp.Plugins.Hutao {
    * @description 获取武器搭配角色返回
    * @since Alpha v0.2.0
    * @see HutaoRequest.Abyss.weapon.getCollect
-   * @interface AbyssWeaponCollocationResponse
+   * @interface WeaponCollocationResponse
-   * @extends HutaoResponse
+   * @extends TGApp.Plugins.Hutao.Base.Response
-   * @property {AbyssWeaponCollocation[]} data - 武器搭配角色
+   * @property {WeaponCollocation[]} data - 武器搭配角色
    */
-  export interface AbyssWeaponCollocationResponse extends HutaoResponse {
+  export interface WeaponCollocationResponse extends TGApp.Plugins.Hutao.Base.Response {
-    data: AbyssWeaponCollocation[];
+    data: WeaponCollocation[];
   }
 
   /**
    * @description 武器搭配角色
    * @since Alpha v0.2.0
-   * @interface AbyssWeaponCollocation
+   * @interface WeaponCollocation
    * @property {number} weaponId - 武器ID
    * @property {number} avatars[].item - 角色ID
    * @property {number} avatars[].rate - 角色搭配率
-   * @return AbyssWeaponCollocation
+   * @return WeaponCollocation
    */
-  export interface AbyssWeaponCollocation {
+  export interface WeaponCollocation {
     weaponId: number;
     avatars: Array<{
       item: number;
@@ -368,27 +369,27 @@ declare namespace TGApp.Plugins.Hutao {
    * @description 获取队伍搭配返回
    * @since Alpha v0.2.0
    * @see HutaoRequest.Abyss.getTeamCollect
-   * @interface AbyssTeamCombinationResponse
+   * @interface TeamCombinationResponse
-   * @extends HutaoResponse
+   * @extends TGApp.Plugins.Hutao.Base.Response
-   * @property {AbyssTeamCombination[]} data - 队伍搭配
+   * @property {TeamCombination[]} data - 队伍搭配
-   * @return AbyssTeamCombinationResponse
+   * @return TeamCombinationResponse
    */
-  export interface AbyssTeamCombinationResponse extends HutaoResponse {
+  export interface TeamCombinationResponse extends TGApp.Plugins.Hutao.Base.Response {
-    data: AbyssTeamCombination[];
+    data: TeamCombination[];
   }
 
   /**
    * @description 队伍搭配
    * @since Alpha v0.2.0
-   * @interface AbyssTeamCombination
+   * @interface TeamCombination
    * @property {number} floor - 楼层
    * @property {string} up[].item - 角色ID // id,id,id,id
    * @property {number} up[].rate - 统计次数
    * @property {string} down[].item - 角色ID // id,id,id,id
    * @property {number} down[].rate - 统计次数
-   * @return AbyssTeamCombination
+   * @return TeamCombination
    */
-  export interface AbyssTeamCombination {
+  export interface TeamCombination {
     floor: number;
     up: Array<{
       item: string;

src/plugins/Hutao/types/Base.d.ts

@@ -0,0 +1,30 @@
+/**
+ * @file src plugins Hutao types Base.d.ts
+ * @description Hutao 插件基础类型定义文件
+ * @author BTMuli <bt-muli@outlook.com>
+ * @since Alpha v0.2.1
+ */
+
+/**
+ * @description Hutao 插件基础类型
+ * @since Alpha v0.2.1
+ * @namespace Base
+ * @exports TGApp.plugins.Hutao.Base
+ * @return Base
+ */
+declare namespace TGApp.Plugins.Hutao.Base {
+  /**
+   * @description Hutao Response 统一接口
+   * @since Alpha v0.2.1
+   * @interface Response
+   * @property {number} retcode 状态码
+   * @property {string} message 状态信息
+   * @property {any} data 数据
+   * @return Response
+   */
+  export interface Response {
+    retcode?: number;
+    message?: string;
+    data?: any;
+  }
+}

src/plugins/Hutao/utils/transLocal.ts

@@ -9,11 +9,11 @@
  * @description 将本地数据转为上传用的数据
  * @since Alpha v0.2.1
  * @param {TGApp.Sqlite.Abyss.SingleTable} data 本地数据
- * @returns {TGApp.Plugins.Hutao.AbyssRecordUpload} 上传用的数据
+ * @returns {TGApp.Plugins.Hutao.Abyss.RecordUpload} 上传用的数据
  */
 export function transLocal(
   data: TGApp.Sqlite.Abyss.SingleTable,
-): TGApp.Plugins.Hutao.AbyssRecordUpload {
+): TGApp.Plugins.Hutao.Abyss.RecordUpload {
   return {
     uid: data.uid,
     identity: "Tauri.Genshin",
@@ -27,9 +27,9 @@ export function transLocal(
  * @description 转换深渊数据
  * @since Alpha v0.2.1
  * @param {TGApp.Sqlite.Abyss.SingleTable} data 本地数据
- * @returns {TGApp.Plugins.Hutao.AbyssRecord} 上传用的数据
+ * @returns {TGApp.Plugins.Hutao.Abyss.RecordData} 上传用的数据
  */
-function transAbyss(data: TGApp.Sqlite.Abyss.SingleTable): TGApp.Plugins.Hutao.AbyssRecord {
+function transAbyss(data: TGApp.Sqlite.Abyss.SingleTable): TGApp.Plugins.Hutao.Abyss.RecordData {
   const damage: TGApp.Sqlite.Abyss.Character = JSON.parse(data.damageRank)[0];
   const takeDamage: TGApp.Sqlite.Abyss.Character = JSON.parse(data.takeDamageRank)[0];
   return {
@@ -52,9 +52,9 @@ function transAbyss(data: TGApp.Sqlite.Abyss.SingleTable): TGApp.Plugins.Hutao.A
  * @description 转换层数数据
  * @since Alpha v0.2.1
  * @param {TGApp.Sqlite.Abyss.Floor} data 本地数据
- * @returns {TGApp.Plugins.Hutao.AbyssFloor} 上传用的数据
+ * @returns {TGApp.Plugins.Hutao.Abyss.Floor} 上传用的数据
  */
-function transFloor(data: TGApp.Sqlite.Abyss.Floor): TGApp.Plugins.Hutao.AbyssFloor {
+function transFloor(data: TGApp.Sqlite.Abyss.Floor): TGApp.Plugins.Hutao.Abyss.Floor {
   return {
     index: data.id,
     star: data.winStar,
@@ -66,9 +66,9 @@ function transFloor(data: TGApp.Sqlite.Abyss.Floor): TGApp.Plugins.Hutao.AbyssFl
  * @description 转换层-关卡数据
  * @since Alpha v0.2.1
  * @param {TGApp.Sqlite.Abyss.Level} data 本地数据
- * @returns {TGApp.Plugins.Hutao.AbyssLevel} 上传用的数据
+ * @returns {TGApp.Plugins.Hutao.Abyss.Level} 上传用的数据
  */
-function transLevel(data: TGApp.Sqlite.Abyss.Level): TGApp.Plugins.Hutao.AbyssLevel {
+function transLevel(data: TGApp.Sqlite.Abyss.Level): TGApp.Plugins.Hutao.Abyss.Level {
   const battles: Array<{ index: number; avatars: number[] }> = [];
   battles.push({
     index: 1,
@@ -89,11 +89,11 @@ function transLevel(data: TGApp.Sqlite.Abyss.Level): TGApp.Plugins.Hutao.AbyssLe
  * @description 转换角色数据
  * @since Alpha v0.2.1
  * @param {TGApp.Sqlite.Character.UserRole[]} avatars 角色数据
- * @returns {TGApp.Plugins.Hutao.AbyssAvatar[]} 上传用的数据
+ * @returns {TGApp.Plugins.Hutao.Abyss.Avatar[]} 上传用的数据
  */
 export function transAvatars(
   avatars: TGApp.Sqlite.Character.UserRole[],
-): TGApp.Plugins.Hutao.AbyssAvatar[] {
+): TGApp.Plugins.Hutao.Abyss.Avatar[] {
   return avatars.map((avatar) => {
     const weapon: TGApp.Sqlite.Character.RoleWeapon = JSON.parse(avatar.weapon);
     let relics: number[];