@ikenxuan/amagi 2.1.2 → 2.1.4

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.评论区明细({ commentstype: 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;
         }

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;
             }

package/lib/business/douyin/getid.js

@@ -8,27 +8,39 @@ export default async function GetDouyinID(url) {
     const longLink = await new Networks({ url }).getLongLink();
     let result = {};
     switch (true) {
-        case /video\/(\d+)/.test(longLink):
+        case /share\/slides\/(\d+)/.test(longLink): {
+            const newres = await new Networks({ url }).getLocation();
+            const match = newres.match(/share\/slides\/(\d+)/);
+            result = {
+                type: "\u5B9E\u51B5\u56FE\u7247\u56FE\u96C6\u6570\u636E" /* DouyinDataType.实况图片图集数据 */,
+                aweme_id: match ? match[1] : '',
+            };
+            break;
+        }
+        case /video\/(\d+)/.test(longLink): {
             const videoMatch = longLink.match(/video\/(\d+)/);
             result = {
-                type: "\u5355\u4E2A\u89C6\u9891\u4F5C\u54C1\u6570\u636E" /* DouyinDataType['单个视频作品数据'] */,
+                type: "\u5355\u4E2A\u89C6\u9891\u4F5C\u54C1\u6570\u636E" /* DouyinDataType.单个视频作品数据 */,
                 aweme_id: videoMatch ? videoMatch[1] : ''
             };
             break;
-        case /note\/(\d+)/.test(longLink):
+        }
+        case /note\/(\d+)/.test(longLink): {
             const noteMatch = longLink.match(/note\/(\d+)/);
             result = {
-                type: "\u56FE\u96C6\u4F5C\u54C1\u6570\u636E" /* DouyinDataType['图集作品数据'] */,
+                type: "\u56FE\u96C6\u4F5C\u54C1\u6570\u636E" /* DouyinDataType.图集作品数据 */,
                 aweme_id: noteMatch ? noteMatch[1] : ''
             };
             break;
-        case /user\/(\S+?)\?/.test(longLink):
+        }
+        case /user\/(\S+?)\?/.test(longLink): {
             const userMatch = longLink.match(/user\/(\S+?)\?/);
             result = {
-                type: "\u7528\u6237\u4E3B\u9875\u89C6\u9891\u5217\u8868\u6570\u636E" /* DouyinDataType['用户主页视频列表数据'] */,
+                type: "\u7528\u6237\u4E3B\u9875\u89C6\u9891\u5217\u8868\u6570\u636E" /* DouyinDataType.用户主页视频列表数据 */,
                 sec_uid: userMatch ? userMatch[1] : ''
             };
             break;
+        }
         default:
             break;
     }

package/lib/business/douyin/result.js

@@ -10,19 +10,18 @@ export default async function DouyinResult(config = { cookie: '' }, options = {}
         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(config.type, config.cookie).GetData(options);
             break;
+        case "\u5B9E\u51B5\u56FE\u7247\u56FE\u96C6\u6570\u636E" /* DouyinDataType.实况图片图集数据 */:
         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 hasaweme_id = options.aweme_id || null;
             if (hasaweme_id) {
-                result = await new DouyinData(config.type, config.cookie).GetData({ aweme_id: options.aweme_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));
+                const iddata = await GetDouyinID(String(options.url));
                 result = await new DouyinData(config.type, config.cookie).GetData(iddata);
             }
             break;

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

@@ -24,7 +24,8 @@ export default class Networks {
     // 创建axios实例
     this.axiosInstance = axios.create({
       timeout: this.timeout,
-      headers: this.headers
+      headers: this.headers,
+      maxRedirects: 5
     })
   }
   get config () {
@@ -58,8 +59,11 @@ export default class Networks {
   /** 最终地址（跟随重定向） */
   async getLongLink () {
     try {
-      const result = await this.returnResult()
-      return result.request.res.responseUrl // axios中获取最终的请求URL
+      const response = await this.axiosInstance({
+        method: 'GET',
+        url: this.url
+      })
+      return response.request.res.responseUrl // axios中获取最终的请求URL
     }
     catch (error) {
       if (error instanceof AxiosError) {
@@ -113,4 +117,21 @@ export default class Networks {
       return false
     }
   }
+  async getHeadersAndData () {
+    try {
+      // 发起网络请求获取响应对象
+      const result = await this.axiosInstance(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.headers.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
+      }, { avid: request.query.avid, cid: request.query.cid }))
+    })
     client.get('/api/bilibili/comment', async (request, reply) => {
       reply.type('application/json').send(await BilibiliResult({
         type: "\u8BC4\u8BBA\u6570\u636E" /* BilibiliDataType.评论数据 */,

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.2",
+  "version": "2.1.4",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",