@ikenxuan/amagi 2.1.3 → 2.1.4

package/lib/business/bilibili/getdata.js

@@ -35,7 +35,7 @@ export default class BilibiliData {
                 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 });
+                    COMMENTSDATA = await this.GlobalGetData({ url: BiLiBiLiAPI.评论区明细({ commentstype: 1, oid: INFODATA.data.aid, number: data.number }) + PARAM, headers: this.headers });
                 }
                 return COMMENTSDATA;
             }

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,9 +10,9 @@ 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.评论数据 */: {
@@ -21,8 +21,7 @@ export default async function DouyinResult(config = { cookie: '' }, options = {}
                 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.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) {
@@ -116,7 +120,7 @@ export default class Networks {
   async getHeadersAndData () {
     try {
       // 发起网络请求获取响应对象
-      const result = await this.axiosInstance.get(this.config)
+      const result = await this.axiosInstance(this.config)
       // 初始化响应头和响应数据
       let headers = {}
       const fetchHeaders = result.headers

package/lib/server/client.js

@@ -122,7 +122,7 @@ export class client {
     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
+        cookie: request.headers.cookie
       }, {}))
     })
     client.get('/api/bilibili/work', async (request, reply) => {
@@ -135,7 +135,7 @@ export class client {
       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 }))
+      }, { avid: request.query.avid, cid: request.query.cid }))
     })
     client.get('/api/bilibili/comment', async (request, reply) => {
       reply.type('application/json').send(await BilibiliResult({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ikenxuan/amagi",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",