@ikenxuan/amagi 1.4.3 → 1.4.5

package/README.md

@@ -1,64 +1,23 @@
-# amagi
+# amagi（泥干嘛哈哈
 * 热门平台视频解析 API 基于 Node.js 的实现，支持最低node版本为 v16
-* ~~抖音（坏掉了）~~、B站
-
-## 环境
-> [Node.js](https://nodejs.org) **必要**
-
-> [git](https://git-scm.com) _可选_
-
-> [pnpm](https://pnpm.io) _可选_
+* 抖音、B站
 
 ## 使用
-> Node.js版本约定：
-> Node.js => v16.20.2
-
-### 直接使用
-前往 [releases 页面](https://github.com/ikenxuan/amagi/releases) 找到最新版本的压缩文件（zip格式）下载
-
-解压后打开 `config/config.yaml` 根据提示填写cookies
-
-**根目录打开终端运行**
-
-* 安装pnpm，已安装可跳过
 ```
-npm install -g pnpm
+npm install @ikenxuan/amagi
 ```
-* 安装依赖
-```
-pnpm install
-```
-* 启动
-```
-pnpm app
-```
-
-### 外部调用
-**快速上手:**
+## 快速上手
 ```js
-import { StartClient, CreateNewClient, AddRoute } from '@ikenxuan/amagi';
+import amagi, { StartClient } from '@ikenxuan/amagi'
 
-const main = async () => {
-    let client = CreateNewClient({ log: true });
-    const handler = (request, reply) => {
-        // http://ip:port/your-route?url=http://www.baidu.com
-        const url = request.query.url;
-        reply.type('application/json').send({ hello: 'hello, world!', url });
-    };
-    const routeArray = [
-        // http://ip:port/1
-        { method: 'GET', url: '/1', handler, },
-        { method: 'GET', url: '/2', handler, },
-        { method: 'GET', url: '/3', handler, },
-        { method: 'GET', url: '/4', handler }
-    ];
-    // 继承 amagi 路由规则
-    client = AddRoute(client, routeArray, true);
-    // 监听4567端口
-    return await StartClient(client, { port: 4567 });
-};
+// 初始化
+const client = await new amagi({
+  douyin: '抖音ck',
+  bilibili: 'B站ck'
+}).initServer(true)
 
-await main().catch((error) => console.log(error));
+// 启动监听
+await StartClient(client, { port: 4567 })
 ```
 ## 开发构建
 > Node.js版本约定：
@@ -71,12 +30,12 @@ git clone git@github.com:ikenxuan/amagi.git
 ```
 pnpm install
 ```
-* 运行
+* 构建
 ```
-pnpm dev
+pnpm build
 ```
 
-## 其他
+## 声明
 该项目代码从 [kkkkkk-10086](https://github.com/ikenxuan/kkkkkk-10086) 提取修改并发布
 
 <h2>未经同意，禁止将本项目的开源代码用于任何商业目的。因使用本项目产生的一切问题与后果由使用者自行承担，项目开发者不承担任何责任</h2>

package/lib/business/bilibili/API.d.ts

@@ -1,39 +1,21 @@
+import { BilibiliAPIParams } from '../../types/index.js';
 declare class BiLiBiLiAPI {
-    LOGIN_INFO(): string;
-    INFO(data: {
-        id_type: string;
-        id: string;
-    }): string;
-    VIDEO(data: {
-        avid: string;
-        cid: string;
-    }): string;
+    登录基本信息(): string;
+    视频详细信息(data: BilibiliAPIParams['VideoInfoParams']): string;
+    视频流信息(data: BilibiliAPIParams['VideoStreamParams']): string;
     /** type参数详见https://github.com/SocialSisterYi/bilibili-API-collect/blob/master/docs/comment/readme.md#评论区类型代码 */
-    COMMENTS(data: {
-        type: number;
-        oid: number;
-    }): string;
-    EMOJI(): string;
-    bangumivideo(data: {
-        id: string;
-        isep: boolean | undefined;
-    }): string;
-    bangumidata(data: {
-        cid: string;
-        ep_id: string;
-    }): string;
-    获取用户空间动态(data: {
-        host_mid: string;
-    }): string;
-    动态详情(data: {
-        dynamic_id: string;
-    }): string;
-    动态卡片信息(data: {
-        dynamic_id: string;
-    }): string;
-    用户名片信息(data: {
-        host_mid: string;
-    }): string;
+    评论区明细(data: BilibiliAPIParams['CommentParams']): string;
+    表情列表(): string;
+    番剧明细(data: BilibiliAPIParams['BangumiInfoParams']): string;
+    番剧视频流信息(data: BilibiliAPIParams['BangumiStreamParams']): string;
+    用户空间动态(data: BilibiliAPIParams['UserParams']): string;
+    动态详情(data: BilibiliAPIParams['DynamicParams']): string;
+    动态卡片信息(data: BilibiliAPIParams['DynamicParams']): string;
+    用户名片信息(data: BilibiliAPIParams['UserParams']): string;
+    直播间信息(data: BilibiliAPIParams['LiveRoomParams']): string;
+    房间页初始化信息(data: BilibiliAPIParams['LiveRoomParams']): string;
+    申请二维码(): string;
+    二维码状态(data: BilibiliAPIParams['QrcodeParams']): string;
 }
 declare const _default: BiLiBiLiAPI;
 export default _default;

package/lib/business/bilibili/API.js

@@ -1,27 +1,27 @@
 class BiLiBiLiAPI {
-    LOGIN_INFO() {
+    登录基本信息() {
         return 'https://api.bilibili.com/x/web-interface/nav';
     }
-    INFO(data) {
+    视频详细信息(data) {
         return `https://api.bilibili.com/x/web-interface/view?${data.id_type === 'bvid' ? 'bvid=' + data.id : 'aid=' + data.id}`;
     }
-    VIDEO(data) {
+    视频流信息(data) {
         return `https://api.bilibili.com/x/player/playurl?avid=${data.avid}&cid=${data.cid}`;
     }
     /** type参数详见https://github.com/SocialSisterYi/bilibili-API-collect/blob/master/docs/comment/readme.md#评论区类型代码 */
-    COMMENTS(data) {
+    评论区明细(data) {
         return `https://api.bilibili.com/x/v2/reply?sort=1&ps=20&type=${data.type}&oid=${data.oid}`;
     }
-    EMOJI() {
+    表情列表() {
         return 'https://api.bilibili.com/x/emote/user/panel/web?business=reply&web_location=0.0';
     }
-    bangumivideo(data) {
+    番剧明细(data) {
         return `https://api.bilibili.com/pgc/view/web/season?${data.isep ? 'ep_id' : 'season_id'}=${data.id}`;
     }
-    bangumidata(data) {
+    番剧视频流信息(data) {
         return `https://api.bilibili.com/pgc/player/web/playurl?cid=${data.cid}&ep_id=${data.ep_id}`;
     }
-    获取用户空间动态(data) {
+    用户空间动态(data) {
         return `https://api.bilibili.com/x/polymer/web-dynamic/v1/feed/space?host_mid=${data.host_mid}`;
     }
     动态详情(data) {
@@ -33,5 +33,17 @@ class BiLiBiLiAPI {
     用户名片信息(data) {
         return `https://api.bilibili.com/x/web-interface/card?mid=${data.host_mid}&photo=true`;
     }
+    直播间信息(data) {
+        return `https://api.live.bilibili.com/room/v1/Room/get_info?room_id=${data.room_id}`;
+    }
+    房间页初始化信息(data) {
+        return `https://api.live.bilibili.com/room/v1/Room/room_init?id=${data.room_id}`;
+    }
+    申请二维码() {
+        return 'https://passport.bilibili.com/x/passport-login/web/qrcode/generate';
+    }
+    二维码状态(data) {
+        return `https://passport.bilibili.com/x/passport-login/web/qrcode/poll?qrcode_key=${data.qrcode_key}`;
+    }
 }
 export default new BiLiBiLiAPI();

package/lib/business/bilibili/getdata.d.ts

@@ -3,7 +3,7 @@ export default class BilibiliData {
     type: BilibiliDataType;
     headers: any;
     URL: string | undefined;
-    constructor(type: BilibiliDataType);
+    constructor(type: BilibiliDataType, cookie: string);
     GetData(data?: BilibiliOptionsType): Promise<any>;
     GlobalGetData(options: NetworksConfigType): Promise<any>;
 }

package/lib/business/bilibili/getdata.js

@@ -1,36 +1,36 @@
 import { BiLiBiLiAPI, qtparam, wbi_sign } from '../../business/bilibili/index.js';
-import { Networks, Config, logger } from '../../model/index.js';
+import { Networks, logger } from '../../model/index.js';
 export default class BilibiliData {
     type;
     headers;
     URL;
-    constructor(type) {
+    constructor(type, cookie) {
         this.type = type;
         this.headers = {};
         this.headers.Referer = 'https://api.bilibili.com/';
-        this.headers.Cookie = Config.bilibili;
+        this.headers.Cookie = cookie;
     }
     async GetData(data = {}) {
         let result;
         switch (this.type) {
             case 'VideoData': {
-                const INFODATA = await this.GlobalGetData({ url: BiLiBiLiAPI.INFO({ id_type: 'bvid', id: data.id }) });
-                const BASEURL = BiLiBiLiAPI.VIDEO({ avid: INFODATA.data.aid, cid: INFODATA.data.cid });
-                const SIGN = await qtparam(BASEURL);
+                const INFODATA = await this.GlobalGetData({ url: BiLiBiLiAPI.视频详细信息({ id_type: 'bvid', id: data.id }) });
+                const BASEURL = BiLiBiLiAPI.视频流信息({ avid: INFODATA.data.aid, cid: INFODATA.data.cid });
+                const SIGN = await qtparam(BASEURL, this.headers.cookie);
                 const DATA = await this.GlobalGetData({
-                    url: BiLiBiLiAPI.VIDEO({ avid: INFODATA.data.aid, cid: INFODATA.data.cid }) + SIGN.QUERY,
+                    url: BiLiBiLiAPI.视频流信息({ avid: INFODATA.data.aid, cid: INFODATA.data.cid }) + SIGN.QUERY,
                     headers: this.headers
                 });
                 return { INFODATA, DATA, };
             }
             case 'CommentData': {
-                const INFODATA = await this.GlobalGetData({ url: BiLiBiLiAPI.INFO({ id_type: 'bvid', id: data.bvid }) });
-                const PARAM = await wbi_sign(BiLiBiLiAPI.COMMENTS({ type: 1, oid: INFODATA.data.aid }));
-                const COMMENTSDATA = await this.GlobalGetData({ url: BiLiBiLiAPI.COMMENTS({ type: 1, oid: INFODATA.data.aid }) + PARAM, headers: this.headers });
+                const INFODATA = await this.GlobalGetData({ url: BiLiBiLiAPI.视频详细信息({ id_type: 'bvid', id: data.bvid }) });
+                const PARAM = await wbi_sign(BiLiBiLiAPI.评论区明细({ type: 1, oid: INFODATA.data.aid }), this.headers.cookie);
+                const COMMENTSDATA = await this.GlobalGetData({ url: BiLiBiLiAPI.评论区明细({ type: 1, oid: INFODATA.data.aid }) + PARAM, headers: this.headers });
                 return COMMENTSDATA;
             }
             case 'EmojiData':
-                return await this.GlobalGetData({ url: BiLiBiLiAPI.EMOJI() });
+                return await this.GlobalGetData({ url: BiLiBiLiAPI.表情列表() });
             case 'BangumiVideoData': {
                 let isep;
                 if (data?.id?.startsWith('ss')) {
@@ -42,17 +42,17 @@ export default class BilibiliData {
                     isep = true;
                 }
                 const INFO = await this.GlobalGetData({
-                    url: BiLiBiLiAPI.bangumivideo({ id: data.id, isep }),
+                    url: BiLiBiLiAPI.番剧明细({ id: data.id, isep }),
                     headers: this.headers
                 });
                 return INFO;
             }
             case 'BangumiVideoDownloadLinkData':
-                return await this.GlobalGetData({ url: BiLiBiLiAPI.bangumidata({ cid: data.cid, ep_id: data.ep_id }) });
+                return await this.GlobalGetData({ url: BiLiBiLiAPI.番剧视频流信息({ cid: data.cid, ep_id: data.ep_id }) });
             case 'UserDynamicListData':
                 delete this.headers.Referer;
                 result = await this.GlobalGetData({
-                    url: BiLiBiLiAPI.获取用户空间动态({ host_mid: data.host_mid }),
+                    url: BiLiBiLiAPI.用户空间动态({ host_mid: data.host_mid }),
                     headers: this.headers
                 });
                 return result;
@@ -84,7 +84,7 @@ export default class BilibiliData {
         const result = await new Networks(options).getData();
         if (result && result.code !== 0) {
             const errorMessage = errorMap[result.code] || '未知错误';
-            logger.error(`获取响应数据失败！\n请求接口类型：${this.type}\n请求URL：${options.url}\n错误代码：${result.code}，\n含义：${errorMessage}`);
+            logger.error(`响应数据失败！\n请求接口类型：${this.type}\n请求URL：${options.url}\n错误代码：${result.code}，\n含义：${errorMessage}`);
             return null;
         }
         else {

package/lib/business/bilibili/qtparam.d.ts

@@ -1,4 +1,4 @@
-export default function qtparam(BASEURL: string): Promise<{
+export default function qtparam(BASEURL: string, cookie: string): Promise<{
     QUERY: string;
     STATUS: string;
     isvip?: undefined;

package/lib/business/bilibili/qtparam.js

@@ -1,10 +1,10 @@
-import { Config, Networks } from '../../model/index.js';
+import { Networks } from '../../model/index.js';
 import { BiLiBiLiAPI, wbi_sign } from '../../business/bilibili/index.js';
-export default async function qtparam(BASEURL) {
-    if (Config.bilibili == '')
+export default async function qtparam(BASEURL, cookie) {
+    if (cookie == '')
         return { QUERY: '&platform=html5', STATUS: '!isLogin' };
-    const logininfo = await new Networks({ url: BiLiBiLiAPI.LOGIN_INFO(), headers: { Cookie: Config.bilibili } }).getData();
-    const sign = await wbi_sign(BASEURL);
+    const logininfo = await new Networks({ url: BiLiBiLiAPI.登录基本信息(), headers: { Cookie: cookie } }).getData();
+    const sign = await wbi_sign(BASEURL, cookie);
     const qn = [6, 16, 32, 64, 74, 80, 112, 116, 120, 125, 126, 127];
     let isvip;
     logininfo.data.vipStatus === 1 ? (isvip = true) : (isvip = false);

package/lib/business/bilibili/result.d.ts

@@ -1,6 +1,7 @@
 import { BilibiliDataType, GetDataResponseType, BilibiliOptionsType } from '../../types/index.js';
 export default class BilibiliResult {
     type: BilibiliDataType;
-    constructor(type: BilibiliDataType);
+    cookie: string;
+    constructor(type: BilibiliDataType, cookie: string);
     result(options?: BilibiliOptionsType): Promise<GetDataResponseType>;
 }

package/lib/business/bilibili/result.js

@@ -1,8 +1,10 @@
 import { BilibiliData, GetBilibiliID } from '../../business/bilibili/index.js';
 export default class BilibiliResult {
     type;
-    constructor(type) {
+    cookie;
+    constructor(type, cookie) {
         this.type = type;
+        this.cookie = cookie;
     }
     async result(options = {}) {
         let result;
@@ -15,12 +17,14 @@ export default class BilibiliResult {
             case 'UserDynamicListData':
             case 'DynamicInfoData':
             case 'DynamicCardData':
-                result = await new BilibiliData(this.type).GetData(options);
+            case 'LiveRoomInfoData':
+            case 'LiveRoomInitData':
+                result = await new BilibiliData(this.type, this.cookie).GetData(options);
                 break;
             case 'VideoData':
             case 'BangumiVideoData': {
                 const iddata = await GetBilibiliID(options.url);
-                result = await new BilibiliData(this.type).GetData(iddata);
+                result = await new BilibiliData(this.type, this.cookie).GetData(iddata);
                 break;
             }
             default:

package/lib/business/bilibili/sign/wbi.d.ts

@@ -1 +1 @@
-export default function wbi_sign(BASEURL: string | URL): Promise<string>;
+export default function wbi_sign(BASEURL: string | URL, cookie: string): Promise<string>;

package/lib/business/bilibili/sign/wbi.js

@@ -1,4 +1,3 @@
-import { Config } from '../../../model/index.js';
 import md5 from 'md5';
 import fetch from 'node-fetch';
 const mixinKeyEncTab = [
@@ -29,10 +28,10 @@ function encWbi(params, img_key, sub_key) {
     return `&wts=${curr_time}` + `&w_rid=${wbi_sign}`;
 }
 // 获取最新的 img_key 和 sub_key
-async function getWbiKeys() {
+async function getWbiKeys(cookie) {
     const res = await fetch('https://api.bilibili.com/x/web-interface/nav', {
         headers: {
-            Cookie: Config.bilibili,
+            Cookie: cookie,
         },
     });
     const responseJson = await res.json();
@@ -44,8 +43,8 @@ async function getWbiKeys() {
         sub_key: sub_url.slice(sub_url.lastIndexOf('/') + 1, sub_url.lastIndexOf('.')),
     };
 }
-export default async function wbi_sign(BASEURL) {
-    const web_keys = await getWbiKeys();
+export default async function wbi_sign(BASEURL, cookie) {
+    const web_keys = await getWbiKeys(cookie);
     const url = new URL(BASEURL);
     const params = {};
     for (const [key, value] of url.searchParams.entries()) {

package/lib/business/douyin/API.d.ts

@@ -1,37 +1,17 @@
+import { DouyinAPIParams } from '../../types/index.js';
 declare class DouyinAPI {
-    视频或图集(data: {
-        aweme_id: string;
-    }): string;
-    评论(data: {
-        aweme_id: string;
-    }): string;
-    二级评论(data: {
-        aweme_id: string;
-        comment_id: string;
-    }): string;
-    动图(data: {
-        aweme_id: string;
-    }): string;
+    视频或图集(data: DouyinAPIParams["WorkParams"]): string;
+    评论(data: DouyinAPIParams['WorkParams']): string;
+    二级评论(data: DouyinAPIParams['CommentParams']): string;
+    动图(data: DouyinAPIParams['WorkParams']): string;
     表情(): string;
-    用户主页视频(data: {
-        sec_uid: string;
-    }): string;
-    用户主页信息(data: {
-        sec_uid: string;
-    }): string;
-    热点词(data: {
-        query: string;
-    }): string;
-    搜索(data: {
-        query: string;
-    }): string;
+    用户主页视频(data: DouyinAPIParams['UserParams']): string;
+    用户主页信息(data: DouyinAPIParams['UserParams']): string;
+    热点词(data: DouyinAPIParams['SearchParams']): string;
+    搜索(data: DouyinAPIParams['SearchParams']): string;
     互动表情(): string;
-    背景音乐(data: {
-        music_id: string;
-    }): string;
-    直播间信息(data: {
-        room_id: string;
-    }): string;
+    背景音乐(data: DouyinAPIParams['MusicParams']): string;
+    直播间信息(data: DouyinAPIParams['LiveRoomParams']): string;
 }
 declare const _default: DouyinAPI;
 export default _default;

package/lib/business/douyin/API.js

@@ -1,4 +1,3 @@
-// 未初始化，必须这么导入
 import Sign from './sign/index.js';
 const fp = Sign.VerifyFpManager();
 class DouyinAPI {
@@ -6,7 +5,7 @@ class DouyinAPI {
         return `https://www.douyin.com/aweme/v1/web/aweme/detail/?device_platform=webapp&aid=6383&channel=channel_pc_web&aweme_id=${data.aweme_id}&update_version_code=170400&pc_client_type=1&version_code=190500&version_name=19.5.0&cookie_enabled=true&screen_width=2328&screen_height=1310&browser_language=zh-CN&browser_platform=Win32&browser_name=Chrome&browser_version=125.0.0.0&browser_online=true&engine_name=Blink&engine_version=125.0.0.0&os_name=Windows&os_version=10&cpu_core_num=16&device_memory=8&platform=PC&downlink=10&effective_type=4g&round_trip_time=150&webid=7351848354471872041&msToken=${Sign.Mstoken(116)}&verifyFp=${fp}&fp=${fp}`;
     }
     评论(data) {
-        return `https://www.douyin.com/aweme/v1/web/comment/list/?device_platform=webapp&aid=6383&channel=channel_pc_web&aweme_id=${data.aweme_id}&cursor=0&count=50&item_type=0&insert_ids=&whale_cut_token=&cut_version=1&rcFT=&pc_client_type=1&version_code=170400&version_name=17.4.0&cookie_enabled=true&screen_width=1552&screen_height=970&browser_language=zh-CN&browser_platform=Win32&browser_name=Chrome&browser_version=125.0.0.0&browser_online=true&engine_name=Blink&engine_version=125.0.0.0&os_name=Windows&os_version=10&cpu_core_num=16&device_memory=8&platform=PC&downlink=10&effective_type=4g&msToken=${Sign.Mstoken(116)}&verifyFp=${fp}&fp=${fp}`;
+        return `https://www.douyin.com/aweme/v1/web/comment/list/?device_platform=webapp&aid=6383&channel=channel_pc_web&aweme_id=${data.aweme_id}&cursor=0&count=${data.number}&item_type=0&insert_ids=&whale_cut_token=&cut_version=1&rcFT=&pc_client_type=1&version_code=170400&version_name=17.4.0&cookie_enabled=true&screen_width=1552&screen_height=970&browser_language=zh-CN&browser_platform=Win32&browser_name=Chrome&browser_version=125.0.0.0&browser_online=true&engine_name=Blink&engine_version=125.0.0.0&os_name=Windows&os_version=10&cpu_core_num=16&device_memory=8&platform=PC&downlink=10&effective_type=4g&msToken=${Sign.Mstoken(116)}&verifyFp=${fp}&fp=${fp}`;
     }
     二级评论(data) {
         return `https://www.douyin.com/aweme/v1/web/comment/list/reply/?device_platform=webapp&aid=6383&channel=channel_pc_web&item_id=${data.aweme_id}&comment_id=${data.comment_id}&cut_version=1&cursor=0&count=10&item_type=0&pc_client_type=1&version_code=170400&version_name=17.4.0&cookie_enabled=true&screen_width=1552&screen_height=970&browser_language=zh-CN&browser_platform=Win32&browser_name=Chrome&browser_version=126.0.0.0&browser_online=true&engine_name=Blink&engine_version=126.0.0.0&os_name=Windows&os_version=10&cpu_core_num=16&device_memory=8&platform=PC&downlink=10&effective_type=4g&round_trip_time=0&webid=7326516708850599434&msToken=${Sign.Mstoken(116)}&verifyFp=${fp}&fp=${fp}`;

package/lib/business/douyin/getdata.d.ts

@@ -3,7 +3,7 @@ export default class DouyinData {
     type: DouyinDataType;
     headers: any;
     URL: string | undefined;
-    constructor(type: DouyinDataType);
+    constructor(type: DouyinDataType, cookie: string);
     GetData(data?: DouyinOptionsType): Promise<any>;
     GlobalGetData(options: NetworksConfigType): Promise<any>;
 }

package/lib/business/douyin/getdata.js

@@ -1,10 +1,10 @@
 import { Sign, DouyinAPI } from '../../business/douyin/index.js';
-import { Networks, Config } from '../../model/index.js';
+import { Networks } from '../../model/index.js';
 export default class DouyinData {
     type;
     headers;
     URL;
-    constructor(type) {
+    constructor(type, cookie) {
         this.type = type;
         this.headers = {
             Accept: 'application/json, text/plain, */*',
@@ -20,7 +20,7 @@ export default class DouyinData {
             'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36',
             'Content-Type': 'application/json',
             Referer: 'https://www.douyin.com/?recommend=1',
-            Cookie: Config.douyin
+            Cookie: cookie
         };
     }
     async GetData(data = {}) {

package/lib/business/douyin/result.d.ts

@@ -1,6 +1,7 @@
 import { DouyinDataType, GetDataResponseType, DouyinOptionsType } from '../../types/index.js';
 export default class DouyinResult {
     type: DouyinDataType;
-    constructor(type: DouyinDataType);
+    cookie: string;
+    constructor(type: DouyinDataType, cookie: string);
     result(options?: DouyinOptionsType): Promise<GetDataResponseType>;
 }

package/lib/business/douyin/result.js

@@ -1,8 +1,10 @@
 import { DouyinData, GetDouyinID } from '../../business/douyin/index.js';
 export default class DouyinResult {
     type;
-    constructor(type) {
+    cookie;
+    constructor(type, cookie) {
         this.type = type;
+        this.cookie = cookie;
     }
     async result(options = {}) {
         let result;
@@ -16,14 +18,14 @@ export default class DouyinResult {
             case 'ExpressionPlusData':
             case 'MusicData':
             case 'LiveImageData':
-                result = await new DouyinData(this.type).GetData(options);
+                result = await new DouyinData(this.type, this.cookie).GetData(options);
                 break;
             case 'VideoData':
             case 'NoteData':
             case 'CommentData': {
                 const defurl = options?.url?.toString().match(/(http|https):\/\/.*\.(douyin|iesdouyin)\.com\/[^ ]+/g);
                 const iddata = await GetDouyinID(String(defurl));
-                result = await new DouyinData(this.type).GetData(iddata);
+                result = await new DouyinData(this.type, this.cookie).GetData(iddata);
                 break;
             }
             default:

package/lib/business/douyin/sign/a_bougs.d.ts

@@ -0,0 +1,3 @@
+declare module 'a_bougs' {
+    function signature(): void;
+}

package/lib/business/douyin/sign/a_bougs.js

@@ -476,7 +476,7 @@ function generate_random_str () {
     return String.fromCharCode.apply(null, random_str_list)
 }
 
-export function AB (url_search_params, user_agent) {
+export function signature (url_search_params, user_agent) {
     /**
      * url_search_params："device_platform=webapp&aid=6383&channel=channel_pc_web&update_version_code=170400&pc_client_type=1&version_code=170400&version_name=17.4.0&cookie_enabled=true&screen_width=1536&screen_height=864&browser_language=zh-CN&browser_platform=Win32&browser_name=Chrome&browser_version=123.0.0.0&browser_online=true&engine_name=Blink&engine_version=123.0.0.0&os_name=Windows&os_version=10&cpu_core_num=16&device_memory=8&platform=PC&downlink=10&effective_type=4g&round_trip_time=50&webid=7362810250930783783&msToken=VkDUvz1y24CppXSl80iFPr6ez-3FiizcwD7fI1OqBt6IICq9RWG7nCvxKb8IVi55mFd-wnqoNkXGnxHrikQb4PuKob5Q-YhDp5Um215JzlBszkUyiEvR"
      * user_agent："Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36"

package/lib/business/douyin/sign/index.js

@@ -1,5 +1,5 @@
 // @ts-ignore
-import { AB } from './a_bougs.js';
+import { signature } from './a_bougs.js';
 import crypto from 'crypto';
 const headers = {
     'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36'
@@ -13,7 +13,7 @@ export default class sign {
     }
     /** a_bougs 签名算法 */
     static AB(url) {
-        return AB(new URLSearchParams(new URL(url).search).toString(), headers['User-Agent']);
+        return signature(new URLSearchParams(new URL(url).search).toString(), headers['User-Agent']);
     }
     /** 生成一个唯一的验证字符串 */
     static VerifyFpManager() {

package/lib/business/index.d.ts

@@ -0,0 +1,2 @@
+export * from '../business/douyin/index.js';
+export * from '../business/bilibili/index.js';

package/lib/business/index.js

@@ -0,0 +1,2 @@
+export * from '../business/douyin/index.js';
+export * from '../business/bilibili/index.js';

package/lib/index.d.ts

@@ -1,30 +1,7 @@
-import { FastifyInstance, RouteHandler, HTTPMethods } from 'fastify';
-interface ServerOptions {
-    /**
-     * 端口
-     */
-    port?: number;
-    /**
-     * 是否启用日志
-     */
-    log?: boolean;
-}
-export declare const initServer: (client: FastifyInstance) => Promise<FastifyInstance>;
-/**
- * 添加路由
- * @param client fastify实例
- * @param routeOptions[] 路由参数，传递数组
- * @param extend 是否继承 amagi 的默认路由
- * @returns
- */
-export declare const AddRoute: (client: FastifyInstance, routeOptions?: RouteOptions[], extend?: boolean) => any;
-/** 创建一个新的 fastify 实例 */
-export declare const CreateNewClient: (options: ServerOptions) => FastifyInstance;
-/** 启动监听 */
-export declare const StartClient: (client: FastifyInstance, options: ServerOptions) => Promise<void>;
-interface RouteOptions {
-    method: HTTPMethods;
-    url: string;
-    handler: RouteHandler;
-}
-export {};
+export * from './model/index.js';
+export * from './business/index.js';
+export * from './types/index.js';
+export * from './server/index.js';
+import { client } from './server/index.js';
+export declare const amagi: typeof client;
+export { amagi as default };