@ikenxuan/amagi 3.2.2 → 3.2.4

package/lib/server/client.d.ts

@@ -1,24 +1,15 @@
 import { DouyinDataOptionsMap, BilibiliDataOptionsMap } from '../types/index.js'
-import { FastifyInstance } from 'fastify'
-interface initClientParams {
-    /** 抖音ck */
-    douyin?: string;
-    /** B站ck */
-    bilibili?: string;
-}
-interface AmagiInstance {
-    /** Fastify 实例 */
-    Instance: FastifyInstance;
+export interface initClientParams {
     /**
-     * amagi.getDouyinData 可能在未来版本废弃，建议直接导入 getDouyinData 方法使用
-     * @deprecated
+     * 抖音ck
+     * @default ''
      */
-    getDouyinData: <T extends keyof DouyinDataOptionsMap>(type: T, options?: DouyinDataOptionsMap[T]) => Promise<any>;
+    douyin?: string;
     /**
-     * amagi.getBilibiliData 可能在未来版本废弃，建议直接导入 getBilibiliData 方法使用
-     * @deprecated
+     * B站ck
+     * @default ''
      */
-    getBilibiliData: <T extends keyof BilibiliDataOptionsMap>(type: T, options?: BilibiliDataOptionsMap[T]) => Promise<any>;
+    bilibili?: string;
 }
 export declare class amagi {
   private douyin
@@ -34,8 +25,19 @@ export declare class amagi {
      * @default port 4567
      * @returns
      */
-  startClient(port?: number): AmagiInstance;
-  getDouyinData: <T extends keyof DouyinDataOptionsMap>(type: T, options?: DouyinDataOptionsMap[T]) => Promise<any>
-  getBilibiliData: <T extends keyof BilibiliDataOptionsMap>(type: T, options?: BilibiliDataOptionsMap[T]) => Promise<any>
+  startClient(port?: number): import("fastify").FastifyInstance<import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>, import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>, import("fastify").FastifyBaseLogger, import("fastify").FastifyTypeProviderDefault> & PromiseLike<import("fastify").FastifyInstance<import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>, import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>, import("fastify").FastifyBaseLogger, import("fastify").FastifyTypeProviderDefault>>;
+  /**
+     * 获取抖音数据
+     * @param type 请求数据类型
+     * @param options 请求参数，是一个对象
+     * @returns 返回接口的原始数据，失败返回false
+     */
+  getDouyinData: <T extends keyof DouyinDataOptionsMap = keyof DouyinDataOptionsMap>(type: T, options?: DouyinDataOptionsMap[T]) => Promise<boolean | any>
+  /**
+     * 获取B站数据
+     * @param type 请求数据类型
+     * @param options 请求参数，是一个对象
+     * @returns 返回接口的原始数据，失败返回false
+     */
+  getBilibiliData: <T extends keyof BilibiliDataOptionsMap = keyof BilibiliDataOptionsMap>(type: T, options?: BilibiliDataOptionsMap[T]) => Promise<boolean | any>
 }
-export {}

package/lib/server/client.js

@@ -1,5 +1,5 @@
-import { BilibiliResult } from '../business/bilibili/index.js'
-import { DouyinResult } from '../business/douyin/index.js'
+import { bilibiliResult } from '../business/bilibili/index.js'
+import { douyinResult } from '../business/douyin/index.js'
 import { getDouyinData, getBilibiliData } from '../model/DataFetchers.js'
 import Fastify from 'fastify'
 import { logger } from '../model/index.js'
@@ -15,7 +15,6 @@ export class amagi {
     this.douyin = data.douyin || ''
     /** B站ck */
     this.bilibili = data.bilibili || ''
-    /** 小红书ck */
   }
   /**
      *
@@ -44,175 +43,175 @@ export class amagi {
       reply.redirect('https://amagi.apifox.cn', 301)
     })
     Client.get('/api/douyin/fetch_one_work', async (request, reply) => {
-      reply.type('application/json').send(await DouyinResult({
+      reply.type('application/json').send(await douyinResult({
         type: "\u5355\u4E2A\u89C6\u9891\u4F5C\u54C1\u6570\u636E" /* DouyinDataType.单个视频作品数据 */,
         cookie: this.douyin
       }, { url: request.query.url }))
     })
     Client.get('/api/douyin/fetch_work_comments', async (request, reply) => {
-      reply.type('application/json').send(await DouyinResult({
+      reply.type('application/json').send(await douyinResult({
         type: "\u8BC4\u8BBA\u6570\u636E" /* DouyinDataType.评论数据 */,
         cookie: this.douyin
       }, { url: request.query.url }))
     })
     Client.get('/api/douyin/fetch_video_comment_replies', async (request, reply) => {
-      reply.type('application/json').send(await DouyinResult({
+      reply.type('application/json').send(await douyinResult({
         type: "\u4E8C\u7EA7\u8BC4\u8BBA\u6570\u636E" /* DouyinDataType.二级评论数据 */,
         cookie: this.douyin
       }, { aweme_id: request.query.aweme_id, comment_id: request.query.comment_id }))
     })
     Client.get('/api/douyin/fetch_user_info', async (request, reply) => {
-      reply.type('application/json').send(await DouyinResult({
+      reply.type('application/json').send(await douyinResult({
         type: "\u7528\u6237\u4E3B\u9875\u6570\u636E" /* DouyinDataType.用户主页数据 */,
         cookie: this.douyin
       }, { sec_uid: request.query.sec_uid }))
     })
     Client.get('/api/douyin/fetch_user_post_videos', async (request, reply) => {
-      reply.type('application/json').send(await DouyinResult({
+      reply.type('application/json').send(await douyinResult({
         type: "\u7528\u6237\u4E3B\u9875\u89C6\u9891\u5217\u8868\u6570\u636E" /* DouyinDataType.用户主页视频列表数据 */,
         cookie: this.douyin
       }, { sec_uid: request.query.sec_uid }))
     })
     Client.get('/api/douyin/fetch_suggest_words', async (request, reply) => {
-      reply.type('application/json').send(await DouyinResult({
+      reply.type('application/json').send(await douyinResult({
         type: "\u70ED\u70B9\u8BCD\u6570\u636E" /* DouyinDataType.热点词数据 */,
         cookie: this.douyin
       }, { query: request.query.query }))
     })
     Client.get('/api/douyin/fetch_search_info', async (request, reply) => {
-      reply.type('application/json').send(await DouyinResult({
+      reply.type('application/json').send(await douyinResult({
         type: "\u641C\u7D22\u6570\u636E" /* DouyinDataType.搜索数据 */,
         cookie: this.douyin
       }, { query: request.query.query }))
     })
     Client.get('/api/douyin/fetch_emoji_list', async (_request, reply) => {
-      reply.type('application/json').send(await DouyinResult({
+      reply.type('application/json').send(await douyinResult({
         type: "\u5B98\u65B9emoji\u6570\u636E" /* DouyinDataType.官方emoji数据 */,
         cookie: this.douyin
       }))
     })
     Client.get('/api/douyin/fetch_emoji_pro_list', async (_request, reply) => {
-      reply.type('application/json').send(await DouyinResult({
+      reply.type('application/json').send(await douyinResult({
         type: "\u52A8\u6001\u8868\u60C5\u6570\u636E" /* DouyinDataType.动态表情数据 */,
         cookie: this.douyin
       }))
     })
     Client.get('/api/douyin/fetch_music_work', async (request, reply) => {
-      reply.type('application/json').send(await DouyinResult({
+      reply.type('application/json').send(await douyinResult({
         type: "\u97F3\u4E50\u6570\u636E" /* DouyinDataType.音乐数据 */,
         cookie: this.douyin
       }, { music_id: request.query.music_id }))
     })
     Client.get('/api/douyin/fetch_user_mix_videos', async (request, reply) => {
-      reply.type('application/json').send(await DouyinResult({
+      reply.type('application/json').send(await douyinResult({
         type: "\u5B9E\u51B5\u56FE\u7247\u56FE\u96C6\u6570\u636E" /* DouyinDataType.实况图片图集数据 */,
         cookie: this.douyin
       }, { url: request.query.url }))
     })
     Client.get('/api/douyin/fetch_user_live_videos', async (request, reply) => {
-      reply.type('application/json').send(await DouyinResult({
+      reply.type('application/json').send(await douyinResult({
         type: "\u76F4\u64AD\u95F4\u4FE1\u606F\u6570\u636E" /* DouyinDataType.直播间信息数据 */,
         cookie: this.douyin
       }, { sec_uid: request.query.sec_uid }))
     })
     Client.get('/api/bilibili/new_login_qrcode', async (request, reply) => {
-      reply.type('application/json').send(await BilibiliResult({
+      reply.type('application/json').send(await bilibiliResult({
         type: "\u7533\u8BF7\u4E8C\u7EF4\u7801" /* BilibiliDataType.申请二维码 */,
         cookie: ''
       }, {}))
     })
     Client.get('/api/bilibili/check_qrcode', async (request, reply) => {
-      reply.type('application/json').send(await BilibiliResult({
+      reply.type('application/json').send(await bilibiliResult({
         type: "\u4E8C\u7EF4\u7801\u72B6\u6001" /* BilibiliDataType.二维码状态 */,
         cookie: ''
       }, { qrcode_key: request.query.qrcode_key }))
     })
     Client.get('/api/bilibili/login_basic_info', async (request, reply) => {
-      reply.type('application/json').send(await BilibiliResult({
+      reply.type('application/json').send(await bilibiliResult({
         type: "\u767B\u5F55\u57FA\u672C\u4FE1\u606F" /* BilibiliDataType.登录基本信息 */,
         cookie: request.headers.cookie
       }, {}))
     })
     Client.get('/api/bilibili/fetch_one_video', async (request, reply) => {
-      reply.type('application/json').send(await BilibiliResult({
+      reply.type('application/json').send(await bilibiliResult({
         type: "\u5355\u4E2A\u89C6\u9891\u4F5C\u54C1\u6570\u636E" /* BilibiliDataType.单个视频作品数据 */,
         cookie: this.bilibili
       }, { url: request.query.url }))
     })
     Client.get('/api/bilibili/fetch_video_playurl', async (request, reply) => {
-      reply.type('application/json').send(await BilibiliResult({
+      reply.type('application/json').send(await bilibiliResult({
         type: "\u5355\u4E2A\u89C6\u9891\u4E0B\u8F7D\u4FE1\u606F\u6570\u636E" /* BilibiliDataType.单个视频下载信息数据 */,
         cookie: this.bilibili
       }, { avid: request.query.avid, cid: request.query.cid }))
     })
     Client.get('/api/bilibili/fetch_work_comments', async (request, reply) => {
-      reply.type('application/json').send(await BilibiliResult({
+      reply.type('application/json').send(await bilibiliResult({
         type: "\u8BC4\u8BBA\u6570\u636E" /* BilibiliDataType.评论数据 */,
         cookie: this.bilibili
       }, { oid: Number(request.query.oid), number: Number(request.query.number), type: Number(request.query.type || 1) }))
     })
     Client.get('/api/bilibili/fetch_emoji_list', async (_request, reply) => {
-      reply.type('application/json').send(await BilibiliResult({
+      reply.type('application/json').send(await bilibiliResult({
         type: "emoji\u6570\u636E" /* BilibiliDataType.emoji数据 */,
         cookie: this.bilibili
       }, {}))
     })
     Client.get('/api/bilibili/fetch_bangumi_video_info', async (request, reply) => {
-      reply.type('application/json').send(await BilibiliResult({
+      reply.type('application/json').send(await bilibiliResult({
         type: "\u756A\u5267\u57FA\u672C\u4FE1\u606F\u6570\u636E" /* BilibiliDataType.番剧基本信息数据 */,
         cookie: this.bilibili
       }, { url: request.query.url }))
     })
     Client.get('/api/bilibili/fetch_bangumi_video_playurl', async (request, reply) => {
-      reply.type('application/json').send(await BilibiliResult({
+      reply.type('application/json').send(await bilibiliResult({
         type: "\u756A\u5267\u4E0B\u8F7D\u4FE1\u606F\u6570\u636E" /* BilibiliDataType.番剧下载信息数据 */,
         cookie: this.bilibili
       }, { cid: request.query.cid, ep_id: request.query.ep_id }))
     })
     Client.get('/api/bilibili/fetch_user_dynamic', async (request, reply) => {
-      reply.type('application/json').send(await BilibiliResult({
+      reply.type('application/json').send(await bilibiliResult({
         type: "\u7528\u6237\u4E3B\u9875\u52A8\u6001\u5217\u8868\u6570\u636E" /* BilibiliDataType.用户主页动态列表数据 */,
         cookie: this.bilibili
       }, { host_mid: request.query.host_mid }))
     })
     Client.get('/api/bilibili/fetch_dynamic_info', async (request, reply) => {
-      reply.type('application/json').send(await BilibiliResult({
+      reply.type('application/json').send(await bilibiliResult({
         type: "\u52A8\u6001\u8BE6\u60C5\u6570\u636E" /* BilibiliDataType.动态详情数据 */,
         cookie: this.bilibili
       }, { dynamic_id: request.query.dynamic_id }))
     })
     Client.get('/api/bilibili/fetch_dynamic_card', async (request, reply) => {
-      reply.type('application/json').send(await BilibiliResult({
+      reply.type('application/json').send(await bilibiliResult({
         type: "\u52A8\u6001\u5361\u7247\u6570\u636E" /* BilibiliDataType.动态卡片数据 */,
         cookie: this.bilibili
       }, { dynamic_id: request.query.dynamic_id }))
     })
     Client.get('/api/bilibili/fetch_user_profile', async (request, reply) => {
-      reply.type('application/json').send(await BilibiliResult({
+      reply.type('application/json').send(await bilibiliResult({
         type: "\u7528\u6237\u4E3B\u9875\u6570\u636E" /* BilibiliDataType.用户主页数据 */,
         cookie: this.bilibili
       }, { host_mid: request.query.host_mid }))
     })
     Client.get('/api/bilibili/fetch_live_room_detail', async (request, reply) => {
-      reply.type('application/json').send(await BilibiliResult({
+      reply.type('application/json').send(await bilibiliResult({
         type: "\u76F4\u64AD\u95F4\u4FE1\u606F" /* BilibiliDataType.直播间信息 */,
         cookie: this.bilibili
       }, { room_id: request.query.room_id }))
     })
     Client.get('/api/bilibili/fetch_liveroom_def', async (request, reply) => {
-      reply.type('application/json').send(await BilibiliResult({
+      reply.type('application/json').send(await bilibiliResult({
         type: "\u76F4\u64AD\u95F4\u521D\u59CB\u5316\u4FE1\u606F" /* BilibiliDataType.直播间初始化信息 */,
         cookie: this.bilibili
       }, { room_id: request.query.room_id }))
     })
     Client.get('/api/bilibili/bv_to_av', async (request, reply) => {
-      reply.type('application/json').send(await BilibiliResult({
+      reply.type('application/json').send(await bilibiliResult({
         type: "BV\u8F6CAV" /* BilibiliDataType.BV转AV */,
         cookie: this.bilibili
       }, { bvid: request.query.bvid }))
     })
     Client.get('/api/bilibili/av_to_bv', async (request, reply) => {
-      reply.type('application/json').send(await BilibiliResult({
+      reply.type('application/json').send(await bilibiliResult({
         type: "AV\u8F6CBV" /* BilibiliDataType.AV转BV */,
         cookie: this.bilibili
       }, { avid: request.query.avid }))
@@ -222,18 +221,25 @@ export class amagi {
         Client.log.error(_err)
       logger.mark(`amagi server ${logger.green(`listening on ${port}`)} port. ${logger.yellow('API docs: https://amagi.apifox.cn')}`)
     })
-    return {
-      /** Fastify 实例 */
-      Instance: Client,
-      getDouyinData: this.getDouyinData,
-      getBilibiliData: this.getBilibiliData
-    }
+    return Client
   }
+  /**
+     * 获取抖音数据
+     * @param type 请求数据类型
+     * @param options 请求参数，是一个对象
+     * @returns 返回接口的原始数据，失败返回false
+     */
   getDouyinData = async (type, options) => {
     return await getDouyinData(type, this.douyin, options)
   }
+  /**
+     * 获取B站数据
+     * @param type 请求数据类型
+     * @param options 请求参数，是一个对象
+     * @returns 返回接口的原始数据，失败返回false
+     */
   getBilibiliData = async (type, options) => {
     return await getBilibiliData(type, this.bilibili, options)
   }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/server/client.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/server/client.ts"],"names":[],"mappings":"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"}

package/lib/test.js

@@ -1,19 +1,19 @@
-import { Amagi, getBilibiliData } from './index.js';
-const client = new Amagi({
+import { getBilibiliData, Amagi } from './index.js';
+const client = Amagi({
     douyin: '',
     bilibili: ''
 });
 const h = client.startClient();
-await h.getDouyinData('官方emoji数据');
-const b = await h.getBilibiliData('单个视频作品数据', { id_type: 'bvid', id: 'BV1WvpTekEPQ' });
+await client.getDouyinData('官方emoji数据');
+const b = await client.getBilibiliData('单个视频作品数据', { id_type: 'bvid', id: 'BV1WvpTekEPQ' });
 const douyinData = await client.getDouyinData('官方emoji数据');
 const bilibiliData = await getBilibiliData('emoji数据');
 console.log({ douyinData, bilibiliData, b });
 if (douyinData && bilibiliData) {
-    h.Instance.close();
+    h.close();
     process.exit(0);
 }
 else {
     process.exit(1);
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy90ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sR0FBRyxDQUFBO0FBRTFDLE1BQU0sTUFBTSxHQUFHLElBQUksS0FBSyxDQUFDO0lBQ3ZCLE1BQU0sRUFBRSxFQUFFO0lBQ1YsUUFBUSxFQUFFLEVBQUU7Q0FDYixDQUFDLENBQUE7QUFDRixNQUFNLENBQUMsR0FBRyxNQUFNLENBQUMsV0FBVyxFQUFFLENBQUE7QUFFOUIsTUFBTSxDQUFDLENBQUMsYUFBYSxDQUFDLFdBQVcsQ0FBQyxDQUFBO0FBQ2xDLE1BQU0sQ0FBQyxHQUFHLE1BQU0sQ0FBQyxDQUFDLGVBQWUsQ0FBQyxVQUFVLEVBQUUsRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLEVBQUUsRUFBRSxjQUFjLEVBQUUsQ0FBQyxDQUFBO0FBRXRGLE1BQU0sVUFBVSxHQUFHLE1BQU0sTUFBTSxDQUFDLGFBQWEsQ0FBQyxXQUFXLENBQUMsQ0FBQTtBQUMxRCxNQUFNLFlBQVksR0FBRyxNQUFNLGVBQWUsQ0FBQyxTQUFTLENBQUMsQ0FBQTtBQUVyRCxPQUFPLENBQUMsR0FBRyxDQUFDLEVBQUUsVUFBVSxFQUFFLFlBQVksRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFBO0FBRTVDLElBQUksVUFBVSxJQUFJLFlBQVksRUFBRSxDQUFDO0lBQy9CLENBQUMsQ0FBQyxRQUFRLENBQUMsS0FBSyxFQUFFLENBQUE7SUFDbEIsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQTtBQUNqQixDQUFDO0tBQU0sQ0FBQztJQUNOLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUE7QUFDakIsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy90ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQWMsRUFBRSxlQUFlLEVBQUUsS0FBSyxFQUFFLE1BQU0sR0FBRyxDQUFBO0FBRWpELE1BQU0sTUFBTSxHQUFHLEtBQUssQ0FBQztJQUNuQixNQUFNLEVBQUUsRUFBRTtJQUNWLFFBQVEsRUFBRSxFQUFFO0NBQ2IsQ0FBQyxDQUFBO0FBQ0YsTUFBTSxDQUFDLEdBQUcsTUFBTSxDQUFDLFdBQVcsRUFBRSxDQUFBO0FBRTlCLE1BQU0sTUFBTSxDQUFDLGFBQWEsQ0FBQyxXQUFXLENBQUMsQ0FBQTtBQUN2QyxNQUFNLENBQUMsR0FBRyxNQUFNLE1BQU0sQ0FBQyxlQUFlLENBQUMsVUFBVSxFQUFFLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxFQUFFLEVBQUUsY0FBYyxFQUFFLENBQUMsQ0FBQTtBQUUzRixNQUFNLFVBQVUsR0FBRyxNQUFNLE1BQU0sQ0FBQyxhQUFhLENBQUMsV0FBVyxDQUFDLENBQUE7QUFDMUQsTUFBTSxZQUFZLEdBQUcsTUFBTSxlQUFlLENBQUMsU0FBUyxDQUFDLENBQUE7QUFFckQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxFQUFFLFVBQVUsRUFBRSxZQUFZLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQTtBQUU1QyxJQUFJLFVBQVUsSUFBSSxZQUFZLEVBQUUsQ0FBQztJQUMvQixDQUFDLENBQUMsS0FBSyxFQUFFLENBQUE7SUFDVCxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFBO0FBQ2pCLENBQUM7S0FBTSxDQUFDO0lBQ04sT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQTtBQUNqQixDQUFDIn0=

package/lib/types/BilibiliAPIParams.d.ts

@@ -1,14 +1,3 @@
-type VideoInfoParams = {
-    /**
-     * 视频分享URL。建议使用 id_type 和 id 字段作为参数，url参数可能不稳定
-     * @deprecated
-     */
-    url?: string;
-    /** 稿件 ID 类型，一般为 bvid */
-    id_type?: 'bvid' | 'avid';
-    /** 稿件ID */
-    id?: string;
-};
 type AVIDVideoInfoParams = {
     id_type: 'avid' | undefined;
     /** 稿件AVID */
@@ -33,12 +22,12 @@ type CommentParams = {
     /** 稿件ID，也就是AV号去除前缀后的内容 */
     oid: number | undefined;
     /**
-     * 获取的评论数量
+     * 获取的评论数量，默认20
      * @default 20
      */
     number?: number;
     /**
-     * 评论区页码
+     * 评论区页码，默认1
      * @default 1
      */
     pn?: number;
@@ -84,22 +73,85 @@ export interface BilibiliDataOptionsMapKeys {
     LiveRoomParams: LiveRoomParams;
     QrcodeParams: QrcodeParams;
 }
+export interface BilibiliAPIOptionsMap {
+    VideoInfoParams: {
+        id_type: 'avid';
+        /** 稿件AVID */
+        id: number;
+    } | {
+        id_type: 'bvid';
+        /** 稿件BVID */
+        id: string;
+    };
+    VideoStreamParams: {
+        /** 视频分享URL。建议使用 id_type 和 id 字段作为参数，url参数可能不稳定 */
+        url?: string;
+        /** 稿件AVID */
+        avid?: number;
+        /** 稿件cid */
+        cid?: number;
+    };
+    CommentParams: {
+        /** 评论区类型，type参数详见https://github.com/SocialSisterYi/bilibili-API-collect/blob/master/docs/comment/readme.md#评论区类型代码 */
+        type: number;
+        /** 稿件ID，也就是AV号去除前缀后的内容 */
+        oid: number;
+        /**
+         * 获取的评论数量，默认20
+         * @default 20
+         */
+        number?: number;
+        /**
+         * 评论区页码，默认1
+         * @default 1
+         */
+        pn?: number;
+    };
+    UserParams: {
+        /** UP主UID */
+        host_mid: string;
+    };
+    DynamicParams: {
+        /** 动态ID */
+        dynamic_id: string;
+    };
+    BangumiInfoParams: {
+        /** 稿件ID是否为epid */
+        isep: boolean;
+        /** 稿件id，season_id与ep_id任选其一 */
+        id: string;
+    };
+    BangumiStreamParams: {
+        /** 稿件cid */
+        cid: number;
+        /** 稿件ep_id */
+        ep_id: string;
+    };
+    LiveRoomParams: {
+        /** 直播间ID */
+        room_id: string;
+    };
+    QrcodeParams: {
+        /** 扫码登录秘钥 */
+        qrcode_key: string;
+    };
+}
 /** B站API接口参数类型 */
-export type BilibiliDataOptionsMap = {
-    '单个视频作品数据': VideoInfoParams;
-    '单个视频下载信息数据': VideoStreamParams;
-    '评论数据': CommentParams;
-    '用户主页数据': UserParams;
-    '用户主页动态列表数据': UserParams;
-    'emoji数据': {};
-    '番剧基本信息数据': BangumiInfoParams;
-    '番剧下载信息数据': BangumiStreamParams;
-    '动态详情数据': DynamicParams;
-    '动态卡片数据': DynamicParams;
-    '直播间信息': LiveRoomParams;
-    '直播间初始化信息': LiveRoomParams;
-    '登录基本信息': {};
-    '申请二维码': {};
-    '二维码状态': QrcodeParams;
-};
+export interface BilibiliDataOptionsMap {
+    '单个视频作品数据': BilibiliAPIOptionsMap['VideoInfoParams'];
+    '单个视频下载信息数据': BilibiliAPIOptionsMap['VideoStreamParams'];
+    '评论数据': BilibiliAPIOptionsMap['CommentParams'];
+    '用户主页数据': BilibiliAPIOptionsMap['UserParams'];
+    '用户主页动态列表数据': BilibiliAPIOptionsMap['UserParams'];
+    'emoji数据': any;
+    '番剧基本信息数据': BilibiliAPIOptionsMap['BangumiInfoParams'];
+    '番剧下载信息数据': BilibiliAPIOptionsMap['BangumiStreamParams'];
+    '动态详情数据': BilibiliAPIOptionsMap['DynamicParams'];
+    '动态卡片数据': BilibiliAPIOptionsMap['DynamicParams'];
+    '直播间信息': BilibiliAPIOptionsMap['LiveRoomParams'];
+    '直播间初始化信息': BilibiliAPIOptionsMap['LiveRoomParams'];
+    '登录基本信息': any;
+    '申请二维码': any;
+    '二维码状态': BilibiliAPIOptionsMap['QrcodeParams'];
+}
 export {}

package/lib/types/DouyinAPIParams.d.ts

@@ -64,20 +64,77 @@ export interface DouyinDataOptionsMapKeys {
     QrcodeParams: QrcodeParams;
     SearchParams: SearchParams;
 }
-export type DouyinDataOptionsMap = {
-    '二级评论数据': CommentReplyParams;
-    '用户主页数据': UserParams;
-    '单个视频作品数据': WorkParams;
-    '评论数据': CommentParams;
-    '用户主页视频列表数据': UserParams;
-    '热点词数据': SearchParams;
-    '搜索数据': SearchParams;
-    '官方emoji数据': {};
-    '动态表情数据': {};
-    '音乐数据': MusicParams;
-    '图集作品数据': WorkParams;
-    '实况图片图集数据': LiveWorkParams;
-    '直播间信息数据': LiveRoomParams;
-    '申请二维码数据': QrcodeParams;
-};
+export interface DouyinAPIOptionsMap {
+    CommentReplyParams: {
+        /** 视频ID */
+        aweme_id: string;
+        /** 评论ID */
+        comment_id: string;
+    };
+    UserParams: {
+        /** 用户ID */
+        sec_uid: string;
+    };
+    WorkParams: {
+        /** 视频分享URL */
+        url?: string;
+        /** 视频ID，数据获取更准确，和url二选一 */
+        aweme_id?: string;
+        /** 获取的评论数量 */
+        number?: number;
+    };
+    CommentParams: {
+        /** 视频分享URL，和aweme_id二选一 */
+        url?: string;
+        /** 视频ID，数据获取更准确，和url二选一 */
+        aweme_id?: string;
+        /**
+         * 获取的评论数量
+         * @default 50
+         */
+        number?: number;
+        /** 游标 */
+        cursor?: number;
+    };
+    MusicParams: {
+        /** 音乐ID */
+        music_id: string;
+    };
+    LiveWorkParams: {
+        /** 视频分享URL，和aweme_id二选一 */
+        url?: string;
+        /** 视频ID，，数据获取更准确，和url二选一 */
+        aweme_id?: string;
+    };
+    LiveRoomParams: {
+        /** 直播间ID */
+        room_id: string;
+        /** 直播间真实房间号（可通过live.douyin.com/{web_rid}直接访问直播间），在用户主页信息的room_data中获取 */
+        web_rid?: string;
+    };
+    QrcodeParams: {
+        /** fp指纹 */
+        verify_fp: string;
+    };
+    SearchParams: {
+        /** 搜索词 */
+        query: string;
+    };
+}
+export interface DouyinDataOptionsMap {
+    '二级评论数据': DouyinAPIOptionsMap['CommentReplyParams'];
+    '用户主页数据': DouyinAPIOptionsMap['UserParams'];
+    '单个视频作品数据': DouyinAPIOptionsMap['WorkParams'];
+    '评论数据': DouyinAPIOptionsMap['CommentParams'];
+    '用户主页视频列表数据': DouyinAPIOptionsMap['UserParams'];
+    '热点词数据': DouyinAPIOptionsMap['SearchParams'];
+    '搜索数据': DouyinAPIOptionsMap['SearchParams'];
+    '官方emoji数据': any;
+    '动态表情数据': any;
+    '音乐数据': DouyinAPIOptionsMap['MusicParams'];
+    '图集作品数据': DouyinAPIOptionsMap['WorkParams'];
+    '实况图片图集数据': DouyinAPIOptionsMap['LiveWorkParams'];
+    '直播间信息数据': DouyinAPIOptionsMap['LiveRoomParams'];
+    '申请二维码数据': DouyinAPIOptionsMap['QrcodeParams'];
+}
 export {}

package/lib/types/GetDataResponseType.d.ts

@@ -13,5 +13,5 @@ export type GetDataResponseType = {
     /**
      * 响应数据
      */
-    data: any;
+    data: boolean | any;
 };