@ikenxuan/amagi 4.4.15 → 4.4.16

package/dist/default/cjs/index.cjs

@@ -1660,7 +1660,7 @@ var douyinUtils = {
 var defheaders2 = {
   accept: "*/*",
   priority: "u=0, i",
-  "content-type": "application/json",
+  "content-type": "application/json; charset=utf-8",
   "accept-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/125.0.0.0 Safari/537.36",
   referer: "https://www.douyin.com/",
@@ -1892,10 +1892,12 @@ async function GlobalGetData2(options) {
   try {
     const result = await new Networks(options).getData();
     if (result === "" || !result) {
-      const warningMessage = `\u83B7\u53D6\u54CD\u5E94\u6570\u636E\u5931\u8D25\uFF01\u63A5\u53E3\u8FD4\u56DE\u5185\u5BB9\u4E3A\u7A7A
-\u4F60\u7684\u6296\u97F3ck\u53EF\u80FD\u5DF2\u7ECF\u5931\u6548\uFF01
-\u8BF7\u6C42\u7C7B\u578B\uFF1A\u300C${options.methodType}\u300D
-\u8BF7\u6C42URL\uFF1A ${options.url}`;
+      const warningMessage = `
+      \u83B7\u53D6\u54CD\u5E94\u6570\u636E\u5931\u8D25\uFF01\u63A5\u53E3\u8FD4\u56DE\u5185\u5BB9\u4E3A\u7A7A
+      \u4F60\u7684\u6296\u97F3ck\u53EF\u80FD\u5DF2\u7ECF\u5931\u6548\uFF01
+      \u8BF7\u6C42\u7C7B\u578B\uFF1A\u300C${options.methodType}\u300D
+      \u8BF7\u6C42URL\uFF1A ${options.url}
+      `;
       logger.warn(warningMessage);
       throw {
         ...result,
@@ -1903,6 +1905,20 @@ async function GlobalGetData2(options) {
         warning: warningMessage
       };
     }
+    if (result.filter_detail && result.filter_detail.filter_reason) {
+      const filterReason = result.filter_detail.filter_reason;
+      const warningMessage = `
+      \u83B7\u53D6\u54CD\u5E94\u6570\u636E\u5931\u8D25\uFF01\u539F\u56E0\uFF1A${filterReason}
+      \u8BF7\u6C42\u7C7B\u578B\uFF1A\u300C${options.methodType}\u300D
+      \u8BF7\u6C42URL\uFF1A ${options.url}
+      `;
+      logger.warn(warningMessage);
+      throw {
+        ...result,
+        code: result.status_code || 0,
+        warning: warningMessage
+      };
+    }
     return result;
   } catch (error) {
     if (error && typeof error === "object") {
@@ -2498,17 +2514,13 @@ function createAmagiClient(options = {}) {
   }
   return new amagiClient(options);
 }
-var CreateApp = Object.assign(
-  createAmagiClient,
-  {
-    /** 抖音相关功能模块 (工具集) */
-    douyin: douyinUtils,
-    /** B站相关功能模块 (工具集) */
-    bilibili: bilibiliUtils,
-    /** 快手相关功能模块 (工具集) */
-    kuaishou: kuaishouUtils
-  }
-);
+createAmagiClient.douyin = douyinUtils;
+createAmagiClient.bilibili = bilibiliUtils;
+createAmagiClient.kuaishou = kuaishouUtils;
+createAmagiClient.getDouyinData = () => douyinUtils.getDouyinData;
+createAmagiClient.getBilibiliData = () => bilibiliUtils.getBilibiliData;
+createAmagiClient.getKuaishouData = () => kuaishouUtils.getKuaishouData;
+var CreateApp = createAmagiClient;
 var Client = CreateApp;
 var amagi = Client;
 

package/dist/default/esm/index.mjs

@@ -1648,7 +1648,7 @@ var douyinUtils = {
 var defheaders2 = {
   accept: "*/*",
   priority: "u=0, i",
-  "content-type": "application/json",
+  "content-type": "application/json; charset=utf-8",
   "accept-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/125.0.0.0 Safari/537.36",
   referer: "https://www.douyin.com/",
@@ -1880,10 +1880,12 @@ async function GlobalGetData2(options) {
   try {
     const result = await new Networks(options).getData();
     if (result === "" || !result) {
-      const warningMessage = `\u83B7\u53D6\u54CD\u5E94\u6570\u636E\u5931\u8D25\uFF01\u63A5\u53E3\u8FD4\u56DE\u5185\u5BB9\u4E3A\u7A7A
-\u4F60\u7684\u6296\u97F3ck\u53EF\u80FD\u5DF2\u7ECF\u5931\u6548\uFF01
-\u8BF7\u6C42\u7C7B\u578B\uFF1A\u300C${options.methodType}\u300D
-\u8BF7\u6C42URL\uFF1A ${options.url}`;
+      const warningMessage = `
+      \u83B7\u53D6\u54CD\u5E94\u6570\u636E\u5931\u8D25\uFF01\u63A5\u53E3\u8FD4\u56DE\u5185\u5BB9\u4E3A\u7A7A
+      \u4F60\u7684\u6296\u97F3ck\u53EF\u80FD\u5DF2\u7ECF\u5931\u6548\uFF01
+      \u8BF7\u6C42\u7C7B\u578B\uFF1A\u300C${options.methodType}\u300D
+      \u8BF7\u6C42URL\uFF1A ${options.url}
+      `;
       logger.warn(warningMessage);
       throw {
         ...result,
@@ -1891,6 +1893,20 @@ async function GlobalGetData2(options) {
         warning: warningMessage
       };
     }
+    if (result.filter_detail && result.filter_detail.filter_reason) {
+      const filterReason = result.filter_detail.filter_reason;
+      const warningMessage = `
+      \u83B7\u53D6\u54CD\u5E94\u6570\u636E\u5931\u8D25\uFF01\u539F\u56E0\uFF1A${filterReason}
+      \u8BF7\u6C42\u7C7B\u578B\uFF1A\u300C${options.methodType}\u300D
+      \u8BF7\u6C42URL\uFF1A ${options.url}
+      `;
+      logger.warn(warningMessage);
+      throw {
+        ...result,
+        code: result.status_code || 0,
+        warning: warningMessage
+      };
+    }
     return result;
   } catch (error) {
     if (error && typeof error === "object") {
@@ -2486,17 +2502,13 @@ function createAmagiClient(options = {}) {
   }
   return new amagiClient(options);
 }
-var CreateApp = Object.assign(
-  createAmagiClient,
-  {
-    /** 抖音相关功能模块 (工具集) */
-    douyin: douyinUtils,
-    /** B站相关功能模块 (工具集) */
-    bilibili: bilibiliUtils,
-    /** 快手相关功能模块 (工具集) */
-    kuaishou: kuaishouUtils
-  }
-);
+createAmagiClient.douyin = douyinUtils;
+createAmagiClient.bilibili = bilibiliUtils;
+createAmagiClient.kuaishou = kuaishouUtils;
+createAmagiClient.getDouyinData = () => douyinUtils.getDouyinData;
+createAmagiClient.getBilibiliData = () => bilibiliUtils.getBilibiliData;
+createAmagiClient.getKuaishouData = () => kuaishouUtils.getKuaishouData;
+var CreateApp = createAmagiClient;
 var Client = CreateApp;
 var amagi = Client;
 

package/dist/default/index.d.ts

@@ -14055,86 +14055,41 @@ declare class amagiClient {
 type AmagiConstructor = {
     new (options: cookiesOptions): amagiClient;
     (options: cookiesOptions): amagiClient;
-};
-/** After instantiation, it can interact with the specified platform API to quickly obtain data. */
-declare const CreateApp: AmagiConstructor & {
     /** 抖音相关功能模块 (工具集) */
-    douyin: {
-        sign: typeof douyinSign;
-        douyinApiUrls: typeof douyinApiUrls;
-        getDouyinData: typeof getDouyinData;
-        api: typeof douyin;
-    };
+    douyin: typeof douyinUtils;
     /** B站相关功能模块 (工具集) */
-    bilibili: {
-        sign: {
-            wbi_sign: typeof wbi_sign;
-            av2bv: typeof av2bv;
-            bv2av: typeof bv2av;
-        };
-        bilibiliApiUrls: typeof bilibiliApiUrls;
-        getBilibiliData: typeof getBilibiliData;
-        api: typeof bilibili;
-    };
+    bilibili: typeof bilibiliUtils;
     /** 快手相关功能模块 (工具集) */
-    kuaishou: {
-        kuaishouApiUrls: typeof kuaishouApiUrls;
-        getKuaishouData: typeof getKuaishouData;
-        api: typeof kuaishou;
-    };
+    kuaishou: typeof kuaishouUtils;
+    /**
+     * 快捷获取抖音数据
+     * @param type - 请求数据类型
+     * @param cookie - 有效的用户Cookie
+     * @param options - 请求参数，是一个对象
+     * @returns 返回接口的原始数据
+     */
+    getDouyinData: () => typeof douyinUtils.getDouyinData;
+    /**
+     * 快捷获取B站数据
+     * @param type - 请求数据类型
+     * @param cookie - 有效的用户Cookie
+     * @param options - 请求参数，是一个对象
+     * @returns 返回接口的原始数据
+     */
+    getBilibiliData: () => typeof bilibiliUtils.getBilibiliData;
+    /**
+     * 快捷获取快手数据
+     * @param type - 请求数据类型
+     * @param cookie - 有效的用户Cookie
+     * @param options - 请求参数，是一个对象
+     * @returns 返回接口的原始数据
+     */
+    getKuaishouData: () => typeof kuaishouUtils.getKuaishouData;
 };
 /** After instantiation, it can interact with the specified platform API to quickly obtain data. */
-declare const Client: AmagiConstructor & {
-    /** 抖音相关功能模块 (工具集) */
-    douyin: {
-        sign: typeof douyinSign;
-        douyinApiUrls: typeof douyinApiUrls;
-        getDouyinData: typeof getDouyinData;
-        api: typeof douyin;
-    };
-    /** B站相关功能模块 (工具集) */
-    bilibili: {
-        sign: {
-            wbi_sign: typeof wbi_sign;
-            av2bv: typeof av2bv;
-            bv2av: typeof bv2av;
-        };
-        bilibiliApiUrls: typeof bilibiliApiUrls;
-        getBilibiliData: typeof getBilibiliData;
-        api: typeof bilibili;
-    };
-    /** 快手相关功能模块 (工具集) */
-    kuaishou: {
-        kuaishouApiUrls: typeof kuaishouApiUrls;
-        getKuaishouData: typeof getKuaishouData;
-        api: typeof kuaishou;
-    };
-};
-declare const amagi: AmagiConstructor & {
-    /** 抖音相关功能模块 (工具集) */
-    douyin: {
-        sign: typeof douyinSign;
-        douyinApiUrls: typeof douyinApiUrls;
-        getDouyinData: typeof getDouyinData;
-        api: typeof douyin;
-    };
-    /** B站相关功能模块 (工具集) */
-    bilibili: {
-        sign: {
-            wbi_sign: typeof wbi_sign;
-            av2bv: typeof av2bv;
-            bv2av: typeof bv2av;
-        };
-        bilibiliApiUrls: typeof bilibiliApiUrls;
-        getBilibiliData: typeof getBilibiliData;
-        api: typeof bilibili;
-    };
-    /** 快手相关功能模块 (工具集) */
-    kuaishou: {
-        kuaishouApiUrls: typeof kuaishouApiUrls;
-        getKuaishouData: typeof getKuaishouData;
-        api: typeof kuaishou;
-    };
-};
+declare const CreateApp: AmagiConstructor;
+/** After instantiation, it can interact with the specified platform API to quickly obtain data. */
+declare const Client: AmagiConstructor;
+declare const amagi: AmagiConstructor;
 
 export { type BiliAv2Bv, type BiliBangumiVideoInfo, type BiliBangumiVideoPlayurlIsLogin, type BiliBangumiVideoPlayurlNoLogin, type BiliBiliVideoPlayurlNoLogin, type BiliBv2AV, type BiliCheckQrcode, type BiliDynamicCard, type BiliDynamicInfo, type BiliEmojiList, type BiliLiveRoomDef, type BiliLiveRoomDetail, type BiliNewLoginQrcode, type BiliOneWork, type BiliUserDynamic, type BiliUserFullView, type BiliUserProfile, type BiliVideoPlayurlIsLogin, type BiliWorkComments, type BilibiliDataOptions, type BilibiliDataOptionsMap, type BilibiliMethodOptionsMap, type BilibiliRequest, BilibiliValidateData, CreateApp, type DouyinDataOptions, type DouyinDataOptionsMap, type DouyinMethodOptionsMap, type DouyinRequest, DouyinValidateData, type DyEmojiList, type DyEmojiProList, type DyImageAlbumWork, type DyMusicWork, type DySearchInfo, type DySlidesWork, type DySuggestWords, type DyUserInfo, type DyUserLiveVideos, type DyUserPostVideos, type DyVideoWork, type DyWorkComments, type KsEmojiList, type KsOneWork, type KsWorkComments, KuaishouAPI, type KuaishouDataOptions, type KuaishouDataOptionsMap, type KuaishouMethodOptionsMap, type KusiahouRequest, KusiahouValidateData, Networks, type NetworksConfigType, type OmitMethodType, type TypeControl, amagi, amagiClient, av2bv, bilibili, bilibiliAPI, bilibiliApiUrls, bilibiliUtils, bv2av, type cookiesOptions, Client as default, douyin, douyinAPI, douyinApiUrls, douyinSign, douyinUtils, fetchBilibiliData, fetchDouyinData, fetchKuaishouData, getBilibiliData, getDouyinData, getKuaishouData, kuaishou, kuaishouAPI, kuaishouApiUrls, kuaishouUtils, logMiddleware, logger, qtparam, registerBilibiliRoutes, registerDouyinRoutes, registerKuaishouRoutes, wbi_sign };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ikenxuan/amagi",
-  "version": "4.4.15",
+  "version": "4.4.16",
   "description": "抖音、B站的 web 端相关数据接口基于 Node.js 的实现",
   "keywords": [
     "douyin",
@@ -69,10 +69,12 @@
   "devDependencies": {
     "@eslint/js": "^9.17.0",
     "@swc/core": "^1.10.12",
+    "@types/crypto-js": "^4.2.2",
     "@types/express": "^4.17.21",
     "@types/node": "^22.10.2",
     "@typescript-eslint/eslint-plugin": "^8.18.1",
     "@typescript-eslint/parser": "^8.18.1",
+    "crypto-js": "^4.2.0",
     "eslint": "^9.17.0",
     "eslint-plugin-simple-import-sort": "^12.1.1",
     "globals": "^15.14.0",