@ikenxuan/amagi 1.5.8 → 2.0.0

package/README.md

@@ -1,9 +1,12 @@
-![amagi](https://socialify.git.ci/ikenxuan/amagi/image?font=Source%20Code%20Pro&forks=1&issues=1&language=1&name=1&owner=1&pattern=Floating%20Cogs&pulls=1&stargazers=1&theme=Auto)
-
 # amagi（泥干嘛哈哈
+
 * 热门平台视频解析 API 基于 Node.js 的实现，支持最低node版本为 v16
 * 抖音、B站
 
+![amagi](https://socialify.git.ci/ikenxuan/amagi/image?font=Source%20Code%20Pro&forks=1&issues=1&language=1&name=1&owner=1&pattern=Floating%20Cogs&pulls=1&stargazers=1&theme=Auto)
+
+
+
 ## 使用
 ```
 pnpm add @ikenxuan/amagi
@@ -12,22 +15,33 @@ pnpm add @ikenxuan/amagi
 ```js
 import amagi, { StartClient } from '@ikenxuan/amagi'
 
-// 初始化
-const client = await new amagi({
+// 初始化 amagi 实例，传入 ck
+const Client = await new amagi({
   douyin: '抖音ck',
   bilibili: 'B站ck'
 }).initServer(true) // 是否开启调试模式
 
-// 启动监听
-await StartClient(client, { port: 4567 })
+// 调用 StartClient 方法，可在本地部署一个 api 接口的 http 服务
+await StartClient(Client.Instance, 4567)
 ```
-## 开发构建
-> Node.js版本 <= v18.20.4
 
-* 克隆仓库
-```
-git clone git@github.com:ikenxuan/amagi.git
+* 如果你想直接获取数据
+```js
+import amagi from '@ikenxuan/amagi'
+
+// 同样先初始化 amagi 实例
+const Client = await new amagi({
+  douyin: '抖音ck',
+  bilibili: 'B站ck'
+}).initServer()
+
+const Data = await (Client.GetBilibiliData({ type: '单个视频作品数据' }))
+  .result({ url: 'https://b23.tv/9JvEHhJ' })
 ```
+
+## 开发构建
+> **开发环境下，支持最低node版本为 v18**
+
 * 安装依赖
 ```
 pnpm install

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

@@ -17,5 +17,6 @@ declare class BiLiBiLiAPI {
     申请二维码(): string;
     二维码状态(data: BilibiliAPIParams['QrcodeParams']): string;
 }
+/** 该类下的所有方法只会返回拼接好参数后的 Url 地址，需要手动请求该地址以获取数据 */
 declare const _default: BiLiBiLiAPI;
 export default _default;

package/lib/business/bilibili/API.js

@@ -46,4 +46,5 @@ class BiLiBiLiAPI {
         return `https://passport.bilibili.com/x/passport-login/web/qrcode/poll?qrcode_key=${data.qrcode_key}`;
     }
 }
+/** 该类下的所有方法只会返回拼接好参数后的 Url 地址，需要手动请求该地址以获取数据 */
 export default new BiLiBiLiAPI();

package/lib/business/bilibili/getdata.js

@@ -1,5 +1,5 @@
 import { BiLiBiLiAPI, qtparam, wbi_sign } from '../../business/bilibili/index.js';
-import { Networks, logger } from '../../model/index.js';
+import { Networks } from '../../model/index.js';
 export default class BilibiliData {
     type;
     headers;
@@ -14,7 +14,7 @@ export default class BilibiliData {
     async GetData(data = {}) {
         let result;
         switch (this.type) {
-            case 'VideoData': {
+            case "\u5355\u4E2A\u89C6\u9891\u4F5C\u54C1\u6570\u636E" /* BilibiliDataType.单个视频作品数据 */: {
                 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);
@@ -24,15 +24,15 @@ export default class BilibiliData {
                 });
                 return { INFODATA, DATA };
             }
-            case 'CommentData': {
+            case "\u8BC4\u8BBA\u6570\u636E" /* BilibiliDataType.评论数据 */: {
                 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':
+            case "emoji\u6570\u636E" /* BilibiliDataType.emoji数据 */:
                 return await this.GlobalGetData({ url: BiLiBiLiAPI.表情列表() });
-            case 'BangumiVideoData': {
+            case "\u756A\u5267\u57FA\u672C\u4FE1\u606F\u6570\u636E" /* BilibiliDataType.番剧基本信息数据 */: {
                 let isep;
                 if (data?.id?.startsWith('ss')) {
                     data.id = data.id.replace('ss', '');
@@ -48,16 +48,16 @@ export default class BilibiliData {
                 });
                 return INFO;
             }
-            case 'BangumiVideoDownloadLinkData':
+            case "\u756A\u5267\u4E0B\u8F7D\u4FE1\u606F\u6570\u636E" /* BilibiliDataType.番剧下载信息数据 */:
                 return await this.GlobalGetData({ url: BiLiBiLiAPI.番剧视频流信息({ cid: data.cid, ep_id: data.ep_id }) });
-            case 'UserDynamicListData':
+            case "\u7528\u6237\u4E3B\u9875\u52A8\u6001\u5217\u8868\u6570\u636E" /* BilibiliDataType.用户主页动态列表数据 */:
                 delete this.headers.Referer;
                 result = await this.GlobalGetData({
                     url: BiLiBiLiAPI.用户空间动态({ host_mid: data.host_mid }),
                     headers: this.headers
                 });
                 return result;
-            case 'DynamicInfoData': {
+            case "\u52A8\u6001\u8BE6\u60C5\u6570\u636E" /* BilibiliDataType.动态详情数据 */: {
                 delete this.headers.Referer;
                 const dynamicINFO = await this.GlobalGetData({
                     url: BiLiBiLiAPI.动态详情({ dynamic_id: data.dynamic_id }),
@@ -65,7 +65,7 @@ export default class BilibiliData {
                 });
                 return dynamicINFO;
             }
-            case 'DynamicCardData': {
+            case "\u52A8\u6001\u5361\u7247\u6570\u636E" /* BilibiliDataType.动态卡片数据 */: {
                 delete this.headers.Referer;
                 const dynamicINFO_CARD = await this.GlobalGetData({
                     url: BiLiBiLiAPI.动态卡片信息({ dynamic_id: data.dynamic_id }),
@@ -73,21 +73,21 @@ export default class BilibiliData {
                 });
                 return dynamicINFO_CARD;
             }
-            case 'UserInfoData': {
+            case "\u7528\u6237\u4E3B\u9875\u6570\u636E" /* BilibiliDataType.用户主页数据 */: {
                 result = await this.GlobalGetData({
                     url: BiLiBiLiAPI.用户名片信息({ host_mid: data.host_mid }),
                     headers: this.headers
                 });
                 return result;
             }
-            case 'LiveRoomInfoData': {
+            case "\u76F4\u64AD\u95F4\u4FE1\u606F" /* BilibiliDataType.直播间信息 */: {
                 result = await this.GlobalGetData({
                     url: BiLiBiLiAPI.直播间信息({ room_id: data.room_id }),
                     headers: this.headers
                 });
                 return result;
             }
-            case 'LiveRoomInitData': {
+            case "\u76F4\u64AD\u95F4\u521D\u59CB\u5316\u4FE1\u606F" /* BilibiliDataType.直播间初始化信息 */: {
                 result = await this.GlobalGetData({
                     url: BiLiBiLiAPI.直播间初始化信息({ room_id: data.room_id }),
                     headers: this.headers
@@ -102,7 +102,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}`);
+            console.error(`响应数据失败！\n请求接口类型：${this.type}\n请求URL：${options.url}\n错误代码：${result.code}，\n含义：${errorMessage}`);
             return null;
         }
         else {

package/lib/business/bilibili/getid.js

@@ -11,7 +11,7 @@ export default async function GetBilibiliID(url) {
         case /video\/([A-Za-z0-9]+)/.test(longLink): {
             const bvideoMatch = longLink.match(/video\/([A-Za-z0-9]+)/);
             result = {
-                type: "VideoData" /* BilibiliDataType['单个视频作品数据'] */,
+                type: "\u5355\u4E2A\u89C6\u9891\u4F5C\u54C1\u6570\u636E" /* BilibiliDataType['单个视频作品数据'] */,
                 id: bvideoMatch ? bvideoMatch[1] : ''
             };
             break;
@@ -19,7 +19,7 @@ export default async function GetBilibiliID(url) {
         case /play\/(\S+?)\??/.test(longLink): {
             const playMatch = longLink.match(/play\/(\w+)/);
             result = {
-                type: "BangumiVideoData" /* BilibiliDataType['番剧基本信息数据'] */,
+                type: "\u756A\u5267\u57FA\u672C\u4FE1\u606F\u6570\u636E" /* BilibiliDataType['番剧基本信息数据'] */,
                 id: playMatch ? playMatch[1] : ''
             };
             break;
@@ -29,7 +29,7 @@ export default async function GetBilibiliID(url) {
             const opusMatch = longLink.match(/^https:\/\/www\.bilibili\.com\/opus\/(\d+)/);
             const dynamic_id = tMatch || opusMatch;
             result = {
-                type: "DynamicInfoData" /* BilibiliDataType['动态详情数据'] */,
+                type: "\u52A8\u6001\u8BE6\u60C5\u6570\u636E" /* BilibiliDataType['动态详情数据'] */,
                 dynamic_id: dynamic_id ? dynamic_id[1] : ''
             };
             break;

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

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

package/lib/business/bilibili/result.js

@@ -2,27 +2,29 @@ import { BilibiliData, GetBilibiliID } from '../../business/bilibili/index.js';
 export default class BilibiliResult {
     type;
     cookie;
-    constructor(type, cookie) {
+    returndata;
+    constructor(type, cookie, returndata = false) {
         this.type = type;
         this.cookie = cookie;
+        /** 直接返回数据，不做响应封装 */
+        this.returndata = returndata;
     }
     async result(options = {}) {
         let result;
         switch (this.type) {
-            case 'UserInfoData':
-            case 'SearchData':
-            case 'EmojiData':
-            case 'CommentData':
-            case 'BangumiVideoDownloadLinkData':
-            case 'UserDynamicListData':
-            case 'DynamicInfoData':
-            case 'DynamicCardData':
-            case 'LiveRoomInfoData':
-            case 'LiveRoomInitData':
+            case "\u7528\u6237\u4E3B\u9875\u6570\u636E" /* BilibiliDataType.用户主页数据 */:
+            case "emoji\u6570\u636E" /* BilibiliDataType.emoji数据 */:
+            case "\u8BC4\u8BBA\u6570\u636E" /* BilibiliDataType.评论数据 */:
+            case "\u756A\u5267\u4E0B\u8F7D\u4FE1\u606F\u6570\u636E" /* BilibiliDataType.番剧下载信息数据 */:
+            case "\u7528\u6237\u4E3B\u9875\u52A8\u6001\u5217\u8868\u6570\u636E" /* BilibiliDataType.用户主页动态列表数据 */:
+            case "\u52A8\u6001\u8BE6\u60C5\u6570\u636E" /* BilibiliDataType.动态详情数据 */:
+            case "\u52A8\u6001\u5361\u7247\u6570\u636E" /* BilibiliDataType.动态卡片数据 */:
+            case "\u76F4\u64AD\u95F4\u4FE1\u606F" /* BilibiliDataType.直播间信息 */:
+            case "\u76F4\u64AD\u95F4\u521D\u59CB\u5316\u4FE1\u606F" /* BilibiliDataType.直播间初始化信息 */:
                 result = await new BilibiliData(this.type, this.cookie).GetData(options);
                 break;
-            case 'VideoData':
-            case 'BangumiVideoData': {
+            case "\u5355\u4E2A\u89C6\u9891\u4F5C\u54C1\u6570\u636E" /* BilibiliDataType.单个视频作品数据 */:
+            case "\u756A\u5267\u57FA\u672C\u4FE1\u606F\u6570\u636E" /* BilibiliDataType.番剧基本信息数据 */: {
                 const iddata = await GetBilibiliID(options.url);
                 result = await new BilibiliData(this.type, this.cookie).GetData(iddata);
                 break;
@@ -31,6 +33,8 @@ export default class BilibiliResult {
                 result = '';
                 break;
         }
+        if (this.returndata)
+            return result;
         return {
             code: result !== false && result !== '' ? 200 : 503,
             message: result !== !false && result !== '' ? 'success' : 'error',

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

@@ -13,5 +13,6 @@ declare class DouyinAPI {
     背景音乐(data: DouyinAPIParams['MusicParams']): string;
     直播间信息(data: DouyinAPIParams['LiveRoomParams']): string;
 }
+/** 该类下的所有方法只会返回拼接好参数后的 Url 地址，需要手动请求该地址以获取数据 */
 declare const _default: DouyinAPI;
 export default _default;

package/lib/business/douyin/API.js

@@ -38,4 +38,5 @@ class DouyinAPI {
         return `https://live.douyin.com/webcast/room/info_by_scene/?aid=6383&app_name=douyin_web&live_id=1&device_platform=web&language=zh-CN&cookie_enabled=true&screen_width=2328&screen_height=1310&browser_language=zh-CN&browser_platform=Win32&browser_name=Edge&browser_version=125.0.0.0&room_id=${data.room_id}&scene=aweme_video_feed_pc&channel=channel_pc_web&region=cn&device_id=7355205920467306010&device_type=web_device&os_version=web&version_code=170400&webcast_sdk_version=2450&msToken=${Sign.Mstoken(116)}&verifyFp=${fp}&fp=${fp}`;
     }
 }
+/** 该类下的所有方法只会返回拼接好参数后的 Url 地址，需要手动请求该地址以获取数据 */
 export default new DouyinAPI();

package/lib/business/douyin/getdata.js

@@ -17,8 +17,8 @@ export default class DouyinData {
     }
     async GetData(data = {}) {
         switch (this.type) {
-            case 'VideoData':
-            case 'NoteData':
+            case "\u5355\u4E2A\u89C6\u9891\u4F5C\u54C1\u6570\u636E" /* DouyinDataType.单个视频作品数据 */:
+            case "\u56FE\u96C6\u4F5C\u54C1\u6570\u636E" /* DouyinDataType.图集作品数据 */:
                 this.URL = DouyinAPI.视频或图集({ aweme_id: data.aweme_id });
                 const VideoData = await this.GlobalGetData({
                     url: `${this.URL}&a_bogus=${Sign.AB(this.URL)}`,
@@ -26,21 +26,21 @@ export default class DouyinData {
                     headers: this.headers
                 });
                 return VideoData;
-            case 'CommentData':
+            case "\u8BC4\u8BBA\u6570\u636E" /* DouyinDataType.评论数据 */:
                 this.URL = DouyinAPI.评论({ aweme_id: data.aweme_id });
                 const CommentsData = await this.GlobalGetData({
                     url: `${this.URL}&a_bogus=${Sign.AB(this.URL)}`,
                     headers: this.headers
                 });
                 return CommentsData;
-            case 'CommentReplyData':
+            case "\u4E8C\u7EA7\u8BC4\u8BBA\u6570\u636E" /* DouyinDataType.二级评论数据 */:
                 this.URL = DouyinAPI.二级评论({ aweme_id: data.aweme_id, comment_id: data.comment_id });
                 const CommentReplyData = await this.GlobalGetData({
                     url: `${this.URL}&a_bogus=${Sign.AB(this.URL)}`,
                     headers: this.headers
                 });
                 return CommentReplyData;
-            case 'UserInfoData':
+            case "\u7528\u6237\u4E3B\u9875\u6570\u636E" /* DouyinDataType.用户主页数据 */:
                 this.URL = DouyinAPI.用户主页信息({ sec_uid: data.sec_uid });
                 const UserInfoData = await this.GlobalGetData({
                     url: `${this.URL}&a_bogus=${Sign.AB(this.URL)}`,
@@ -50,14 +50,14 @@ export default class DouyinData {
                     }
                 });
                 return UserInfoData;
-            case 'EmojiData':
+            case "\u5B98\u65B9emoji\u6570\u636E" /* DouyinDataType.官方emoji数据 */:
                 this.URL = DouyinAPI.表情();
                 const EmojiData = await this.GlobalGetData({
                     url: this.URL,
                     headers: this.headers
                 });
                 return EmojiData;
-            case 'UserVideosListData':
+            case "\u7528\u6237\u4E3B\u9875\u89C6\u9891\u5217\u8868\u6570\u636E" /* DouyinDataType.用户主页视频列表数据 */:
                 this.URL = DouyinAPI.用户主页视频({ sec_uid: data.sec_uid });
                 const UserVideoListData = await this.GlobalGetData({
                     url: `${this.URL}&a_bogus=${Sign.AB(this.URL)}`,
@@ -67,7 +67,7 @@ export default class DouyinData {
                     }
                 });
                 return UserVideoListData;
-            case 'SuggestWordsData':
+            case "\u70ED\u70B9\u8BCD\u6570\u636E" /* DouyinDataType.热点词数据 */:
                 this.URL = DouyinAPI.热点词({ query: data.query });
                 const SuggestWordsData = await this.GlobalGetData({
                     url: `${this.URL}&a_bogus=${Sign.AB(this.URL)}`,
@@ -77,7 +77,7 @@ export default class DouyinData {
                     }
                 });
                 return SuggestWordsData;
-            case 'SearchData':
+            case "\u641C\u7D22\u6570\u636E" /* DouyinDataType.搜索数据 */:
                 this.URL = DouyinAPI.搜索({ query: data.query });
                 const SearchData = await this.GlobalGetData({
                     url: `${this.URL}&a_bogus=${Sign.AB(this.URL)}`,
@@ -87,20 +87,27 @@ export default class DouyinData {
                     }
                 });
                 return SearchData;
-            case 'ExpressionPlusData':
+            case "\u52A8\u6001\u8868\u60C5\u6570\u636E" /* DouyinDataType.动态表情数据 */:
                 this.URL = DouyinAPI.互动表情();
                 const ExpressionPlusData = await this.GlobalGetData({
                     url: `${this.URL}&a_bogus=${Sign.AB(this.URL)}`,
                     headers: this.headers
                 });
                 return ExpressionPlusData;
-            case 'MusicData':
+            case "\u97F3\u4E50\u6570\u636E" /* DouyinDataType.音乐数据 */:
                 this.URL = DouyinAPI.背景音乐({ music_id: data.music_id });
                 const MusicData = await this.GlobalGetData({
                     url: `${this.URL}&a_bogus=${Sign.AB(this.URL)}`,
                     headers: this.headers
                 });
                 return MusicData;
+            case "\u5B9E\u51B5\u56FE\u7247\u56FE\u96C6\u6570\u636E" /* DouyinDataType.实况图片图集数据 */:
+                this.URL = DouyinAPI.动图({ aweme_id: data.aweme_id });
+                const LiveImages = await this.GlobalGetData({
+                    url: `${this.URL}&a_bogus=${Sign.AB(this.URL)}`,
+                    headers: this.headers
+                });
+                return LiveImages;
             default:
                 break;
         }

package/lib/business/douyin/getid.js

@@ -11,21 +11,21 @@ export default async function GetDouyinID(url) {
         case /video\/(\d+)/.test(longLink):
             const videoMatch = longLink.match(/video\/(\d+)/);
             result = {
-                type: "VideoData" /* DouyinDataType['单个视频作品数据'] */,
+                type: "\u5355\u4E2A\u89C6\u9891\u4F5C\u54C1\u6570\u636E" /* DouyinDataType['单个视频作品数据'] */,
                 aweme_id: videoMatch ? videoMatch[1] : ''
             };
             break;
         case /note\/(\d+)/.test(longLink):
             const noteMatch = longLink.match(/note\/(\d+)/);
             result = {
-                type: "NoteData" /* DouyinDataType['图集作品数据'] */,
+                type: "\u56FE\u96C6\u4F5C\u54C1\u6570\u636E" /* DouyinDataType['图集作品数据'] */,
                 aweme_id: noteMatch ? noteMatch[1] : ''
             };
             break;
         case /user\/(\S+?)\?/.test(longLink):
             const userMatch = longLink.match(/user\/(\S+?)\?/);
             result = {
-                type: "UserVideosListData" /* DouyinDataType['用户主页视频列表数据'] */,
+                type: "\u7528\u6237\u4E3B\u9875\u89C6\u9891\u5217\u8868\u6570\u636E" /* DouyinDataType['用户主页视频列表数据'] */,
                 sec_uid: userMatch ? userMatch[1] : ''
             };
             break;

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

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

package/lib/business/douyin/result.js

@@ -2,27 +2,30 @@ import { DouyinData, GetDouyinID } from '../../business/douyin/index.js';
 export default class DouyinResult {
     type;
     cookie;
-    constructor(type, cookie) {
+    returndata;
+    constructor(type, cookie, returndata = true) {
         this.type = type;
         this.cookie = cookie;
+        /** 直接返回数据，不做响应封装 */
+        this.returndata = returndata;
     }
     async result(options = {}) {
         let result;
         switch (this.type) {
-            case 'CommentReplyData':
-            case 'UserInfoData':
-            case 'UserVideosListData':
-            case 'SuggestWordsData':
-            case 'SearchData':
-            case 'EmojiData':
-            case 'ExpressionPlusData':
-            case 'MusicData':
-            case 'LiveImageData':
+            case "\u4E8C\u7EA7\u8BC4\u8BBA\u6570\u636E" /* DouyinDataType.二级评论数据 */:
+            case "\u7528\u6237\u4E3B\u9875\u6570\u636E" /* DouyinDataType.用户主页数据 */:
+            case "\u7528\u6237\u4E3B\u9875\u89C6\u9891\u5217\u8868\u6570\u636E" /* DouyinDataType.用户主页视频列表数据 */:
+            case "\u70ED\u70B9\u8BCD\u6570\u636E" /* DouyinDataType.热点词数据 */:
+            case "\u641C\u7D22\u6570\u636E" /* DouyinDataType.搜索数据 */:
+            case "\u5B98\u65B9emoji\u6570\u636E" /* DouyinDataType.官方emoji数据 */:
+            case "\u52A8\u6001\u8868\u60C5\u6570\u636E" /* DouyinDataType.动态表情数据 */:
+            case "\u97F3\u4E50\u6570\u636E" /* DouyinDataType.音乐数据 */:
+            case "\u5B9E\u51B5\u56FE\u7247\u56FE\u96C6\u6570\u636E" /* DouyinDataType.实况图片图集数据 */:
                 result = await new DouyinData(this.type, this.cookie).GetData(options);
                 break;
-            case 'VideoData':
-            case 'NoteData':
-            case 'CommentData': {
+            case "\u5355\u4E2A\u89C6\u9891\u4F5C\u54C1\u6570\u636E" /* DouyinDataType.单个视频作品数据 */:
+            case "\u56FE\u96C6\u4F5C\u54C1\u6570\u636E" /* DouyinDataType.图集作品数据 */:
+            case "\u8BC4\u8BBA\u6570\u636E" /* DouyinDataType.评论数据 */: {
                 const defurl = options?.url?.toString().match(/(http|https):\/\/.*\.(douyin|iesdouyin)\.com\/[^ ]+/g);
                 const iddata = await GetDouyinID(String(defurl));
                 result = await new DouyinData(this.type, this.cookie).GetData(iddata);
@@ -32,6 +35,8 @@ export default class DouyinResult {
                 result = '';
                 break;
         }
+        if (this.returndata)
+            return result;
         return {
             code: result !== false && result !== '' ? 200 : 503,
             message: result !== false && result !== '' ? 'success' : 'error',

package/lib/model/index.d.ts

@@ -1,4 +1,3 @@
-import logger from './logger.js';
 import Networks from './networks.js';
 export * from './dir.js';
-export { Networks, logger };
+export { Networks };

package/lib/model/index.js

@@ -1,4 +1,3 @@
-import logger from './logger.js';
 import Networks from './networks.js';
 export * from './dir.js';
-export { Networks, logger };
+export { Networks };

package/lib/model/networks.js

@@ -1,4 +1,3 @@
-import { logger } from '../model/index.js';
 import axios from 'axios';
 export default class Networks {
   url;
@@ -48,7 +47,7 @@ export default class Networks {
       return result;
     }
     catch (error) {
-      logger.info(error);
+      console.info(error);
       return false;
     }
   }
@@ -62,7 +61,7 @@ export default class Networks {
       return result.request.res.responseUrl; // axios中获取最终的请求URL
     }
     catch (error) {
-      logger.error(error);
+      console.error(error);
       return '';
     }
   }
@@ -78,7 +77,7 @@ export default class Networks {
       return response.headers['location'];
     }
     catch (error) {
-      logger.error(error);
+      console.error(error);
       return '';
     }
   }
@@ -91,7 +90,7 @@ export default class Networks {
           return result;
         }
         if (result.status === 429) {
-          logger.warn('HTTP 响应状态码: 429');
+          console.warn('HTTP 响应状态码: 429');
           throw new Error('ratelimit triggered, 触发 https://www.douyin.com/ 的速率限制！！！');
         }
         this.axiosInstance = result;
@@ -118,7 +117,7 @@ export default class Networks {
       return this.axiosInstance;
     }
     catch (error) {
-      logger.error(error);
+      console.error(error);
       return false;
     }
   }
@@ -131,17 +130,17 @@ export default class Networks {
           return this.axiosInstance.headers;
         }
         else {
-          logger.error('未获取到响应头');
+          console.error('未获取到响应头');
           return null;
         }
       }
       else {
-        logger.error('未获取到响应对象');
+        console.error('未获取到响应对象');
         return null;
       }
     }
     catch (error) {
-      logger.error('获取响应头失败:', error);
+      console.error('获取响应头失败:', error);
       return null;
     }
   }
@@ -170,12 +169,12 @@ export default class Networks {
         }
       }
       else {
-        logger.error('未获取到响应对象');
+        console.error('未获取到响应对象');
       }
       return { headers, data };
     }
     catch (error) {
-      logger.error('获取响应头和数据失败:', error);
+      console.error('获取响应头和数据失败:', error);
       return { headers: null, data: null };
     }
   }

package/lib/server/client.d.ts

@@ -1,3 +1,6 @@
+import { BilibiliResult } from '../business/bilibili/index.js';
+import { DouyinResult } from '../business/douyin/index.js';
+import { BilibiliDataType, DouyinDataType } from '../types/index.js';
 import { FastifyInstance } from 'fastify';
 interface initClientParams {
     /** 抖音ck */
@@ -5,9 +8,23 @@ interface initClientParams {
     /** B站ck */
     bilibili: string;
 }
+interface amagiInstance {
+    /** Fastify 实例 */
+    Instance: FastifyInstance;
+    /** 获取抖音接口数据 */
+    GetDouyinData: (data: {
+        type: keyof typeof DouyinDataType;
+    }) => DouyinResult;
+    /** 获取B站接口数据 */
+    GetBilibiliData: (data: {
+        type: keyof typeof BilibiliDataType;
+    }) => BilibiliResult;
+}
 export declare class client {
-  private readonly douyin;
-  private readonly bilibili;
+  /** douyin cookies */
+  douyin: string;
+  /** bilibili cookes */
+  bilibili: string;
   /**
      *
      * @param cookies 包含抖音和B站cookie的参数对象
@@ -18,6 +35,12 @@ export declare class client {
      * @param log 是否启用日志
      * @returns fastify 实例
      */
-  initServer(log?: boolean): Promise<FastifyInstance>;
+  initServer(log?: boolean): Promise<amagiInstance>;
+  GetDouyinData: (data: {
+        type: keyof typeof DouyinDataType;
+    }) => DouyinResult;
+  GetBilibiliData: (data: {
+        type: keyof typeof BilibiliDataType;
+    }) => BilibiliResult;
 }
 export {};

package/lib/server/client.js

@@ -1,8 +1,10 @@
 import { BilibiliResult } from '../business/bilibili/index.js';
 import { DouyinResult } from '../business/douyin/index.js';
-import fastify from 'fastify';
+import Fastify from 'fastify';
 export class client {
+  /** douyin cookies */
   douyin;
+  /** bilibili cookes */
   bilibili;
   /**
      *
@@ -20,90 +22,120 @@ export class client {
      * @returns fastify 实例
      */
   async initServer (log = false) {
-    const client = fastify({ logger: log });
+    const client = Fastify({
+      logger: log && {
+        transport: {
+          target: 'pino-pretty',
+          options: {
+            colorize: true,
+            translateTime: 'yyyy-MM-dd HH:mm:ss',
+            ignore: 'pid,hostname,reqId,res,responseTime,req.hostname,req.method,req.remotePort',
+            messageFormat: '{msg}'
+          }
+        }
+      }
+    });
+    client.get('/', async (_request, reply) => {
+      reply.redirect('https://amagi.apifox.cn', 301);
+    });
+    client.get('/docs', async (_request, reply) => {
+      reply.redirect('https://amagi.apifox.cn', 301);
+    });
     client.get('/api/douyin/aweme', async (request, reply) => {
       const url = request.query.url;
-      reply.type('application/json').send(await new DouyinResult("VideoData" /* DouyinDataType['单个视频作品数据'] */, this.douyin).result({ url }));
+      reply.type('application/json').send(await new DouyinResult("\u5355\u4E2A\u89C6\u9891\u4F5C\u54C1\u6570\u636E" /* DouyinDataType.单个视频作品数据 */, this.douyin).result({ url }));
     });
     client.get('/api/douyin/comments', async (request, reply) => {
       const url = request.query.url;
-      reply.type('application/json').send(await new DouyinResult("CommentData" /* DouyinDataType['评论数据'] */, this.douyin).result({ url }));
+      reply.type('application/json').send(await new DouyinResult("\u8BC4\u8BBA\u6570\u636E" /* DouyinDataType.评论数据 */, this.douyin).result({ url }));
     });
     client.get('/api/douyin/comments/reply', async (request, reply) => {
       const { aweme_id, comment_id } = request.query;
-      reply.type('application/json').send(await new DouyinResult("CommentReplyData" /* DouyinDataType['二级评论数据'] */, this.douyin).result({ aweme_id, comment_id }));
+      reply.type('application/json').send(await new DouyinResult("\u4E8C\u7EA7\u8BC4\u8BBA\u6570\u636E" /* DouyinDataType.二级评论数据 */, this.douyin).result({ aweme_id, comment_id }));
     });
     client.get('/api/douyin/userinfo', async (request, reply) => {
       const sec_uid = request.query.sec_uid;
-      reply.type('application/json').send(await new DouyinResult("UserInfoData" /* DouyinDataType['用户主页数据'] */, this.douyin).result({ sec_uid }));
+      reply.type('application/json').send(await new DouyinResult("\u7528\u6237\u4E3B\u9875\u6570\u636E" /* DouyinDataType.用户主页数据 */, this.douyin).result({ sec_uid }));
     });
     client.get('/api/douyin/uservideoslist', async (request, reply) => {
       const sec_uid = request.query.sec_uid;
-      reply.type('application/json').send(await new DouyinResult("UserVideosListData" /* DouyinDataType['用户主页视频列表数据'] */, this.douyin).result({ sec_uid }));
+      reply.type('application/json').send(await new DouyinResult("\u7528\u6237\u4E3B\u9875\u89C6\u9891\u5217\u8868\u6570\u636E" /* DouyinDataType.用户主页视频列表数据 */, this.douyin).result({ sec_uid }));
     });
     client.get('/api/douyin/suggestwords', async (request, reply) => {
       const query = request.query.query;
-      reply.type('application/json').send(await new DouyinResult("SuggestWordsData" /* DouyinDataType['热点词数据'] */, this.douyin).result({ query }));
+      reply.type('application/json').send(await new DouyinResult("\u70ED\u70B9\u8BCD\u6570\u636E" /* DouyinDataType.热点词数据 */, this.douyin).result({ query }));
     });
     client.get('/api/douyin/search', async (request, reply) => {
       const query = request.query.query;
-      reply.type('application/json').send(await new DouyinResult("SearchData" /* DouyinDataType['搜索数据'] */, this.douyin).result({ query }));
+      reply.type('application/json').send(await new DouyinResult("\u641C\u7D22\u6570\u636E" /* DouyinDataType.搜索数据 */, this.douyin).result({ query }));
     });
     client.get('/api/douyin/emoji', async (_request, reply) => {
-      reply.type('application/json').send(await new DouyinResult("EmojiData" /* DouyinDataType['官方emoji数据'] */, this.douyin).result());
+      reply.type('application/json').send(await new DouyinResult("\u5B98\u65B9emoji\u6570\u636E" /* DouyinDataType.官方emoji数据 */, this.douyin).result());
     });
     client.get('/api/douyin/expressionplus', async (_request, reply) => {
-      reply.type('application/json').send(await new DouyinResult("ExpressionPlusData" /* DouyinDataType['动态表情数据'] */, this.douyin).result());
+      reply.type('application/json').send(await new DouyinResult("\u52A8\u6001\u8868\u60C5\u6570\u636E" /* DouyinDataType.动态表情数据 */, this.douyin).result());
     });
     client.get('/api/douyin/music', async (request, reply) => {
       const music_id = request.query.music_id;
-      reply.type('application/json').send(await new DouyinResult("MusicData" /* DouyinDataType['音乐数据'] */, this.douyin).result({ music_id }));
+      reply.type('application/json').send(await new DouyinResult("\u97F3\u4E50\u6570\u636E" /* DouyinDataType.音乐数据 */, this.douyin).result({ music_id }));
+    });
+    client.get('/api/douyin/liveimages', async (request, reply) => {
+      const music_id = request.query.music_id;
+      reply.type('application/json').send(await new DouyinResult("\u5B9E\u51B5\u56FE\u7247\u56FE\u96C6\u6570\u636E" /* DouyinDataType.实况图片图集数据 */, this.douyin).result({ music_id }));
     });
-    // bilibili
     client.get('/api/bilibili/work', async (request, reply) => {
       const url = request.query.url;
-      reply.type('application/json').send(await new BilibiliResult("VideoData" /* BilibiliDataType['单个视频作品数据'] */, this.bilibili).result({ url }));
+      reply.type('application/json').send(await new BilibiliResult("\u5355\u4E2A\u89C6\u9891\u4F5C\u54C1\u6570\u636E" /* BilibiliDataType.单个视频作品数据 */, this.bilibili).result({ url }));
     });
     client.get('/api/bilibili/comment', async (request, reply) => {
       const bvid = request.query.bvid;
-      reply.type('application/json').send(await new BilibiliResult("CommentData" /* BilibiliDataType['评论数据'] */, this.bilibili).result({ bvid }));
+      reply.type('application/json').send(await new BilibiliResult("\u8BC4\u8BBA\u6570\u636E" /* BilibiliDataType.评论数据 */, this.bilibili).result({ bvid }));
     });
     client.get('/api/bilibili/emoji', async (_request, reply) => {
-      reply.type('application/json').send(await new BilibiliResult("EmojiData" /* BilibiliDataType['emoji数据'] */, this.bilibili).result());
+      reply.type('application/json').send(await new BilibiliResult("emoji\u6570\u636E" /* BilibiliDataType.emoji数据 */, this.bilibili).result());
     });
     client.get('/api/bilibili/bangumivideoinfo', async (request, reply) => {
       const url = request.query.url;
-      reply.type('application/json').send(await new BilibiliResult("BangumiVideoData" /* BilibiliDataType['番剧基本信息数据'] */, this.bilibili).result({ url }));
+      reply.type('application/json').send(await new BilibiliResult("\u756A\u5267\u57FA\u672C\u4FE1\u606F\u6570\u636E" /* BilibiliDataType.番剧基本信息数据 */, this.bilibili).result({ url }));
     });
     client.get('/api/bilibili/bangumivideodownloadlink', async (request, reply) => {
       const { cid, ep_id } = request.query;
-      reply.type('application/json').send(await new BilibiliResult("BangumiVideoDownloadLinkData" /* BilibiliDataType['番剧下载信息数据'] */, this.bilibili).result({ cid, ep_id }));
+      reply.type('application/json').send(await new BilibiliResult("\u756A\u5267\u4E0B\u8F7D\u4FE1\u606F\u6570\u636E" /* BilibiliDataType.番剧下载信息数据 */, this.bilibili).result({ cid, ep_id }));
     });
     client.get('/api/bilibili/dynamiclist', async (request, reply) => {
       const host_mid = request.query.host_mid;
-      reply.type('application/json').send(await new BilibiliResult("UserDynamicListData" /* BilibiliDataType['用户主页动态列表数据'] */, this.bilibili).result({ host_mid }));
+      reply.type('application/json').send(await new BilibiliResult("\u7528\u6237\u4E3B\u9875\u52A8\u6001\u5217\u8868\u6570\u636E" /* BilibiliDataType.用户主页动态列表数据 */, this.bilibili).result({ host_mid }));
     });
     client.get('/api/bilibili/dynamicinfo', async (request, reply) => {
       const dynamic_id = request.query.dynamic_id;
-      reply.type('application/json').send(await new BilibiliResult("DynamicInfoData" /* BilibiliDataType['动态详情数据'] */, this.bilibili).result({ dynamic_id }));
+      reply.type('application/json').send(await new BilibiliResult("\u52A8\u6001\u8BE6\u60C5\u6570\u636E" /* BilibiliDataType.动态详情数据 */, this.bilibili).result({ dynamic_id }));
     });
     client.get('/api/bilibili/dynamicdard', async (request, reply) => {
       const dynamic_id = request.query.dynamic_id;
-      reply.type('application/json').send(await new BilibiliResult("DynamicCardData" /* BilibiliDataType['动态卡片数据'] */, this.bilibili).result({ dynamic_id }));
+      reply.type('application/json').send(await new BilibiliResult("\u52A8\u6001\u5361\u7247\u6570\u636E" /* BilibiliDataType.动态卡片数据 */, this.bilibili).result({ dynamic_id }));
     });
     client.get('/api/bilibili/userinfo', async (request, reply) => {
       const host_mid = request.query.host_mid;
-      reply.type('application/json').send(await new BilibiliResult("UserInfoData" /* BilibiliDataType['用户主页数据'] */, this.bilibili).result({ host_mid }));
+      reply.type('application/json').send(await new BilibiliResult("\u7528\u6237\u4E3B\u9875\u6570\u636E" /* BilibiliDataType.用户主页数据 */, this.bilibili).result({ host_mid }));
     });
     client.get('/api/bilibili/liveroominfo', async (request, reply) => {
       const room_id = request.query.room_id;
-      reply.type('application/json').send(await new BilibiliResult("LiveRoomInfoData" /* BilibiliDataType['直播间信息'] */, this.bilibili).result({ room_id }));
+      reply.type('application/json').send(await new BilibiliResult("\u76F4\u64AD\u95F4\u4FE1\u606F" /* BilibiliDataType.直播间信息 */, this.bilibili).result({ room_id }));
     });
     client.get('/api/bilibili/liveroominit', async (request, reply) => {
       const room_id = request.query.room_id;
-      reply.type('application/json').send(await new BilibiliResult("LiveRoomInitData" /* BilibiliDataType['直播间初始化信息'] */, this.bilibili).result({ room_id }));
+      reply.type('application/json').send(await new BilibiliResult("\u76F4\u64AD\u95F4\u521D\u59CB\u5316\u4FE1\u606F" /* BilibiliDataType.直播间初始化信息 */, this.bilibili).result({ room_id }));
     });
-    // 返回 fastify 实例
-    return client;
+    return {
+      Instance: client,
+      GetDouyinData: this.GetDouyinData,
+      GetBilibiliData: this.GetBilibiliData
+    };
   }
+  GetDouyinData = (data) => {
+    return new DouyinResult(data.type, this.douyin, true);
+  };
+  GetBilibiliData = (data) => {
+    return new BilibiliResult(data.type, this.bilibili, true);
+  };
 }

package/lib/server/listen.d.ts

@@ -1,19 +1,8 @@
 import { FastifyInstance } from 'fastify';
-interface ServerOptions {
-    /**
-     * 端口
-     */
-    port?: number;
-    /**
-     * 是否启用日志
-     */
-    log?: boolean;
-}
 /**
- * 启动 fastify 实例
- * @param client fastify 实例
- * @param options 配置项
+ * 启动本地 http 服务
+ * @param client Fastify 实例
+ * @param port 监听端口
  * @returns
  */
-export declare const StartClient: (client: FastifyInstance, options: ServerOptions) => Promise<void>;
-export {};
+export declare const StartClient: (client: FastifyInstance, port: 4567) => Promise<void>;

package/lib/server/listen.js

@@ -1,14 +1,13 @@
-import { logger } from '../model/index.js';
 /**
- * 启动 fastify 实例
- * @param client fastify 实例
- * @param options 配置项
+ * 启动本地 http 服务
+ * @param client Fastify 实例
+ * @param port 监听端口
  * @returns
  */
-export const StartClient = async (client, options) => {
-  return client.listen({ port: options.port, host: '::' }, (_err, _address) => {
+export const StartClient = async (client, port) => {
+  return client.listen({ port: port, host: '::' }, (_err, _address) => {
     if (_err)
-      logger.error(_err);
-    logger.info(`amagi server listening on ${options.port} port. API docs: https://amagi.apifox.cn`);
+      client.log.error(_err);
+    console.log(`amagi server listening on ${port} port. API docs: https://amagi.apifox.cn`);
   });
 };

package/lib/types/DataType.d.ts

@@ -2,33 +2,32 @@
  * 抖音接口类型
  */
 export declare const enum DouyinDataType {
-    二级评论数据 = "CommentReplyData",
-    用户主页数据 = "UserInfoData",
-    单个视频作品数据 = "VideoData",
-    评论数据 = "CommentData",
-    用户主页视频列表数据 = "UserVideosListData",
-    热点词数据 = "SuggestWordsData",
-    搜索数据 = "SearchData",
-    官方emoji数据 = "EmojiData",
-    动态表情数据 = "ExpressionPlusData",
-    音乐数据 = "MusicData",
-    图集作品数据 = "NoteData",
-    实况图片图集数据 = "LiveImageData"
+    二级评论数据 = "\u4E8C\u7EA7\u8BC4\u8BBA\u6570\u636E",
+    用户主页数据 = "\u7528\u6237\u4E3B\u9875\u6570\u636E",
+    单个视频作品数据 = "\u5355\u4E2A\u89C6\u9891\u4F5C\u54C1\u6570\u636E",
+    评论数据 = "\u8BC4\u8BBA\u6570\u636E",
+    用户主页视频列表数据 = "\u7528\u6237\u4E3B\u9875\u89C6\u9891\u5217\u8868\u6570\u636E",
+    热点词数据 = "\u70ED\u70B9\u8BCD\u6570\u636E",
+    搜索数据 = "\u641C\u7D22\u6570\u636E",
+    官方emoji数据 = "\u5B98\u65B9emoji\u6570\u636E",
+    动态表情数据 = "\u52A8\u6001\u8868\u60C5\u6570\u636E",
+    音乐数据 = "\u97F3\u4E50\u6570\u636E",
+    图集作品数据 = "\u56FE\u96C6\u4F5C\u54C1\u6570\u636E",
+    实况图片图集数据 = "\u5B9E\u51B5\u56FE\u7247\u56FE\u96C6\u6570\u636E"
 }
 /**
  * B站接口类型
  */
 export declare const enum BilibiliDataType {
-    单个视频作品数据 = "VideoData",
-    评论数据 = "CommentData",
-    用户主页数据 = "UserInfoData",
-    用户主页动态列表数据 = "UserDynamicListData",
-    搜索数据 = "SearchData",
-    emoji数据 = "EmojiData",
-    番剧基本信息数据 = "BangumiVideoData",
-    番剧下载信息数据 = "BangumiVideoDownloadLinkData",
-    动态详情数据 = "DynamicInfoData",
-    动态卡片数据 = "DynamicCardData",
-    直播间信息 = "LiveRoomInfoData",
-    直播间初始化信息 = "LiveRoomInitData"
+    单个视频作品数据 = "\u5355\u4E2A\u89C6\u9891\u4F5C\u54C1\u6570\u636E",
+    评论数据 = "\u8BC4\u8BBA\u6570\u636E",
+    用户主页数据 = "\u7528\u6237\u4E3B\u9875\u6570\u636E",
+    用户主页动态列表数据 = "\u7528\u6237\u4E3B\u9875\u52A8\u6001\u5217\u8868\u6570\u636E",
+    emoji数据 = "emoji\u6570\u636E",
+    番剧基本信息数据 = "\u756A\u5267\u57FA\u672C\u4FE1\u606F\u6570\u636E",
+    番剧下载信息数据 = "\u756A\u5267\u4E0B\u8F7D\u4FE1\u606F\u6570\u636E",
+    动态详情数据 = "\u52A8\u6001\u8BE6\u60C5\u6570\u636E",
+    动态卡片数据 = "\u52A8\u6001\u5361\u7247\u6570\u636E",
+    直播间信息 = "\u76F4\u64AD\u95F4\u4FE1\u606F",
+    直播间初始化信息 = "\u76F4\u64AD\u95F4\u521D\u59CB\u5316\u4FE1\u606F"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ikenxuan/amagi",
-  "version": "1.5.8",
+  "version": "2.0.0",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -34,9 +34,8 @@
     "chokidar": "^3.6.0",
     "fastify": "^4.28.1",
     "lodash": "4.17.21",
-    "loglevel": "^1.9.1",
-    "loglevel-plugin-prefix": "^0.8.4",
-    "md5": "^2.3.0"
+    "md5": "^2.3.0",
+    "pino-pretty": "^11.2.2"
   },
   "devDependencies": {
     "@types/lodash": "latest",

package/lib/model/logger.d.ts

@@ -1,3 +0,0 @@
-import log from 'loglevel';
-declare const logger: log.RootLogger;
-export default logger;

package/lib/model/logger.js

@@ -1,28 +0,0 @@
-import chalk from 'chalk';
-import log from 'loglevel';
-import prefix from 'loglevel-plugin-prefix';
-const colors = {
-  TRACE: chalk.magenta,
-  DEBUG: chalk.cyan,
-  INFO: chalk.blue,
-  WARN: chalk.yellow,
-  ERROR: chalk.red
-};
-prefix.reg(log);
-log.enableAll();
-prefix.apply(log, {
-  format (level, name, timestamp) {
-    const levelKey = level.toUpperCase();
-    if (!(levelKey in colors)) {
-      throw new Error(`Invalid log level: ${levelKey}`);
-    }
-    return `${chalk.gray(`[${timestamp}]`)} ${colors[levelKey](level)} ${chalk.green(`${name}:`)}`;
-  }
-});
-prefix.apply(log.getLogger('critical'), {
-  format (level, name, timestamp) {
-    return chalk.red.bold(`[${timestamp}] ${level} ${name}:`);
-  }
-});
-const logger = log;
-export default logger;