dna-api 0.2.2 → 0.2.6

package/src/index.ts

@@ -1,27 +1,5 @@
 import * as forge from "node-forge"
 //#region const
-const MAIN_URL = "https://dnabbs-api.yingxiong.com"
-const LOGIN_URL = `${MAIN_URL}/user/sdkLogin`
-const GET_RSA_PUBLIC_KEY_URL = `${MAIN_URL}/config/getRsaPublicKey`
-const LOGIN_LOG_URL = `${MAIN_URL}/user/login/log`
-const ROLE_LIST_URL = `${MAIN_URL}/role/list`
-const ROLE_FOR_TOOL_URL = `${MAIN_URL}/role/defaultRoleForTool`
-const ROLE_DETAIL_URL = `${MAIN_URL}/role/getCharDetail`
-const WEAPON_DETAIL_URL = `${MAIN_URL}/weapon/detail`
-const SHORT_NOTE_URL = `${MAIN_URL}/role/getShortNoteInfo`
-const SIGN_CALENDAR_URL = `${MAIN_URL}/encourage/signin/show`
-const GAME_SIGN_URL = `${MAIN_URL}/encourage/signin/signin`
-const BBS_SIGN_URL = `${MAIN_URL}/user/signIn`
-const HAVE_SIGN_IN_URL = `${MAIN_URL}/user/haveSignInNew`
-const GET_TASK_PROCESS_URL = `${MAIN_URL}/encourage/level/getTaskProcess`
-const GET_POST_LIST_URL = `${MAIN_URL}/forum/list`
-const GET_POST_DETAIL_URL = `${MAIN_URL}/forum/getPostDetail`
-const LIKE_POST_URL = `${MAIN_URL}/forum/like`
-const SHARE_POST_URL = `${MAIN_URL}/encourage/level/shareTask`
-const REPLY_POST_URL = `${MAIN_URL}/forum/comment/createComment`
-const GET_GAME_CONFIG_URL = `${MAIN_URL}/config/getGameConfig`
-const ANN_LIST_URL = `${MAIN_URL}/user/mine`
-
 enum RespCode {
     ERROR = -999,
     OK_ZERO = 0,
@@ -37,10 +15,11 @@ const DNA_GAME_ID = 268
  * DNA API类，用于与DNA游戏服务器交互
  */
 export class DNAAPI {
-    public fetchFn: typeof fetch
+    public fetchFn?: typeof fetch
     public is_h5 = false
-    public rsa_public_key =
+    public RSA_PUBLIC_KEY =
         "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDGpdbezK+eknQZQzPOjp8mr/dP+QHwk8CRkQh6C6qFnfLH3tiyl0pnt3dePuFDnM1PUXGhCkQ157ePJCQgkDU2+mimDmXh0oLFn9zuWSp+U8uLSLX3t3PpJ8TmNCROfUDWvzdbnShqg7JfDmnrOJz49qd234W84nrfTHbzdqeigQIDAQAB"
+    public BASE_URL = "https://dnabbs-api.yingxiong.com/"
 
     /**
      * 构造函数
@@ -57,9 +36,9 @@ export class DNAAPI {
         public token = "",
         options: { fetchFn?: typeof fetch; is_h5?: boolean; rsa_public_key?: string } = {},
     ) {
-        this.fetchFn = options.fetchFn || fetch.bind(window)
+        this.fetchFn = options.fetchFn
         if (options.is_h5 !== undefined) this.is_h5 = options.is_h5
-        if (options.rsa_public_key !== undefined) this.rsa_public_key = options.rsa_public_key
+        if (options.rsa_public_key !== undefined) this.RSA_PUBLIC_KEY = options.rsa_public_key
     }
 
     /**
@@ -67,18 +46,18 @@ export class DNAAPI {
      * @returns RSA公钥(base64)
      */
     async getRsaPublicKey() {
-        if (this.rsa_public_key) {
-            return this.rsa_public_key
+        if (this.RSA_PUBLIC_KEY) {
+            return this.RSA_PUBLIC_KEY
         }
-        const res = await this._dna_request<{ key: string }>(GET_RSA_PUBLIC_KEY_URL)
+        const res = await this._dna_request<{ key: string }>("config/getRsaPublicKey")
 
         if (res.is_success && res.data) {
             const key = res.data.key
             if (typeof key === "string") {
-                this.rsa_public_key = key
+                this.RSA_PUBLIC_KEY = key
             }
         }
-        return this.rsa_public_key
+        return this.RSA_PUBLIC_KEY
     }
 
     /**
@@ -86,7 +65,7 @@ export class DNAAPI {
      */
     async login(mobile: string, code: string) {
         const data = { mobile, code, gameList: DNA_GAME_ID }
-        const res = await this._dna_request<DNALoginRes>(LOGIN_URL, data, { sign: true, refer: true })
+        const res = await this._dna_request<DNALoginRes>("user/sdkLogin", data, { sign: true, refer: true })
         if (res.is_success && res.data) {
             const data = res.data
             if (typeof data.token === "string") {
@@ -100,14 +79,14 @@ export class DNAAPI {
      * 获取登录日志
      */
     async loginLog() {
-        return await this._dna_request<DNALoginRes>(LOGIN_LOG_URL)
+        return await this._dna_request<DNALoginRes>("user/login/log")
     }
 
     /**
      * 获取角色列表
      */
     async getRoleList() {
-        return await this._dna_request<DNARoleListRes>(ROLE_LIST_URL)
+        return await this._dna_request<DNARoleListRes>("role/list")
     }
 
     /**
@@ -115,30 +94,30 @@ export class DNAAPI {
      */
     async getDefaultRoleForTool() {
         const data = { type: 1 }
-        return await this._dna_request<DNARoleForToolRes>(ROLE_FOR_TOOL_URL, data, { sign: true, token: true, tokenSig: true })
+        return await this._dna_request<DNARoleForToolRes>("role/defaultRoleForTool", data, { sign: true, token: true, tokenSig: true })
     }
 
     /**
      * 获取角色详情
      */
-    async getRoleDetail(char_id: string, char_eid: string) {
-        const data = { charId: char_id, charEid: char_eid, type: 1 }
-        return await this._dna_request<DNARoleDetailRes>(ROLE_DETAIL_URL, data)
+    async getCharDetail(char_id: string, char_eid: string, otherUserId?: string) {
+        const data = { charId: char_id, charEid: char_eid, type: 1, otherUserId } as any
+        return await this._dna_request<DNACharDetailRes>("role/getCharDetail", data)
     }
 
     /**
      * 获取武器详情
      */
-    async getWeaponDetail(weapon_id: string) {
-        const data = { weaponId: weapon_id, type: 1 }
-        return await this._dna_request<DNARoleDetailRes>(WEAPON_DETAIL_URL, data)
+    async getWeaponDetail(weapon_id: string, weapon_eid: string, otherUserId?: string) {
+        const data = { weaponId: weapon_id, weaponEid: weapon_eid, type: 1, otherUserId }
+        return await this._dna_request<DNAWeaponDetailRes>("role/getWeaponDetail", data)
     }
 
     /**
      * 获取角色简讯
      */
     async getShortNoteInfo() {
-        return await this._dna_request<DNARoleShortNoteRes>(SHORT_NOTE_URL)
+        return await this._dna_request<DNARoleShortNoteRes>("role/getShortNoteInfo")
     }
 
     /**
@@ -146,7 +125,7 @@ export class DNAAPI {
      */
     async haveSignIn() {
         const data = { gameId: DNA_GAME_ID }
-        return await this._dna_request<DNAHaveSignInRes>(HAVE_SIGN_IN_URL, data)
+        return await this._dna_request<DNAHaveSignInRes>("user/haveSignInNew", data)
     }
 
     /**
@@ -154,7 +133,12 @@ export class DNAAPI {
      */
     async signCalendar() {
         const data = { gameId: DNA_GAME_ID }
-        return await this._dna_request<DNACalendarSignRes>(SIGN_CALENDAR_URL, data)
+        return await this._dna_request<DNACalendarSignRes>("encourage/signin/show", data)
+    }
+
+    /** ? */
+    async soulTask() {
+        return await this._dna_request("role/soul/task")
     }
 
     /**
@@ -166,7 +150,7 @@ export class DNAAPI {
             periodId: period,
             signinType: 1,
         }
-        return await this._dna_request(GAME_SIGN_URL, data)
+        return await this._dna_request("encourage/signin/signin", data)
     }
 
     /**
@@ -174,7 +158,7 @@ export class DNAAPI {
      */
     async bbsSign() {
         const data = { gameId: DNA_GAME_ID }
-        return await this._dna_request(BBS_SIGN_URL, data)
+        return await this._dna_request("user/signIn", data)
     }
 
     /**
@@ -182,35 +166,309 @@ export class DNAAPI {
      */
     async getTaskProcess() {
         const data = { gameId: DNA_GAME_ID }
-        return await this._dna_request<DNATaskProcessRes>(GET_TASK_PROCESS_URL, data)
+        return await this._dna_request<DNATaskProcessRes>("encourage/level/getTaskProcess", data)
     }
 
     /**
      * 获取帖子列表
+     * @param forumId 论坛ID
+     * @param pageIndex 页码
+     * @param pageSize 每页数量
+     * @param searchType 搜索类型 1:最新 2:热门
+     * @param timeType 时间类型 0:全部 1:今日 2:本周 3:本月
+     * @returns 帖子列表
      */
-    async getPostList() {
+    async getPostList(forumId: number = 48, pageIndex: number = 1, pageSize: number = 20, searchType: number = 1, timeType: number = 0) {
         const data = {
-            forumId: 46, // 全部
+            forumId: forumId,
             gameId: DNA_GAME_ID,
-            pageIndex: 1,
-            pageSize: 20,
-            searchType: 1, // 1:最新 2:热门
-            timeType: 0,
+            pageIndex: pageIndex,
+            pageSize: pageSize,
+            searchType: searchType, // 1:最新 2:热门
+            timeType: timeType, // 0:全部 1:今日 2:本周 3:本月
+        }
+        return await this._dna_request<DNAPostListRes>("forum/list", data)
+    }
+
+    /** 管理员锁定帖子 */
+    async lockPost(post: { postId: number; gameId?: number; gameForumId: number; operateType: number }) {
+        const data = {
+            postId: post.postId,
+            gameId: post.gameId ?? DNA_GAME_ID,
+            gameForumId: post.gameForumId,
+            operateType: post.operateType,
+        }
+        return await this._dna_request("forum/moderator/postLock", data)
+    }
+
+    /** 管理员移动帖子 */
+    async postDownOrUp(post: { postId: number; gameId?: number; gameForumId: number; operateType: number }) {
+        const data = {
+            postId: post.postId,
+            gameId: post.gameId ?? DNA_GAME_ID,
+            gameForumId: post.gameForumId,
+            operateType: post.operateType,
+        }
+        return await this._dna_request("forum/moderator/postDownOrUp", data)
+    }
+
+    /** 管理员设精 */
+    async postElite(post: { postId: number; gameId?: number; gameForumId: number; operateType: number }) {
+        const data = {
+            postId: post.postId,
+            gameId: post.gameId ?? DNA_GAME_ID,
+            gameForumId: post.gameForumId,
+            operateType: post.operateType,
+        }
+        return await this._dna_request("forum/moderator/postElite", data)
+    }
+
+    /** 管理员隐藏帖子 */
+    async postHide(post: { postId: number; gameId?: number; gameForumId: number; operateType: number }) {
+        const data = {
+            postId: post.postId,
+            gameId: post.gameId ?? DNA_GAME_ID,
+            gameForumId: post.gameForumId,
+            operateType: post.operateType,
+        }
+        return await this._dna_request("forum/moderator/postHide", data)
+    }
+
+    /** 管理员设置权重 */
+    async reRank(post: { postId: number; gameId?: number; gameForumId: number }, weight: number) {
+        const data = {
+            postId: post.postId,
+            gameId: post.gameId ?? DNA_GAME_ID,
+            gameForumId: post.gameForumId,
+            weight: weight,
+        }
+        return await this._dna_request("forum/moderator/reRank", data)
+    }
+
+    /** 管理员设置强推 */
+    async strongRecommend(post: { postId: number; gameId?: number; gameForumId: number }, operateType = 1) {
+        const data = {
+            postId: post.postId,
+            gameId: post.gameId ?? DNA_GAME_ID,
+            gameForumId: post.gameForumId,
+            operateType: operateType,
+        }
+        return await this._dna_request("forum/moderator/setForceRecommend", data)
+    }
+
+    /** 管理员删帖 */
+    async adminDelete(post: { postId: number; gameId?: number; gameForumId: number }, content: string, reasonCode: number) {
+        const data = {
+            postId: post.postId,
+            gameId: post.gameId ?? DNA_GAME_ID,
+            gameForumId: post.gameForumId,
+            content: content,
+            reasonCode: reasonCode,
+        }
+        return await this._dna_request("forum/moderator/postDelete", data)
+    }
+    /** 管理员移动帖子 */
+    async adminMovePost(
+        post: { postId: number; gameId?: number; gameForumId: number },
+        newGameId: number,
+        newForumId: number,
+        newTopicIdStr: string,
+    ) {
+        const data = {
+            postId: post.postId,
+            gameId: post.gameId ?? DNA_GAME_ID,
+            gameForumId: post.gameForumId,
+            newGameId: newGameId,
+            newForumId: newForumId,
+            newTopicIdStr: newTopicIdStr,
+        }
+        return await this._dna_request("forum/moderator/postMove", data)
+    }
+    /** ? */
+    async adminRefreshTime(post: { postId: number; gameId?: number; gameForumId: number }, refresh: number) {
+        const data = {
+            postId: post.postId,
+            gameId: post.gameId ?? DNA_GAME_ID,
+            gameForumId: post.gameForumId,
+            refresh: refresh,
+        }
+        return await this._dna_request("forum/moderator/setRefresh", data)
+    }
+
+    /** 黑名单 */
+    async blockList() {
+        return await this._dna_request("user/block/list")
+    }
+
+    /** 拉黑 */
+    async blockOther(blockPostId: number, blockUserId: string, type: number) {
+        const data = {
+            blockPostId: blockPostId,
+            blockUserId: blockUserId,
+            type: type,
+        }
+        return await this._dna_request("user/block/list", data)
+    }
+
+    /** ? */
+    async viewCommunity() {
+        return await this._dna_request("encourage/level/viewCommunity")
+    }
+
+    /** ? */
+    async viewCount() {
+        return await this._dna_request("forum/viewCount")
+    }
+
+    /** ? */
+    async receiveLog(periodId: number, pageIndex: number, pageSize: number) {
+        const data = {
+            periodId: periodId,
+            pageIndex: pageIndex,
+            pageSize: pageSize,
+        }
+        return await this._dna_request("encourage/signin/receiveLog", data)
+    }
+
+    /** 收藏 */
+    async collect(postId: number, toUserId: string, operateType = 1) {
+        const data = {
+            operateType: operateType,
+            postId: postId,
+            toUserId: toUserId,
         }
-        return await this._dna_request<DNAPostListRes>(GET_POST_LIST_URL, data)
+        return await this._dna_request("forum/collect", data)
+    }
+
+    /** 删除评论 */
+    async commentDelete(
+        comment: { id: number; gameId: number; gameForumId: number },
+        entityType: number,
+        content: string,
+        reasonCode: number,
+    ) {
+        const data = {
+            id: comment.id,
+            gameId: comment.gameId,
+            gameForumId: comment.gameForumId,
+            entityType: entityType,
+            content: content,
+            reasonCode: reasonCode,
+        }
+        return await this._dna_request("forum/collect", data)
+    }
+
+    /** 推荐列表 */
+    async recommendList(recIndex: number, newIndex: number, size: number, history: number, gameId = DNA_GAME_ID) {
+        const data = {
+            gameId: gameId,
+            recIndex: recIndex,
+            newIndex: newIndex,
+            size: size,
+            history: history,
+        }
+        return await this._dna_request("forum/recommend/list", data)
+    }
+
+    /** 举报 */
+    async report(
+        { commentId = 0, postId = 0, replyId = 0 }: { commentId?: number; postId?: number; replyId?: number },
+        reportReason = 1,
+        reportType = 1,
+    ) {
+        const data = {
+            commentId: commentId,
+            postId: postId,
+            replyId: replyId,
+            reportReason: reportReason,
+            reportType: reportType,
+        }
+        return await this._dna_request<DNAPostListRes>("forum/recommend/list", data)
+    }
+    /** 搜索帖子 */
+    async searchPost(keyword: number, pageIndex: number, pageSize: number, gameId = DNA_GAME_ID, searchType = 1) {
+        const data = {
+            gameId: gameId,
+            keyword: keyword,
+            pageIndex: pageIndex,
+            pageSize: pageSize,
+            searchType: searchType,
+        }
+        return await this._dna_request<DNAPostListRes>("forum/searchPost", data)
+    }
+    /** 搜索帖子 */
+    async searchTopic(keyword: number, pageIndex: number, pageSize = 20, gameId = DNA_GAME_ID) {
+        const data = {
+            gameId: gameId,
+            keyword: keyword,
+            pageIndex: pageIndex,
+            pageSize: pageSize,
+        }
+        return await this._dna_request<DNAPostListRes>("config/searchTopic", data)
+    }
+
+    /** 搜索帖子 */
+    async searchUser(keyword: number, pageIndex: number, pageSize: number) {
+        const data = {
+            keyword: keyword,
+            pageIndex: pageIndex,
+            pageSize: pageSize,
+        }
+        return await this._dna_request<DNAPostListRes>("user/searchUser", data)
+    }
+
+    /**
+     * 获取帖子列表
+     * @param topicId 主题ID
+     * @param pageIndex 页码
+     * @param pageSize 每页数量
+     * @param searchType 搜索类型 1:最新 2:热门
+     * @param timeType 时间类型 0:全部 1:今日 2:本周 3:本月
+     * @returns 帖子列表
+     */
+    async getPostsByTopic(
+        topicId: number = 177,
+        pageIndex: number = 1,
+        pageSize: number = 20,
+        searchType: number = 1,
+        timeType: number = 0,
+    ) {
+        const data = {
+            topicId: topicId,
+            gameId: DNA_GAME_ID,
+            pageIndex: pageIndex,
+            pageSize: pageSize,
+            searchType: searchType, // 1:最新 2:热门
+            timeType: timeType, // 0:全部 1:今日 2:本周 3:本月
+        }
+        return await this._dna_request<DNAPostListRes>("forum/getPostByTopic", data)
     }
 
     /**
      * 获取帖子详情
+     * @param post_id 帖子ID
+     * @returns 帖子详情
      */
     async getPostDetail(post_id: string) {
         const data = { postId: post_id }
-        try {
-            return await this._dna_request<DNAPostDetailRes>(GET_POST_DETAIL_URL, data)
-        } catch (e) {
-            console.error("get_post_detail", e as Error)
-            return DNAApiResponse.err("请求皎皎角服务失败")
+        return await this._dna_request<DNAPostDetailRes>("forum/getPostDetail", data)
+    }
+
+    /** 关注用户 */
+    async doFollow(userId: string, unfollow?: boolean) {
+        const data = {
+            followUserId: userId,
+            operateType: unfollow ? 0 : 1,
         }
+        return await this._dna_request("user/followUser", data, { sign: true })
+    }
+
+    /** 获取关注状态 */
+    async getFollowState(userId: string) {
+        const data = {
+            followUserId: userId,
+        }
+        return await this._dna_request("user/isFollow", data)
     }
 
     /**
@@ -228,27 +486,38 @@ export class DNAAPI {
             postType: post.postType,
             toUserId: post.userId,
         }
-        try {
-            return await this._dna_request(LIKE_POST_URL, data)
-        } catch (e) {
-            console.error("do_like", e as Error)
-            return DNAApiResponse.err("请求皎皎角服务失败")
-        }
+        return await this._dna_request("forum/like", data)
     }
 
-    // 分享帖子
+    /** 分享帖子 */
     async doShare() {
         const data = { gameId: DNA_GAME_ID }
-        try {
-            return await this._dna_request(SHARE_POST_URL, data)
-        } catch (e) {
-            console.error("do_share", e as Error)
-            return DNAApiResponse.err("请求皎皎角服务失败")
+        return await this._dna_request("encourage/level/shareTask", data)
+    }
+
+    /** 回复帖子 */
+    async createComment(post: { userId: string; postId: string; gameForumId: number }, content: string) {
+        const content_json = JSON.stringify([
+            {
+                content,
+                contentType: "1",
+                imgHeight: 0,
+                imgWidth: 0,
+                url: "",
+            },
+        ])
+        const data = {
+            postId: post.postId,
+            forumId: post.gameForumId,
+            postType: "1",
+            content: content_json,
         }
+
+        return await this._dna_request("forum/comment/createComment", data, { sign: true, refer: true, params: { toUserId: post.userId } })
     }
 
-    // 回复帖子
-    async doReply(post: Record<string, any>, content: string) {
+    /** 回复评论 */
+    async createReply(post: { userId: string; postId: string; postCommentId: string; gameForumId: number }, content: string) {
         const content_json = JSON.stringify([
             {
                 content,
@@ -259,28 +528,72 @@ export class DNAAPI {
             },
         ])
         const data = {
+            content: content_json,
+            forumId: post.gameForumId,
+            postCommentId: post.postCommentId,
             postId: post.postId,
-            forumId: post.gameForumId || 47,
             postType: "1",
+            toUserId: post.userId,
+        }
+
+        return await this._dna_request("forum/comment/createReply", data, { sign: true, refer: true, params: { toUserId: post.userId } })
+    }
+
+    /** 回复评论的评论 */
+    async createReplyList(
+        post: { userId: string; postId: string; postCommentId: string; postCommentReplyId: string; gameForumId: number },
+        content: string,
+    ) {
+        const content_json = JSON.stringify([
+            {
+                content,
+                contentType: "1",
+                imgHeight: 0,
+                imgWidth: 0,
+                url: "",
+            },
+        ])
+        const data = {
             content: content_json,
+            forumId: post.gameForumId,
+            postCommentId: post.postCommentId,
+            postCommentReplyId: post.postCommentReplyId,
+            postId: post.postId,
+            postType: "1",
+            toUserId: post.userId,
         }
+        return await this._dna_request("forum/comment/createReply", data, { sign: true, refer: true, params: { toUserId: post.userId } })
+    }
 
-        return await this._dna_request(REPLY_POST_URL, data, { sign: true, refer: true, params: { toUserId: post.userId } })
+    /** 删 */
+    async deletePost(deleteType: number, id: number) {
+        return await this._dna_request("forum/more/delete", { deleteType, id }, { sign: true, refer: true })
     }
 
-    // 获取游戏公告列表
-    async getAnnList() {
+    /**
+     * 获取用户信息
+     * @returns 用户信息
+     */
+    async getOtherMine(userId = "709542994134436647") {
         const data = {
-            otherUserId: "709542994134436647",
+            otherUserId: userId,
             searchType: 1,
             type: 2,
         }
-        return await this._dna_request<DNAPostListRes>(ANN_LIST_URL, data)
+        return await this._dna_request<DNAMineRes>("user/mine", data)
+    }
+
+    /**
+     * 获取用户信息
+     * @returns 用户信息
+     */
+    async getMine() {
+        return await this._dna_request<DNAMineRes>("user/mine")
     }
 
     async getGameConfig() {
         const data = { gameId: DNA_GAME_ID }
-        return await this._dna_request<DNAGameConfigRes>(GET_GAME_CONFIG_URL, data)
+        return await this._dna_request<DNAGameConfigRes[]>("config/getGameConfig", data)
     }
 
     async getHeaders(options?: {
@@ -379,20 +692,31 @@ export class DNAAPI {
 
         for (let attempt = 0; attempt < max_retries; attempt++) {
             try {
+                let body: string = data
+                if (data && typeof data === "object") {
+                    const p = new URLSearchParams()
+                    Object.entries(data).forEach(([key, value]) => {
+                        if (value !== undefined) p.append(key, String(value))
+                    })
+                    body = p.toString()
+                }
                 const fetchOptions: RequestInit = {
                     method,
                     headers,
-                    body: data,
+                    body,
                 }
 
                 // 实现超时控制
                 const controller = new AbortController()
                 const timeoutId = setTimeout(() => controller.abort(), timeout)
 
-                const response = await this.fetchFn(url, {
+                const initOptions = {
                     ...fetchOptions,
                     signal: controller.signal,
-                })
+                }
+                const response = this.fetchFn
+                    ? await this.fetchFn(`${this.BASE_URL}${url}`, initOptions)
+                    : await fetch(`${this.BASE_URL}${url}`, initOptions)
                 clearTimeout(timeoutId)
 
                 // 获取响应头的 content-type
@@ -420,9 +744,6 @@ export class DNAAPI {
                     }
                 }
 
-                console.debug(
-                    `[DNA] url:[${url}] headers:[${JSON.stringify(headers)}] data:[${JSON.stringify(data)}] raw_res:${JSON.stringify(raw_res)}`,
-                )
                 return new DNAApiResponse<T>(raw_res)
             } catch (e) {
                 console.error(`请求失败: ${(e as Error).message}`)
@@ -436,50 +757,141 @@ export class DNAAPI {
     }
 }
 
+enum DNAInstanceMHType {
+    "角色" = "role",
+    "武器" = "weapon",
+    "魔之楔" = "mzx",
+    "role" = "角色",
+    "weapon" = "武器",
+    "mzx" = "魔之楔",
+}
+
+export function getDNAInstanceMHType(key: keyof typeof DNAInstanceMHType) {
+    return DNAInstanceMHType[key]
+}
+
 //#region 接口定义
 
+export interface DNAMineRes {
+    mine: DNAMine
+    postList: DNAPost[]
+    hasNext: number
+}
+
+export interface DNAMine {
+    /** 文章数量 */
+    articleCount: number
+    /** 收藏数量 */
+    collectCount: number
+    /** 评论数量 */
+    commentCount: number
+    /** 粉丝数量 */
+    fansCount: number
+    /** 新粉丝数量 */
+    fansNewCount: number
+    /** 关注数量 */
+    followCount: number
+    /** 性别 */
+    gender: number
+    /** 精华数量 */
+    goldNum: number
+    /** 头像 */
+    headUrl: string
+    /** 是否关注 */
+    isFollow: number
+    /** 是否登录用户 */
+    isLoginUser: number
+    /** 是否被禁言 */
+    isMute: number
+    /** 等级 */
+    levelTotal: number
+    /** 点赞数量 */
+    likeCount: number
+    /** 手机号 */
+    mobile: string
+    /** 管理员列表 */
+    moderatorVos: any[]
+    /** 帖子数量 */
+    postCount: number
+    /** 注册时间 */
+    registerTime: string
+    /** 状态 */
+    status: number
+    /** 趋势数量 */
+    trendCount: number
+    /** 用户ID */
+    userId: string
+    /** 用户名 */
+    userName: string
+}
+
 export interface DNAGameConfigRes {
-    /** 游戏背景图 */
-    backgroundUrl: string
-    /** 游戏封面图 */
-    coverUrl: string
-    /** 默认游戏 */
-    gameDefault: number
+    /** 游戏所有板块列表 */
+    gameAllForumList: GameForum[]
     /** 游戏ID */
     gameId: number
+    /** 游戏板块图片列表 */
+    gameForumPictureList: any[]
+    /** 游戏板块列表 */
+    gameForumList: GameForum[]
+    /** 签到按钮图片 */
+    signBtn: string
+    sort: number
+    /** 话题列表 */
+    topicList: GameTopic[]
+    /** 背景图片 */
+    drawBackgroundUrl: string
+    /** 是否默认游戏 */
+    gameDefault: number
+    /** 签到颜色 */
+    signColor: string
     /** 游戏名称 */
     gameName: string
-    /** 游戏描述 */
-    gameDesc: string
-    gameForumList: GameForum[] // gameConfig
-    gameAllForumList: GameForum[] // gameAllForumList
-    /** 游戏板块图片列表 */
-    gameForumPictureList: unknown[]
-    /** 游戏Wiki列表 */
-    gameWikiVoList: GameWikiVo[]
+    /** CM图片2 意味不明 */
+    drawListUrl: string
+    /** 英文站点 */
+    configTab: ConfigTab[]
 }
 
-export interface GameWikiVo {
-    id: number
-    iconUrl: string
-    param: {
-        postId: string
-        topicId: string
-    }
-    postId: string
-    toAppAndroid: string
+export interface ConfigTab {
+    name: string
     url: string
-    wikiName: string
-    wikiType: number
 }
 
-export interface GameForum {
-    /** 游戏ID */
+export interface GameTopic {
+    /** 话题背景图片 */
+    backgroundUrl: string
     gameId: number
-    /** 板块ID */
-    forumId: number
+    /** 话题图标 */
+    topicIconUrl: string
+    topicId: number
+    /** 话题名称 */
+    topicName: string
+    sort: number
+    /** 话题描述 */
+    topicDesc: string
+}
+
+export interface GameForum {
+    /** 全部=1 普通=3 */
+    forumDataType: number
+    /** 固定1 */
+    forumUiType: number
+    /** 小红点 */
+    isTrend: number
+    /** 夜间模式图标 */
+    iconWhiteUrl: string
+    /** 固定1 */
+    forumType: number
     /** 板块名称 */
-    forumName: string
+    name: string
+    forumListShowType: number
+    /** 图标 */
+    iconUrl: string
+    id: number
+    sort: number
+    /** 官方 */
+    isOfficial: number
 }
 
 export interface UserGame {
@@ -527,31 +939,18 @@ export interface DNARoleListRes {
 
 /** 密函 */
 export interface DNARoleForToolInstance {
-    id: number // id
-    name: string // name
+    id: number
+    /** 中文 */
+    name: string
     /** 密函编码 */
     code: string
-    on: number // 0
-}
-
-enum DNAInstanceMHType {
-    "角色" = "role",
-    "武器" = "weapon",
-    "魔之楔" = "mzx",
-    "role" = "角色",
-    "weapon" = "武器",
-    "mzx" = "魔之楔",
-}
-
-export function getDNAInstanceMHType(key: keyof typeof DNAInstanceMHType) {
-    return DNAInstanceMHType[key]
+    /** 固定0 */
+    on: number
 }
 
 export interface DNARoleForToolInstanceInfo {
     /** 密函列表 */
     instances: DNARoleForToolInstance[] // instances
-    /** 密函类型 */
-    mh_type?: DNAInstanceMHType // 密函类型
 }
 
 export interface DraftDoingInfo {
@@ -593,7 +992,9 @@ export interface DNARoleShortNoteRes {
     draftInfo: DraftInfo
 }
 
-export interface WeaponInsForTool {
+export interface DNARoleWeapon {
+    weaponId: number
+    weaponEid: string
     /** 武器类型图标 */
     elementIcon: string
     /** 武器图标 */
@@ -602,16 +1003,15 @@ export interface WeaponInsForTool {
     level: number
     /** 武器名称 */
     name: string
+    /** 精炼等级 */
+    skillLevel: number
     /** 是否解锁 */
     unLocked: boolean
-    weaponEid?: string
-    weaponId: number
 }
 
-export interface RoleInsForTool {
-    charEid?: string
-    /** 角色id */
+export interface DNARoleChar {
     charId: number
+    charEid: string
     /** 元素图标 */
     elementIcon: string
     /** 命座等级 */
@@ -626,47 +1026,47 @@ export interface RoleInsForTool {
     unLocked: boolean
 }
 
-export interface RoleAchievement {
-    paramKey: string // paramKey
-    paramValue: string // paramValue
+export interface DNARoleForToolRes {
+    /** 角色信息 */
+    roleInfo: DNARoleInfo
+    /** 密函 */
+    instanceInfo: DNARoleForToolInstanceInfo[]
 }
 
-export interface RoleShowForTool {
+export interface DNARoleShow {
     /** 角色列表 */
-    roleChars: RoleInsForTool[]
+    roleChars: DNARoleChar[]
     /** 武器列表 */
-    langRangeWeapons: WeaponInsForTool[]
+    langRangeWeapons: DNARoleWeapon[]
     /** 武器列表 */
-    closeWeapons: WeaponInsForTool[]
+    closeWeapons: DNARoleWeapon[]
     /** 角色头像 */
     headUrl: string
     /** 等级 */
     level: number
     /** 成就列表 */
-    params: RoleAchievement[]
+    params: DNARoleAchievement[]
     /** 角色id */
     roleId: string
     /** 角色名称 */
     roleName: string
     /** 迷津 */
-    rougeLikeInfo: RougeLikeInfo
+    rougeLikeInfo: DNARougeLikeInfo
 }
 
-export interface RoleInfoForTool {
-    /** 深渊信息 */
-    abyssInfo: AbyssInfo
-    /** 角色信息 */
-    roleShow: RoleShowForTool
+export interface DNARoleAchievement {
+    paramKey: string // paramKey
+    paramValue: string // paramValue
 }
 
-export interface DNARoleForToolRes {
+export interface DNARoleInfo {
+    /** 深渊信息 */
+    abyssInfo: DNAAbyssInfo
     /** 角色信息 */
-    roleInfo: RoleInfoForTool
-    /** 密函 */
-    instanceInfo: DNARoleForToolInstanceInfo[]
+    roleShow: DNARoleShow
 }
 
-export interface RougeLikeInfo {
+export interface DNARougeLikeInfo {
     /** 最大通过等级 */
     maxPassed: number
     /** 最大通过等级名称 */
@@ -678,17 +1078,17 @@ export interface RougeLikeInfo {
     /** 奖励总数 */
     rewardTotal: number
     /** 天赋信息 */
-    talentInfo: RougeLikeTalentInfo[]
+    talentInfo: DNARougeLikeTalentInfo[]
 }
 
-export interface RougeLikeTalentInfo {
+export interface DNARougeLikeTalentInfo {
     cur: string
     max: string
 }
 
-export interface AbyssInfo {
-    /** 最佳时间 */
-    bestTimeVo1: BestTimeVo1
+export interface DNAAbyssInfo {
+    /** 阵容 */
+    bestTimeVo1: DNABestTimeVo1
     /** 结束时间 */
     endTime: string
     /** 操作名称 */
@@ -701,7 +1101,8 @@ export interface AbyssInfo {
     startTime: string
 }
 
-export interface BestTimeVo1 {
+/** 深渊阵容 */
+export interface DNABestTimeVo1 {
     /** 角色图标 */
     charIcon: string
     /** 近战武器图标 */
@@ -710,13 +1111,18 @@ export interface BestTimeVo1 {
     langRangeWeaponIcon: string
     /** 魔灵图标 */
     petIcon: string
+    /** 协战角色图标1 */
     phantomCharIcon1: string
-    phantomCharIcon2: string
+    /** 协战武器图标1 */
     phantomWeaponIcon1: string
+    /** 协战角色图标2 */
+    phantomCharIcon2: string
+    /** 协战武器图标2 */
     phantomWeaponIcon2: string
 }
 
-export interface RoleAttribute {
+/** 角色属性 */
+export interface DNACharAttribute {
     /** 技能范围 */
     skillRange: string
     /** 强化值 */
@@ -726,7 +1132,7 @@ export interface RoleAttribute {
     /** 武器精通 */
     weaponTags: string[]
     /** 防御 */
-    defense: number
+    def: number
     /** 仇恨值 */
     enmityValue: string
     /** 技能效益 */
@@ -743,7 +1149,8 @@ export interface RoleAttribute {
     maxSp: number
 }
 
-export interface RoleSkill {
+/** 角色技能 */
+export interface DNARoleSkill {
     /** 技能id */
     skillId: number
     /** 技能图标 */
@@ -754,14 +1161,16 @@ export interface RoleSkill {
     skillName: string
 }
 
-export interface RoleTrace {
+/** 溯源 */
+export interface DNARoleTrace {
     /** 溯源图标 */
     icon: string
     /** 溯源描述 */
     description: string
 }
 
-export interface Mode {
+/** 魔之楔 */
+export interface DNARoleMod {
     /** id 没佩戴为-1 */
     id: number
     /** 图标 */
@@ -772,11 +1181,12 @@ export interface Mode {
     name?: string
 }
 
-export interface RoleDetail {
+export interface DNACharDetail {
+    charId: number
     /** 角色属性 */
-    attribute: RoleAttribute
+    attribute: DNACharAttribute
     /** 角色技能 */
-    skills: RoleSkill[]
+    skills: DNARoleSkill[]
     /** 立绘 */
     paint: string
     /** 角色名称 */
@@ -784,7 +1194,7 @@ export interface RoleDetail {
     /** 元素图标 */
     elementIcon: string
     /** 溯源 */
-    traces: RoleTrace[]
+    traces: DNARoleTrace[]
     /** 当前魔之楔 */
     currentVolume: number
     /** 最大魔之楔 */
@@ -797,13 +1207,41 @@ export interface RoleDetail {
     gradeLevel: number
     /** 元素名称 */
     elementName: string
-    /** mode */
-    modes: Mode[]
+    /** 魔之楔列表 */
+    modes: DNARoleMod[]
 }
 
-export interface DNARoleDetailRes {
+export interface DNACharDetailRes {
     /** 角色详情 */
-    charDetail: RoleDetail
+    charDetail: DNACharDetail
+}
+
+export interface DNAWeaponDetailRes {
+    /** 武器详情 */
+    weaponDetail: DNAWeaponDetail
+}
+
+export interface DNAWeaponDetail {
+    attribute: DNAWeaponAttribute
+    currentVolume: number
+    description: string
+    elementIcon: string
+    elementName: string
+    icon: string
+    id: number
+    level: number
+    modes: DNARoleMod[]
+    name: string
+    skillLevel: number
+    sumVolume: number
+}
+
+export interface DNAWeaponAttribute {
+    atk: number
+    crd: number
+    cri: number
+    speed: number
+    trigger: number
 }
 
 export interface DNADayAward {
@@ -876,24 +1314,200 @@ export interface DNATaskProcessRes {
     dailyTask: DNABBSTask[] // dailyTask
 }
 
-export interface DNAPostListRes {
-    postList: DNAPost[] // posts
+export interface DNATopicPostListRes {
+    postList: DNAPost[]
+    topic: DNATopicDetail
+    hasNext: number
+}
+
+export interface DNATopicDetail {
+    backgroundUrl: string
+    gameId: number
+    sort: number
+    topicDesc: string
+    topicIconUrl: string
+    topicId: number
+    topicName: string
 }
 
 export interface DNAPost {
-    postId: number // postId
-    title: string // title
+    browseCount: string
+    collectionCount: number
+    commentCount: number
+    gameForumId: number
+    gameId: number
+    gameName: string
+    imgContent: DNAPostImgContent[]
+    imgCount: number
+    isCollect: number
+    isCreator: number
+    isElite: number
+    isFollow: number
+    isLike: number
+    isLock: number
+    isOfficial: number
+    isPublisher: number
+    likeCount: number
+    postContent: string
+    postCover: string
+    postCoverVo: DNAPostCoverVo
+    postId: string
+    postStatus: number
+    postTitle: string
+    postType: number
+    showTime: string
+    topics: DNATopicShort[]
+    userHeadUrl: string
+    userId: string
+    userLevel: number
+    userModeratorIdentity: number
+    userName: string
+}
+
+export interface DNATopicShort {
+    topicId: number
+    topicName: string
+}
+
+export interface DNAPostCoverVo {
+    imgHeight: number
+    imgWidth: number
+}
+
+export interface DNAPostImgContent {
+    imgHeight: number
+    imgWidth: number
+    url: string
+    isAbnormal?: boolean
+}
+
+export interface DNAPostListRes {
+    postList: DNAPost[] // posts
+    topList: any[]
+    hasNext: number
 }
 
 export interface DNAPostDetailRes {
-    postDetail: DNAPostDetail // post
+    isHotCount: boolean
+    gameId: number
+    isFollow: number
+    isLike: number
+    postDetail: DNAPostDetail
+    isCollect: number
+    hasNext: number
+    comment: DNAComment[]
 }
 
 export interface DNAPostDetail {
-    postId: number // postId
-    postTime: number // postTime
-    postContent: DNAPostContent[] // postContent
-    title: string // title
+    auditStatus: number
+    browseCount: string
+    checkStatus: number
+    collectionCount: number
+    commentCount: number
+    gameForumId: number
+    gameForumVo: DNAGameForumVo
+    gameId: number
+    gameName: string
+    headCodeUrl: string
+    id: string
+    isCreator: number
+    isElite: number
+    isForceRecommend: number
+    isHide: number
+    isLock: number
+    isMine: number
+    isOfficial: number
+    isRecommend: number
+    isTop: number
+    lastEditorTime?: string
+    likeCount: number
+    postContent: DNAPostContent[]
+    postH5Content: string
+    postTime: string
+    postTitle: string
+    postType: number
+    postUserId: string
+    refreshHour: number
+    score: number
+    topics: DNATopicShort[]
+    userHeadCode: string
+    userLevel: number
+    userModeratorIdentity: number
+    userName: string
+    whiteUrl: any[]
+}
+
+export interface DNAPostContent {
+    contentType: PostContentType
+    imgHeight: number
+    imgWidth: number
+    url?: string
+    content?: string
+    contentVideo?: DNAPostContentVideo
+}
+
+export interface DNAComment {
+    checkStatus: number
+    commentContent: DNAPostContent[]
+    commentId: string
+    commentTime: string
+    contentTextStatus: number
+    floor: number
+    isCreator: number
+    isLike: number
+    isMine: number
+    isOfficial: number
+    isPublisher: number
+    likeCount: number
+    replyCount: number
+    replyVos: DNAReplyVos[]
+    userHeadCode?: string
+    userHeadUrl: string
+    userId: string
+    userLevel: number
+    userModeratorIdentity: number
+    userName: string
+}
+
+export interface DNAReplyVos {
+    checkStatus: number
+    contentTextStatus: number
+    createTime: number
+    isCreator: number
+    isLike: number
+    isMine: number
+    isOfficial: number
+    isPublisher: number
+    likeCount: number
+    postCommentId: string
+    postCommentReplayId: string
+    replyContent: DNAPostContent[]
+    replyContentStr: string
+    replyId: string
+    replyTime: string
+    toUserIsCreator: number
+    toUserModeratorIdentity: number
+    toUserName: string
+    userHeadCode?: string
+    userHeadUrl: string
+    userId: string
+    userLevel: number
+    userModeratorIdentity: number
+    userName: string
+}
+
+export interface DNAGameForumVo {
+    forumDataType: number
+    forumListShowType: number
+    forumType: number
+    forumUiType: number
+    iconUrl: string
+    iconWhiteUrl: string
+    id: number
+    isOfficial: number
+    isTrend: number
+    name: string
+    sort: number
 }
 
 export enum PostContentType {
@@ -902,26 +1516,11 @@ export enum PostContentType {
     VIDEO = 5,
 }
 
-export interface DNAPostContent {
-    contentType: PostContentType // content
-    content: string // content
-    url?: string // url
-    contentVideo?: DNAPostContentVideo // contentVideo
-}
-
 export interface DNAPostContentVideo {
     videoUrl: string // videoUrl
     coverUrl?: string // coverUrl
 }
 
-// interface DNAWikiDetail {
-//     name: string // name
-// }
-
-// interface DNAWikiRes {
-//     wikis: DNAWikiDetail[] // wikis
-// }
-
 class DNAApiResponse<T = any> {
     code: number = 0
     msg: string = ""