@ikenxuan/amagi 1.5.4 → 1.5.6

package/lib/business/bilibili/getdata.js

@@ -22,7 +22,7 @@ export default class BilibiliData {
                     url: BiLiBiLiAPI.视频流信息({ avid: INFODATA.data.aid, cid: INFODATA.data.cid }) + SIGN.QUERY,
                     headers: this.headers
                 });
-                return { INFODATA, DATA, };
+                return { INFODATA, DATA };
             }
             case 'CommentData': {
                 const INFODATA = await this.GlobalGetData({ url: BiLiBiLiAPI.视频详细信息({ id_type: 'bvid', id: data.bvid }) });
@@ -94,6 +94,8 @@ export default class BilibiliData {
                 });
                 return result;
             }
+            default:
+                return null;
         }
     }
     async GlobalGetData(options) {
@@ -108,30 +110,6 @@ export default class BilibiliData {
         }
     }
 }
-function mapping_table(type) {
-    // 使用类型断言来告诉 TypeScript 编译器 Array 对象实际上是一个可以接受字符串索引的对象
-    const Array = {
-        1: ['DYNAMIC_TYPE_AV', 'DYNAMIC_TYPE_PGC', 'DYNAMIC_TYPE_UGC_SEASON'],
-        11: ['DYNAMIC_TYPE_DRAW'],
-        12: ['DYNAMIC_TYPE_ARTICLE'],
-        17: ['DYNAMIC_TYPE_LIVE_RCMD', 'DYNAMIC_TYPE_FORWARD', 'DYNAMIC_TYPE_WORD', 'DYNAMIC_TYPE_COMMON_SQUARE'],
-        19: ['DYNAMIC_TYPE_MEDIALIST']
-    };
-    for (const key in Array) {
-        if (Array[key].includes(type)) {
-            return parseInt(key);
-        }
-    }
-    return 1;
-}
-function oid(dynamicINFO, dynamicINFO_CARD) {
-    if (dynamicINFO.data.item.type == 'DYNAMIC_TYPE_WORD') {
-        return dynamicINFO.data.item.id_str;
-    }
-    else
-        return dynamicINFO_CARD.data.card.desc.rid;
-}
-// 同上
 const errorMap = {
     '-1': '应用程序不存在或已被封禁',
     '-2': 'Access Key 错误',

package/lib/business/bilibili/getid.js

@@ -12,7 +12,7 @@ export default async function GetBilibiliID(url) {
             const bvideoMatch = longLink.match(/video\/([A-Za-z0-9]+)/);
             result = {
                 type: "VideoData" /* BilibiliDataType['单个视频作品数据'] */,
-                id: bvideoMatch ? bvideoMatch[1] : '',
+                id: bvideoMatch ? bvideoMatch[1] : ''
             };
             break;
         }
@@ -20,7 +20,7 @@ export default async function GetBilibiliID(url) {
             const playMatch = longLink.match(/play\/(\w+)/);
             result = {
                 type: "BangumiVideoData" /* BilibiliDataType['番剧基本信息数据'] */,
-                id: playMatch ? playMatch[1] : '',
+                id: playMatch ? playMatch[1] : ''
             };
             break;
         }
@@ -30,7 +30,7 @@ export default async function GetBilibiliID(url) {
             const dynamic_id = tMatch || opusMatch;
             result = {
                 type: "DynamicInfoData" /* BilibiliDataType['动态详情数据'] */,
-                dynamic_id: dynamic_id ? dynamic_id[1] : '',
+                dynamic_id: dynamic_id ? dynamic_id[1] : ''
             };
             break;
         }

package/lib/business/bilibili/result.js

@@ -34,7 +34,7 @@ export default class BilibiliResult {
         return {
             code: result !== false && result !== '' ? 200 : 503,
             message: result !== !false && result !== '' ? 'success' : 'error',
-            data: result !== !false && result !== '' ? result : null,
+            data: result !== !false && result !== '' ? result : null
         };
     }
 }

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

@@ -2,7 +2,7 @@ import md5 from 'md5';
 import fetch from 'node-fetch';
 const mixinKeyEncTab = [
     46, 47, 18, 2, 53, 8, 23, 32, 15, 50, 10, 31, 58, 3, 45, 35, 27, 43, 5, 49, 33, 9, 42, 19, 29, 28, 14, 39, 12, 38, 41, 13, 37, 48, 7, 16, 24, 55, 40, 61, 26,
-    17, 0, 1, 60, 51, 30, 4, 22, 25, 54, 21, 56, 59, 6, 63, 57, 62, 11, 36, 20, 34, 44, 52,
+    17, 0, 1, 60, 51, 30, 4, 22, 25, 54, 21, 56, 59, 6, 63, 57, 62, 11, 36, 20, 34, 44, 52
 ];
 // 对 imgKey 和 subKey 进行字符顺序打乱编码
 const getMixinKey = (orig) => mixinKeyEncTab
@@ -31,16 +31,16 @@ function encWbi(params, img_key, sub_key) {
 async function getWbiKeys(cookie) {
     const res = await fetch('https://api.bilibili.com/x/web-interface/nav', {
         headers: {
-            Cookie: cookie,
-        },
+            Cookie: cookie
+        }
     });
     const responseJson = await res.json();
     const response = responseJson; // 类型断言
     // 确保response是ResponseData类型后再解构
-    const { data: { wbi_img: { img_url, sub_url }, }, } = response;
+    const { data: { wbi_img: { img_url, sub_url } } } = response;
     return {
         img_key: img_url.slice(img_url.lastIndexOf('/') + 1, img_url.lastIndexOf('.')),
-        sub_key: sub_url.slice(sub_url.lastIndexOf('/') + 1, sub_url.lastIndexOf('.')),
+        sub_key: sub_url.slice(sub_url.lastIndexOf('/') + 1, sub_url.lastIndexOf('.'))
     };
 }
 export default async function wbi_sign(BASEURL, cookie) {

package/lib/business/douyin/getdata.js

@@ -6,10 +6,14 @@ export default class DouyinData {
     URL;
     constructor(type, cookie) {
         this.type = type;
-        this.headers = {};
-        this.headers.Referer = 'https://www.douyin.com/';
-        this.headers.Cookie = cookie,
-            this.headers['Content-Type'] = 'application/json';
+        this.headers = {
+            Referer: 'https://www.douyin.com/',
+            Cookie: cookie,
+            Accept: '*/*',
+            'Content-Type': 'application/json',
+            'Accpet-Language': 'zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6',
+            'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36 Edg/127.0.0.0'
+        };
     }
     async GetData(data = {}) {
         switch (this.type) {
@@ -19,21 +23,21 @@ export default class DouyinData {
                 const VideoData = await this.GlobalGetData({
                     url: `${this.URL}&a_bogus=${Sign.AB(this.URL)}`,
                     method: 'GET',
-                    headers: this.headers,
+                    headers: this.headers
                 });
                 return VideoData;
             case 'CommentData':
                 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,
+                    headers: this.headers
                 });
                 return CommentsData;
             case 'CommentReplyData':
                 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,
+                    headers: this.headers
                 });
                 return CommentReplyData;
             case 'UserInfoData':
@@ -42,15 +46,15 @@ export default class DouyinData {
                     url: `${this.URL}&a_bogus=${Sign.AB(this.URL)}`,
                     headers: {
                         ...this.headers,
-                        Referer: `https://www.douyin.com/user/${data.sec_uid}`,
-                    },
+                        Referer: `https://www.douyin.com/user/${data.sec_uid}`
+                    }
                 });
                 return UserInfoData;
             case 'EmojiData':
                 this.URL = DouyinAPI.表情();
                 const EmojiData = await this.GlobalGetData({
                     url: this.URL,
-                    headers: this.headers,
+                    headers: this.headers
                 });
                 return EmojiData;
             case 'UserVideosListData':
@@ -59,8 +63,8 @@ export default class DouyinData {
                     url: `${this.URL}&a_bogus=${Sign.AB(this.URL)}`,
                     headers: {
                         ...this.headers,
-                        Referer: `https://www.douyin.com/user/${data.sec_uid}`,
-                    },
+                        Referer: `https://www.douyin.com/user/${data.sec_uid}`
+                    }
                 });
                 return UserVideoListData;
             case 'SuggestWordsData':
@@ -69,8 +73,8 @@ export default class DouyinData {
                     url: `${this.URL}&a_bogus=${Sign.AB(this.URL)}`,
                     headers: {
                         ...this.headers,
-                        Referer: `https://www.douyin.com/search/${encodeURIComponent(String(data.query))}`,
-                    },
+                        Referer: `https://www.douyin.com/search/${encodeURIComponent(String(data.query))}`
+                    }
                 });
                 return SuggestWordsData;
             case 'SearchData':
@@ -79,22 +83,22 @@ export default class DouyinData {
                     url: `${this.URL}&a_bogus=${Sign.AB(this.URL)}`,
                     headers: {
                         ...this.headers,
-                        Referer: `https://www.douyin.com/https://www.douyin.com/search/${encodeURIComponent(String(data.query))}`,
-                    },
+                        Referer: `https://www.douyin.com/https://www.douyin.com/search/${encodeURIComponent(String(data.query))}`
+                    }
                 });
                 return SearchData;
             case 'ExpressionPlusData':
                 this.URL = DouyinAPI.互动表情();
                 const ExpressionPlusData = await this.GlobalGetData({
                     url: `${this.URL}&a_bogus=${Sign.AB(this.URL)}`,
-                    headers: this.headers,
+                    headers: this.headers
                 });
                 return ExpressionPlusData;
             case 'MusicData':
                 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,
+                    headers: this.headers
                 });
                 return MusicData;
             default:

package/lib/business/douyin/getid.js

@@ -12,21 +12,21 @@ export default async function GetDouyinID(url) {
             const videoMatch = longLink.match(/video\/(\d+)/);
             result = {
                 type: "VideoData" /* DouyinDataType['单个视频作品数据'] */,
-                aweme_id: videoMatch ? videoMatch[1] : '',
+                aweme_id: videoMatch ? videoMatch[1] : ''
             };
             break;
         case /note\/(\d+)/.test(longLink):
             const noteMatch = longLink.match(/note\/(\d+)/);
             result = {
                 type: "NoteData" /* DouyinDataType['图集作品数据'] */,
-                aweme_id: noteMatch ? noteMatch[1] : '',
+                aweme_id: noteMatch ? noteMatch[1] : ''
             };
             break;
         case /user\/(\S+?)\?/.test(longLink):
             const userMatch = longLink.match(/user\/(\S+?)\?/);
             result = {
                 type: "UserVideosListData" /* DouyinDataType['用户主页视频列表数据'] */,
-                sec_uid: userMatch ? userMatch[1] : '',
+                sec_uid: userMatch ? userMatch[1] : ''
             };
             break;
         default:

package/lib/business/douyin/result.js

@@ -35,7 +35,7 @@ export default class DouyinResult {
         return {
             code: result !== false && result !== '' ? 200 : 503,
             message: result !== false && result !== '' ? 'success' : 'error',
-            data: result !== false && result !== '' ? result : null,
+            data: result !== false && result !== '' ? result : null
         };
     }
 }

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

@@ -1,50 +1,2 @@
-export declare class ABogus {
-    filter: RegExp;
-    arguments: number[];
-    ua_key: string;
-    end_string: string;
-    version: number[];
-    browser: string;
-    reg: number[];
-    str: any;
-    chunk: number[];
-    size: number;
-    ua_code: number[];
-    browser_len: number;
-    browser_code: number[];
-    constructor(platform?: string | null);
-    list_1(random_num?: number | null, a?: number, b?: number, c?: number): number[];
-    list_2(random_num?: number | null, a?: number, b?: number): number[];
-    list_3(random_num?: number | null, a?: number, b?: number): number[];
-    random_list(a?: number | null, b?: number, c?: number, d?: number, e?: number, f?: number, g?: number): number[];
-    from_char_code(...args: number[]): string;
-    generate_string_1(random_num_1?: number | null, random_num_2?: number | null, random_num_3?: number | null): string;
-    generate_string_2(url_params: string, method?: string, start_time?: number, end_time?: number): string;
-    generate_string_2_list(url_params: string, method?: string, start_time?: number, end_time?: number): number[];
-    reg_to_array(a: number[]): number[];
-    compress(a: number[]): void;
-    generate_f(e: number[]): number[];
-    generate_params_code(url_params: string): number[];
-    generate_method_code(method: string): number[];
-    sm3ToArray(data: string | number[]): number[];
-    generate_params(url_params: string): string;
-    generate_method(method: string): string;
-    char_code_at(str: string): number[];
-    de(a: number, b: number): number;
-    pe(a: number): number;
-    ve(a: number, b: number, c: number, d: number): number;
-    he(a: number, b: number, c: number, d: number): number;
-    end_check_num(a: number[]): number;
-    tobase(a: number): string;
-    rc4_encrypt(a: string, b: string): string;
-    rc4_key_schedule(b: string): number[];
-    list_4(a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number, k: number, l: number, m: number, n: number, o: number, p: number, q: number): number[];
-    generate_browser_info(platform: string): string;
-    getABogus(url: string, method: string, start_time: number, end_time: number): string;
-    get_reg(): string;
-    get_value(url_params?: string, method?: string, start_time?: number, end_time?: number, random_num_1?: number | null, random_num_2?: number | null, random_num_3?: number | null): string;
-    generateString(url_params: any, method: string, start_time: number, end_time: number): string;
-    generate_result(s: string, e?: string): string;
-}
-declare const _default: (url: string, ua: string) => string;
+declare const _default: (url: string, user_agent: string) => string;
 export default _default;