@ikenxuan/amagi 2.1.1 → 2.1.3

package/lib/business/bilibili/API.js

@@ -10,7 +10,7 @@ class BiLiBiLiAPI {
     }
     /** type参数详见https://github.com/SocialSisterYi/bilibili-API-collect/blob/master/docs/comment/readme.md#评论区类型代码 */
     评论区明细(data) {
-        return `https://api.bilibili.com/x/v2/reply?sort=1&ps=${data.number || 20}&type=${data.type}&oid=${data.oid}`;
+        return `https://api.bilibili.com/x/v2/reply?sort=1&ps=${data.number || 20}&type=${data.commentstype}&oid=${data.oid}`;
     }
     表情列表() {
         return 'https://api.bilibili.com/x/emote/user/panel/web?business=reply&web_location=0.0';

package/lib/business/bilibili/getdata.js

@@ -16,18 +16,27 @@ export default class BilibiliData {
         switch (this.type) {
             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 });
+                return INFODATA;
+            }
+            case "\u5355\u4E2A\u89C6\u9891\u4E0B\u8F7D\u4FE1\u606F\u6570\u636E" /* BilibiliDataType.单个视频下载信息数据 */: {
+                const BASEURL = BiLiBiLiAPI.视频流信息({ avid: data.avid, cid: data.cid });
                 const SIGN = await qtparam(BASEURL, this.headers.Cookie);
                 const DATA = await this.GlobalGetData({
-                    url: BiLiBiLiAPI.视频流信息({ avid: INFODATA.data.aid, cid: INFODATA.data.cid }) + SIGN.QUERY,
+                    url: BiLiBiLiAPI.视频流信息({ avid: data.avid, cid: data.cid }) + SIGN.QUERY,
                     headers: this.headers
                 });
-                return { INFODATA, DATA };
+                return DATA;
             }
             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 });
+                let COMMENTSDATA;
+                if (!data.bvid) {
+                    COMMENTSDATA = await this.GlobalGetData({ url: BiLiBiLiAPI.评论区明细({ commentstype: Number(data.commentstype), oid: data.oid, number: data.number }), headers: this.headers });
+                }
+                else {
+                    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);
+                    COMMENTSDATA = await this.GlobalGetData({ url: BiLiBiLiAPI.评论区明细({ type: 1, oid: INFODATA.data.aid, number: data.number }) + PARAM, headers: this.headers });
+                }
                 return COMMENTSDATA;
             }
             case "emoji\u6570\u636E" /* BilibiliDataType.emoji数据 */:
@@ -51,7 +60,7 @@ export default class BilibiliData {
             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 "\u7528\u6237\u4E3B\u9875\u52A8\u6001\u5217\u8868\u6570\u636E" /* BilibiliDataType.用户主页动态列表数据 */:
-                // delete this.headers.Referer
+                delete this.headers.Referer;
                 result = await this.GlobalGetData({
                     url: BiLiBiLiAPI.用户空间动态({ host_mid: data.host_mid }),
                     headers: this.headers
@@ -94,6 +103,27 @@ export default class BilibiliData {
                 });
                 return result;
             }
+            case "\u7533\u8BF7\u4E8C\u7EF4\u7801" /* BilibiliDataType.申请二维码 */: {
+                result = await this.GlobalGetData({
+                    url: BiLiBiLiAPI.申请二维码(),
+                    headers: this.headers
+                });
+                return result;
+            }
+            case "\u4E8C\u7EF4\u7801\u72B6\u6001" /* BilibiliDataType.二维码状态 */: {
+                result = await new Networks({
+                    url: BiLiBiLiAPI.二维码状态({ qrcode_key: data.qrcode_key }),
+                    headers: this.headers
+                }).getHeadersAndData();
+                return result;
+            }
+            case "\u767B\u5F55\u57FA\u672C\u4FE1\u606F" /* BilibiliDataType.登录基本信息 */: {
+                result = await this.GlobalGetData({
+                    url: BiLiBiLiAPI.登录基本信息(),
+                    headers: this.headers
+                });
+                return result;
+            }
             default:
                 return null;
         }
@@ -102,8 +132,7 @@ export default class BilibiliData {
         const result = await new Networks(options).getData();
         if (result && result.code !== 0) {
             const errorMessage = errorMap[result.code] || '未知错误';
-            console.error(`响应数据失败！\n请求接口类型：${this.type}\n请求URL：${options.url}\n错误代码：${result.code}，\n含义：${errorMessage}`);
-            return null;
+            throw new Error(`响应数据失败！\n请求接口类型：${this.type}\n请求URL：${options.url}\n错误代码：${result.code}，\n含义：${errorMessage}`);
         }
         else {
             return result;

package/lib/business/bilibili/getid.js

@@ -1,4 +1,4 @@
-import { Networks } from '../../model/index.js';
+import { Networks, logger } from '../../model/index.js';
 /**
  * return aweme_id
  * @param {string} url 分享连接
@@ -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: "\u5355\u4E2A\u89C6\u9891\u4F5C\u54C1\u6570\u636E" /* 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: "\u756A\u5267\u57FA\u672C\u4FE1\u606F\u6570\u636E" /* 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: "\u52A8\u6001\u8BE6\u60C5\u6570\u636E" /* BilibiliDataType['动态详情数据'] */,
+                type: "\u52A8\u6001\u8BE6\u60C5\u6570\u636E" /* BilibiliDataType.动态详情数据 */,
                 dynamic_id: dynamic_id ? dynamic_id[1] : ''
             };
             break;
@@ -37,5 +37,6 @@ export default async function GetBilibiliID(url) {
         default:
             break;
     }
+    logger.mark(result);
     return result;
 }

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

@@ -1,5 +1,5 @@
 import { BilibiliDataType, BilibiliOptionsType, GetDataResponseType } from '../../types/index.js';
-interface resultParams {
+interface configParams {
     /** 请求数据的类型 */
     type: keyof typeof BilibiliDataType;
     /** B站用户ck */
@@ -11,5 +11,5 @@ interface resultParams {
  * @param config
  * @returns
  */
-export default function BilibiliResult(config: resultParams | undefined, options: BilibiliOptionsType): Promise<GetDataResponseType | any>;
+export default function BilibiliResult(config: configParams | undefined, options: BilibiliOptionsType): Promise<GetDataResponseType | any>;
 export {};

package/lib/business/bilibili/result.js

@@ -17,12 +17,22 @@ export default async function BilibiliResult(config = { cookie: '' }, options) {
         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.直播间初始化信息 */:
+        case "\u5355\u4E2A\u89C6\u9891\u4E0B\u8F7D\u4FE1\u606F\u6570\u636E" /* BilibiliDataType.单个视频下载信息数据 */:
+        case "\u4E8C\u7EF4\u7801\u72B6\u6001" /* BilibiliDataType.二维码状态 */:
+        case "\u7533\u8BF7\u4E8C\u7EF4\u7801" /* BilibiliDataType.申请二维码 */:
+        case "\u767B\u5F55\u57FA\u672C\u4FE1\u606F" /* BilibiliDataType.登录基本信息 */:
             data = await new BilibiliData(config.type, config.cookie).GetData(options);
             break;
         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);
-            data = await new BilibiliData(config.type, config.cookie).GetData(iddata);
+            const hasid = options.id || null;
+            if (hasid) {
+                data = await new BilibiliData(config.type, config.cookie).GetData({ id: options.id });
+            }
+            else {
+                const iddata = await GetBilibiliID(options.url);
+                data = await new BilibiliData(config.type, config.cookie).GetData(iddata);
+            }
             break;
         }
         default:

package/lib/business/douyin/API.js

@@ -5,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=${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}`;
+        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 || 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}`;
     }
     二级评论(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.js

@@ -28,7 +28,7 @@ export default class DouyinData {
                 return VideoData;
             }
             case "\u8BC4\u8BBA\u6570\u636E" /* DouyinDataType.评论数据 */: {
-                this.URL = DouyinAPI.评论({ aweme_id: data.aweme_id });
+                this.URL = DouyinAPI.评论({ aweme_id: data.aweme_id, number: data.number });
                 const CommentsData = await this.GlobalGetData({
                     url: `${this.URL}&a_bogus=${Sign.AB(this.URL)}`,
                     headers: this.headers
@@ -115,7 +115,10 @@ export default class DouyinData {
                 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
+                    headers: {
+                        ...this.headers,
+                        'User-Agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 16_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Mobile/15E148 Safari/604.1 Edg/126.0.0.0'
+                    }
                 });
                 return LiveImages;
             }
@@ -125,6 +128,9 @@ export default class DouyinData {
     }
     async GlobalGetData(options) {
         const ResponseData = await new Networks(options).getData();
+        if (ResponseData === '') {
+            throw new Error('获取响应数据失败！抖音ck可能已经失效！\n请求类型：' + this.type + '\n请求URL：' + options.url);
+        }
         return ResponseData;
     }
 }

package/lib/business/douyin/getid.js

@@ -1,4 +1,4 @@
-import { Networks } from '../../model/index.js';
+import { logger, Networks } from '../../model/index.js';
 /**
  * return aweme_id
  * @param {string} url 视频分享连接
@@ -32,5 +32,6 @@ export default async function GetDouyinID(url) {
         default:
             break;
     }
+    logger.mark(result);
     return result;
 }

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

@@ -1,9 +1,9 @@
 import { DouyinDataType, DouyinOptionsType, GetDataResponseType } from '../../types/index.js';
-interface resultParams {
+interface configParams {
     /** 请求数据的类型 */
     type: keyof typeof DouyinDataType;
-    /** B站用户ck */
+    /** 抖音用户ck */
     cookie: string;
 }
-export default function DouyinResult(config?: resultParams, options?: DouyinOptionsType): Promise<GetDataResponseType>;
+export default function DouyinResult(config?: configParams, options?: DouyinOptionsType): Promise<GetDataResponseType>;
 export {};

package/lib/business/douyin/result.js

@@ -16,9 +16,15 @@ export default async function DouyinResult(config = { cookie: '' }, options = {}
         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(config.type, config.cookie).GetData(iddata);
+            const hasaweme_id = options.aweme_id || null;
+            if (hasaweme_id) {
+                result = await new DouyinData(config.type, config.cookie).GetData({ aweme_id: options.aweme_id, number: options.number });
+            }
+            else {
+                const defurl = options.url?.toString().match(/(http|https):\/\/.*\.(douyin|iesdouyin)\.com\/[^ ]+/g);
+                const iddata = await GetDouyinID(String(defurl));
+                result = await new DouyinData(config.type, config.cookie).GetData(iddata);
+            }
             break;
         }
         default:

package/lib/index.js

@@ -15,7 +15,7 @@ const amagi = client;
  */
 export const GetDouyinData = async (type, cookie = '', options = {}) => {
     const data = await DouyinResult({ type, cookie }, options);
-    return data;
+    return data.data;
 };
 /**
  *
@@ -26,5 +26,5 @@ export const GetDouyinData = async (type, cookie = '', options = {}) => {
  */
 export const GetBilibiliData = async (type, cookie = '', options = {}) => {
     const data = await BilibiliResult({ type, cookie }, options);
-    return data;
+    return data.data;
 };

package/lib/model/index.d.ts

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

package/lib/model/index.js

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

package/lib/model/logger.d.ts

@@ -0,0 +1,3 @@
+import log4js from 'log4js'
+declare const logger: log4js.Logger
+export default logger

package/lib/model/logger.js

@@ -0,0 +1,44 @@
+import log4js from 'log4js'
+log4js.configure({
+  appenders: {
+    console: {
+      type: 'stdout',
+      layout: {
+        type: 'pattern',
+        pattern: '%[[amagi][%d{hh:mm:ss.SSS}][%4.4p]%] %m'
+      }
+    },
+    command: {
+      type: 'dateFile',
+      filename: 'logs/command',
+      pattern: 'yyyy-MM-dd.log',
+      numBackups: 15,
+      alwaysIncludePattern: true,
+      layout: {
+        type: 'pattern',
+        pattern: '[%d{hh:mm:ss.SSS}][%4.4p] %m'
+      }
+    },
+    pluginConsole: {
+      type: 'stdout',
+      layout: {
+        type: 'pattern',
+        pattern: '%[[%d{hh:mm:ss.SSS}][%4.4p][plugin]%] %m'
+      }
+    },
+    pluginCommand: {
+      type: 'dateFile',
+      filename: 'logs/pluginCommand',
+      pattern: 'yyyy-MM-dd.log',
+      numBackups: 15,
+      alwaysIncludePattern: true,
+      layout: { type: 'pattern', pattern: '[%d{hh:mm:ss.SSS}][%4.4p] %m' }
+    }
+  },
+  categories: {
+    default: { appenders: [ 'console', 'command' ], level: 'info' } // 添加default类别
+  },
+  pm2: true
+})
+const logger = log4js.getLogger()
+export default logger

package/lib/model/networks.d.ts

@@ -24,5 +24,9 @@ export default class Networks {
   getLocation(): Promise<string>;
   /** 获取数据并处理数据的格式化，默认json */
   getData(new_fetch?: string): Promise<any | boolean>;
+  getHeadersAndData(): Promise<{
+        headers: any;
+        data: any;
+    }>;
 }
 export {}

package/lib/model/networks.js

@@ -1,4 +1,5 @@
 import axios, { AxiosError } from 'axios'
+import logger from './logger.js'
 export default class Networks {
   url
   method
@@ -47,7 +48,7 @@ export default class Networks {
       return result
     }
     catch (error) {
-      console.info(error)
+      logger.info(error)
       return false
     }
   }
@@ -94,7 +95,7 @@ export default class Networks {
           return result
         }
         if (result.status === 429) {
-          console.warn('HTTP 响应状态码: 429')
+          logger.error('HTTP 响应状态码: 429')
           throw new Error('ratelimit triggered, 触发 https://www.douyin.com/ 的速率限制！！！')
         }
         this.axiosInstance = result
@@ -112,4 +113,21 @@ export default class Networks {
       return false
     }
   }
+  async getHeadersAndData () {
+    try {
+      // 发起网络请求获取响应对象
+      const result = await this.axiosInstance.get(this.config)
+      // 初始化响应头和响应数据
+      let headers = {}
+      const fetchHeaders = result.headers
+      for (const [ key, value ] of Object.entries(fetchHeaders)) {
+        headers[key] = value
+      }
+      return { headers, data: result.data }
+    }
+    catch (error) {
+      console.error('获取响应头和数据失败:', error)
+      return { headers: null, data: null }
+    }
+  }
 }

package/lib/server/client.js

@@ -107,12 +107,36 @@ export class client {
         cookie: this.douyin
       }, { url: request.query.url }))
     })
+    client.get('/api/bilibili/generateqrcode', async (request, reply) => {
+      reply.type('application/json').send(await BilibiliResult({
+        type: "\u7533\u8BF7\u4E8C\u7EF4\u7801" /* BilibiliDataType.申请二维码 */,
+        cookie: ''
+      }, {}))
+    })
+    client.get('/api/bilibili/qrcodepoll', async (request, reply) => {
+      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', async (request, reply) => {
+      reply.type('application/json').send(await BilibiliResult({
+        type: "\u767B\u5F55\u57FA\u672C\u4FE1\u606F" /* BilibiliDataType.登录基本信息 */,
+        cookie: request.query.cookie
+      }, {}))
+    })
     client.get('/api/bilibili/work', async (request, reply) => {
       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/downloadwork', async (request, reply) => {
+      reply.type('application/json').send(await BilibiliResult({
+        type: "\u5355\u4E2A\u89C6\u9891\u4E0B\u8F7D\u4FE1\u606F\u6570\u636E" /* BilibiliDataType.单个视频下载信息数据 */,
+        cookie: this.bilibili
+      }, { url: request.query.url }))
+    })
     client.get('/api/bilibili/comment', async (request, reply) => {
       reply.type('application/json').send(await BilibiliResult({
         type: "\u8BC4\u8BBA\u6570\u636E" /* BilibiliDataType.评论数据 */,

package/lib/server/listen.js

@@ -1,3 +1,4 @@
+import { logger } from '../model/index.js'
 /**
  * 启动本地 http 服务
  * @param client Fastify 实例
@@ -8,6 +9,6 @@ export const StartClient = async (client, port) => {
   return client.listen({ port: port, host: '::' }, (_err, _address) => {
     if (_err)
       client.log.error(_err)
-    console.log(`amagi server listening on ${port} port. API docs: https://amagi.apifox.cn`)
+    logger.mark(`amagi server listening on ${port} port. API docs: https://amagi.apifox.cn`)
   })
 }

package/lib/types/BilibiliAPIParams.d.ts

@@ -13,6 +13,8 @@ type VideoStreamParams = {
 type CommentParams = {
     /** 评论区类型，type参数详见https://github.com/SocialSisterYi/bilibili-API-collect/blob/master/docs/comment/readme.md#评论区类型代码 */
     type?: number | string;
+    /** 评论区类型，type参数详见https://github.com/SocialSisterYi/bilibili-API-collect/blob/master/docs/comment/readme.md#评论区类型代码 */
+    commentstype?: number | string;
     /** 稿件ID，也就是AVID */
     oid?: number | string;
     /** 获取的评论数量，默认最高20 */

package/lib/types/DataType.d.ts

@@ -20,6 +20,7 @@ export declare const enum DouyinDataType {
  */
 export declare const enum BilibiliDataType {
     单个视频作品数据 = "\u5355\u4E2A\u89C6\u9891\u4F5C\u54C1\u6570\u636E",
+    单个视频下载信息数据 = "\u5355\u4E2A\u89C6\u9891\u4E0B\u8F7D\u4FE1\u606F\u6570\u636E",
     评论数据 = "\u8BC4\u8BBA\u6570\u636E",
     用户主页数据 = "\u7528\u6237\u4E3B\u9875\u6570\u636E",
     用户主页动态列表数据 = "\u7528\u6237\u4E3B\u9875\u52A8\u6001\u5217\u8868\u6570\u636E",
@@ -29,5 +30,8 @@ export declare const enum BilibiliDataType {
     动态详情数据 = "\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"
+    直播间初始化信息 = "\u76F4\u64AD\u95F4\u521D\u59CB\u5316\u4FE1\u606F",
+    登录基本信息 = "\u767B\u5F55\u57FA\u672C\u4FE1\u606F",
+    申请二维码 = "\u7533\u8BF7\u4E8C\u7EF4\u7801",
+    二维码状态 = "\u4E8C\u7EF4\u7801\u72B6\u6001"
 }

package/lib/types/OptionsType.d.ts

@@ -26,6 +26,10 @@ export type DouyinOptionsType = {
      * 音乐ID
      */
     music_id?: string;
+    /**
+     * 评论数量，单位条
+     */
+    number?: number;
 };
 /**
  * 接口公共查询参数
@@ -50,7 +54,7 @@ export type BilibiliOptionsType = {
     /**
      * 用户ID
      */
-    host_mid?: string;
+    host_mid?: string | number;
     /**
      * 动态ID
      */
@@ -67,4 +71,24 @@ export type BilibiliOptionsType = {
      * 直播间ID
      */
     room_id?: string;
+    /**
+     * 评论数量，单位条
+     */
+    number?: number;
+    /**
+     * 用户 Cookie
+     */
+    cookie?: string;
+    /**
+     * 二维码key
+     */
+    qrcode_key?: string;
+    /**
+     * 评论区类型代码
+     */
+    commentstype?: number;
+    /**
+     * 评论区查询专属参数
+     */
+    oid?: number;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ikenxuan/amagi",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -31,6 +31,7 @@
   "dependencies": {
     "axios": "^1.7.3",
     "fastify": "^4.28.1",
+    "log4js": "6.9.0",
     "md5": "^2.3.0",
     "pino-pretty": "^11.2.2"
   },