@ikenxuan/amagi 4.4.14 → 4.4.16

package/dist/default/cjs/index.cjs

@@ -238,7 +238,7 @@ var bilibili = {
    */
   getVideoInfo: async (options, cookie) => {
     const { typeMode, ...restOptions } = options;
-    const data2 = await BilibiliData({ ...restOptions, methodType: "\u5355\u4E2A\u89C6\u9891\u4F5C\u54C1\u6570\u636E" }, cookie);
+    const data2 = await fetchBilibili({ ...restOptions, methodType: "\u5355\u4E2A\u89C6\u9891\u4F5C\u54C1\u6570\u636E" }, cookie);
     return data2;
   },
   /**
@@ -249,7 +249,7 @@ var bilibili = {
    */
   getVideoStream: async (options, cookie) => {
     const { typeMode, ...restOptions } = options;
-    const data2 = await BilibiliData({ ...restOptions, methodType: "\u5355\u4E2A\u89C6\u9891\u4E0B\u8F7D\u4FE1\u606F\u6570\u636E" }, cookie);
+    const data2 = await fetchBilibili({ ...restOptions, methodType: "\u5355\u4E2A\u89C6\u9891\u4E0B\u8F7D\u4FE1\u606F\u6570\u636E" }, cookie);
     return data2;
   },
   /**
@@ -260,7 +260,7 @@ var bilibili = {
    */
   getComments: async (options, cookie) => {
     const { typeMode, ...restOptions } = options;
-    const data2 = await BilibiliData({ ...restOptions, methodType: "\u8BC4\u8BBA\u6570\u636E" }, cookie);
+    const data2 = await fetchBilibili({ ...restOptions, methodType: "\u8BC4\u8BBA\u6570\u636E" }, cookie);
     return data2;
   },
   /**
@@ -271,7 +271,7 @@ var bilibili = {
    */
   getUserProfile: async (options, cookie) => {
     const { typeMode, ...restOptions } = options;
-    const data2 = await BilibiliData({ ...restOptions, methodType: "\u7528\u6237\u4E3B\u9875\u6570\u636E" }, cookie);
+    const data2 = await fetchBilibili({ ...restOptions, methodType: "\u7528\u6237\u4E3B\u9875\u6570\u636E" }, cookie);
     return data2;
   },
   /**
@@ -282,7 +282,7 @@ var bilibili = {
    */
   getUserDynamic: async (options, cookie) => {
     const { typeMode, ...restOptions } = options;
-    const data2 = await BilibiliData({ ...restOptions, methodType: "\u7528\u6237\u4E3B\u9875\u52A8\u6001\u5217\u8868\u6570\u636E" }, cookie);
+    const data2 = await fetchBilibili({ ...restOptions, methodType: "\u7528\u6237\u4E3B\u9875\u52A8\u6001\u5217\u8868\u6570\u636E" }, cookie);
     return data2;
   },
   /**
@@ -293,7 +293,7 @@ var bilibili = {
    */
   getEmojiList: async (options, cookie) => {
     const { typeMode, ...restOptions } = options;
-    const data2 = await BilibiliData({ ...restOptions, methodType: "Emoji\u6570\u636E" }, cookie);
+    const data2 = await fetchBilibili({ ...restOptions, methodType: "Emoji\u6570\u636E" }, cookie);
     return data2;
   },
   /**
@@ -304,7 +304,7 @@ var bilibili = {
    */
   getBangumiInfo: async (options, cookie) => {
     const { typeMode, ...restOptions } = options;
-    const data2 = await BilibiliData({ ...restOptions, methodType: "\u756A\u5267\u57FA\u672C\u4FE1\u606F\u6570\u636E" }, cookie);
+    const data2 = await fetchBilibili({ ...restOptions, methodType: "\u756A\u5267\u57FA\u672C\u4FE1\u606F\u6570\u636E" }, cookie);
     return data2;
   },
   /**
@@ -315,7 +315,7 @@ var bilibili = {
    */
   getBangumiStream: async (options, cookie) => {
     const { typeMode, ...restOptions } = options;
-    const data2 = await BilibiliData({ ...restOptions, methodType: "\u756A\u5267\u4E0B\u8F7D\u4FE1\u606F\u6570\u636E" }, cookie);
+    const data2 = await fetchBilibili({ ...restOptions, methodType: "\u756A\u5267\u4E0B\u8F7D\u4FE1\u606F\u6570\u636E" }, cookie);
     return data2;
   },
   /**
@@ -326,7 +326,7 @@ var bilibili = {
    */
   getDynamicInfo: async (options, cookie) => {
     const { typeMode, ...restOptions } = options;
-    const data2 = await BilibiliData({ ...restOptions, methodType: "\u52A8\u6001\u8BE6\u60C5\u6570\u636E" }, cookie);
+    const data2 = await fetchBilibili({ ...restOptions, methodType: "\u52A8\u6001\u8BE6\u60C5\u6570\u636E" }, cookie);
     return data2;
   },
   /**
@@ -337,7 +337,7 @@ var bilibili = {
    */
   getDynamicCard: async (options, cookie) => {
     const { typeMode, ...restOptions } = options;
-    const data2 = await BilibiliData({ ...restOptions, methodType: "\u52A8\u6001\u5361\u7247\u6570\u636E" }, cookie);
+    const data2 = await fetchBilibili({ ...restOptions, methodType: "\u52A8\u6001\u5361\u7247\u6570\u636E" }, cookie);
     return data2;
   },
   /**
@@ -348,7 +348,7 @@ var bilibili = {
    */
   getLiveRoomDetail: async (options, cookie) => {
     const { typeMode, ...restOptions } = options;
-    const data2 = await BilibiliData({ ...restOptions, methodType: "\u76F4\u64AD\u95F4\u4FE1\u606F" }, cookie);
+    const data2 = await fetchBilibili({ ...restOptions, methodType: "\u76F4\u64AD\u95F4\u4FE1\u606F" }, cookie);
     return data2;
   },
   /**
@@ -359,7 +359,7 @@ var bilibili = {
    */
   getLiveRoomInitInfo: async (options, cookie) => {
     const { typeMode, ...restOptions } = options;
-    const data2 = await BilibiliData({ ...restOptions, methodType: "\u76F4\u64AD\u95F4\u521D\u59CB\u5316\u4FE1\u606F" }, cookie);
+    const data2 = await fetchBilibili({ ...restOptions, methodType: "\u76F4\u64AD\u95F4\u521D\u59CB\u5316\u4FE1\u606F" }, cookie);
     return data2;
   },
   /**
@@ -370,7 +370,7 @@ var bilibili = {
    */
   getLoginBasicInfo: async (options, cookie) => {
     const { typeMode, ...restOptions } = options;
-    const data2 = await BilibiliData({ ...restOptions, methodType: "\u767B\u5F55\u57FA\u672C\u4FE1\u606F" }, cookie);
+    const data2 = await fetchBilibili({ ...restOptions, methodType: "\u767B\u5F55\u57FA\u672C\u4FE1\u606F" }, cookie);
     return data2;
   },
   /**
@@ -381,7 +381,7 @@ var bilibili = {
    */
   getLoginQrcode: async (options, cookie) => {
     const { typeMode, ...restOptions } = options;
-    const data2 = await BilibiliData({ ...restOptions, methodType: "\u7533\u8BF7\u4E8C\u7EF4\u7801" }, cookie);
+    const data2 = await fetchBilibili({ ...restOptions, methodType: "\u7533\u8BF7\u4E8C\u7EF4\u7801" }, cookie);
     return data2;
   },
   /**
@@ -392,7 +392,7 @@ var bilibili = {
    */
   checkQrcodeStatus: async (options, cookie) => {
     const { typeMode, ...restOptions } = options;
-    const data2 = await BilibiliData({ ...restOptions, methodType: "\u4E8C\u7EF4\u7801\u72B6\u6001" }, cookie);
+    const data2 = await fetchBilibili({ ...restOptions, methodType: "\u4E8C\u7EF4\u7801\u72B6\u6001" }, cookie);
     return data2;
   },
   /**
@@ -403,7 +403,7 @@ var bilibili = {
    */
   getUserTotalPlayCount: async (options, cookie) => {
     const { typeMode, ...restOptions } = options;
-    const data2 = await BilibiliData({ ...restOptions, methodType: "\u83B7\u53D6UP\u4E3B\u603B\u64AD\u653E\u91CF" }, cookie);
+    const data2 = await fetchBilibili({ ...restOptions, methodType: "\u83B7\u53D6UP\u4E3B\u603B\u64AD\u653E\u91CF" }, cookie);
     return data2;
   },
   /**
@@ -414,7 +414,7 @@ var bilibili = {
    */
   convertAvToBv: async (options, cookie) => {
     const { typeMode, ...restOptions } = options;
-    const data2 = await BilibiliData({ ...restOptions, methodType: "AV\u8F6CBV" }, cookie);
+    const data2 = await fetchBilibili({ ...restOptions, methodType: "AV\u8F6CBV" }, cookie);
     return data2;
   },
   /**
@@ -425,40 +425,40 @@ var bilibili = {
    */
   convertBvToAv: async (options, cookie) => {
     const { typeMode, ...restOptions } = options;
-    const data2 = await BilibiliData({ ...restOptions, methodType: "BV\u8F6CAV" }, cookie);
+    const data2 = await fetchBilibili({ ...restOptions, methodType: "BV\u8F6CAV" }, cookie);
     return data2;
   }
 };
 var registerBilibiliRoutes = (cookie) => {
   const router = express__default.default.Router();
   router.get("/new_login_qrcode", async (req, res) => {
-    const data2 = await BilibiliData({
+    const data2 = await fetchBilibili({
       methodType: "\u7533\u8BF7\u4E8C\u7EF4\u7801"
     }, req.headers.cookie || cookie);
     res.json(data2);
   });
   router.get("/check_qrcode", async (req, res) => {
-    const data2 = await BilibiliData({
+    const data2 = await fetchBilibili({
       methodType: "\u4E8C\u7EF4\u7801\u72B6\u6001",
       qrcode_key: req.query.qrcode_key
     }, req.headers.cookie || cookie);
     res.json(data2);
   });
   router.get("/login_basic_info", async (req, res) => {
-    const data2 = await BilibiliData({
+    const data2 = await fetchBilibili({
       methodType: "\u767B\u5F55\u57FA\u672C\u4FE1\u606F"
     }, req.headers.cookie || cookie);
     res.json(data2);
   });
   router.get("/fetch_one_video", async (req, res) => {
-    const data2 = await BilibiliData({
+    const data2 = await fetchBilibili({
       methodType: "\u5355\u4E2A\u89C6\u9891\u4F5C\u54C1\u6570\u636E",
       bvid: req.query.bvid
     }, req.headers.cookie || cookie);
     res.json(data2);
   });
   router.get("/fetch_video_playurl", async (req, res) => {
-    const data2 = await BilibiliData({
+    const data2 = await fetchBilibili({
       methodType: "\u5355\u4E2A\u89C6\u9891\u4E0B\u8F7D\u4FE1\u606F\u6570\u636E",
       avid: parseInt(req.query.avid),
       cid: parseInt(req.query.cid)
@@ -466,7 +466,7 @@ var registerBilibiliRoutes = (cookie) => {
     res.json(data2);
   });
   router.get("/fetch_work_comments", async (req, res) => {
-    const data2 = await BilibiliData({
+    const data2 = await fetchBilibili({
       methodType: "\u8BC4\u8BBA\u6570\u636E",
       oid: Number(req.query.oid),
       number: Number(req.query.number),
@@ -475,20 +475,20 @@ var registerBilibiliRoutes = (cookie) => {
     res.json(data2);
   });
   router.get("/fetch_work_comments", async (req, res) => {
-    const data2 = await BilibiliData({
+    const data2 = await fetchBilibili({
       methodType: "Emoji\u6570\u636E"
     }, req.headers.cookie || cookie);
     res.json(data2);
   });
   router.get("/fetch_bangumi_video_info", async (req, res) => {
-    const data2 = await BilibiliData({
+    const data2 = await fetchBilibili({
       methodType: "\u756A\u5267\u57FA\u672C\u4FE1\u606F\u6570\u636E",
       ep_id: req.query.ep_id
     }, req.headers.cookie || cookie);
     res.json(data2);
   });
   router.get("/fetch_bangumi_video_playurl", async (req, res) => {
-    const data2 = await BilibiliData({
+    const data2 = await fetchBilibili({
       methodType: "\u756A\u5267\u4E0B\u8F7D\u4FE1\u606F\u6570\u636E",
       cid: parseInt(req.query.cid),
       ep_id: req.query.ep_id
@@ -496,63 +496,63 @@ var registerBilibiliRoutes = (cookie) => {
     res.json(data2);
   });
   router.get("/fetch_user_dynamic", async (req, res) => {
-    const data2 = await BilibiliData({
+    const data2 = await fetchBilibili({
       methodType: "\u7528\u6237\u4E3B\u9875\u52A8\u6001\u5217\u8868\u6570\u636E",
       host_mid: parseInt(req.query.host_mid)
     }, req.headers.cookie || cookie);
     res.json(data2);
   });
   router.get("/fetch_dynamic_info", async (req, res) => {
-    const data2 = await BilibiliData({
+    const data2 = await fetchBilibili({
       methodType: "\u52A8\u6001\u8BE6\u60C5\u6570\u636E",
       dynamic_id: req.query.dynamic_id
     }, req.headers.cookie || cookie);
     res.json(data2);
   });
   router.get("/fetch_dynamic_card", async (req, res) => {
-    const data2 = await BilibiliData({
+    const data2 = await fetchBilibili({
       methodType: "\u52A8\u6001\u5361\u7247\u6570\u636E",
       dynamic_id: req.query.dynamic_id
     }, req.headers.cookie || cookie);
     res.json(data2);
   });
   router.get("/fetch_user_profile", async (req, res) => {
-    const data2 = await BilibiliData({
+    const data2 = await fetchBilibili({
       methodType: "\u7528\u6237\u4E3B\u9875\u6570\u636E",
       host_mid: parseInt(req.query.host_mid)
     }, req.headers.cookie || cookie);
     res.json(data2);
   });
   router.get("/fetch_live_room_detail", async (req, res) => {
-    const data2 = await BilibiliData({
+    const data2 = await fetchBilibili({
       methodType: "\u76F4\u64AD\u95F4\u4FE1\u606F",
       room_id: req.query.room_id
     }, req.headers.cookie || cookie);
     res.json(data2);
   });
   router.get("/fetch_liveroom_def", async (req, res) => {
-    const data2 = await BilibiliData({
+    const data2 = await fetchBilibili({
       methodType: "\u76F4\u64AD\u95F4\u521D\u59CB\u5316\u4FE1\u606F",
       room_id: req.query.room_id
     }, req.headers.cookie || cookie);
     res.json(data2);
   });
   router.get("/bv_to_av", async (req, res) => {
-    const data2 = await BilibiliData({
+    const data2 = await fetchBilibili({
       methodType: "BV\u8F6CAV",
       bvid: req.query.bvid
     }, req.headers.cookie || cookie);
     res.json(data2);
   });
   router.get("/av_to_bv", async (req, res) => {
-    const data2 = await BilibiliData({
+    const data2 = await fetchBilibili({
       methodType: "AV\u8F6CBV",
       avid: parseInt(req.query.avid)
     }, req.headers.cookie || cookie);
     res.json(data2);
   });
   router.get("/fetch_user_full_view", async (req, res) => {
-    const data2 = await BilibiliData({
+    const data2 = await fetchBilibili({
       methodType: "\u83B7\u53D6UP\u4E3B\u603B\u64AD\u653E\u91CF",
       host_mid: parseInt(req.query.host_mid)
     }, req.headers.cookie || cookie);
@@ -589,7 +589,7 @@ var defheaders = {
   "upgrade-insecure-requests": "1",
   referer: "https://www.bilibili.com/"
 };
-var BilibiliData = async (data2, cookie) => {
+var fetchBilibili = async (data2, cookie) => {
   const headers2 = {
     ...defheaders,
     cookie: cookie ? cookie.replace(/\s+/g, "") : ""
@@ -625,55 +625,51 @@ var BilibiliData = async (data2, cookie) => {
       let stabilizedCount = 0;
       let requestCount = 0;
       let tmpresp;
-      try {
-        while (fetchedComments.length < Number(number ?? 20) && requestCount < maxRequestCount) {
-          if (number === 0 || number === void 0) {
-            requestCount = 0;
-          } else {
-            requestCount = Math.min(20, Number(number) - fetchedComments.length);
-          }
-          const url = bilibiliApiUrls.\u8BC4\u8BBA\u533A\u660E\u7EC6({
-            type,
-            oid,
-            number: requestCount,
-            pn
-          });
-          const checkStatusUrl = bilibiliApiUrls.\u8BC4\u8BBA\u533A\u72B6\u6001({ oid, type });
-          const checkStatusRes = await GlobalGetData({
-            url: checkStatusUrl,
-            headers: headers2,
-            ...data2
-          });
-          if (checkStatusRes.data === null) {
-            logger.error("\u8BC4\u8BBA\u533A\u672A\u5F00\u653E");
-            return {
-              code: 404,
-              message: "\u8BC4\u8BBA\u533A\u672A\u5F00\u653E",
-              data: null
-            };
-          }
-          const response = await GlobalGetData({
-            url,
-            headers: headers2,
-            ...data2
-          });
-          tmpresp = response;
-          const currentCount = response.data.replies ? response.data.replies.length : 0;
-          fetchedComments.push(...response.data.replies || []);
-          if (currentCount === lastFetchedCount) {
-            stabilizedCount++;
-          } else {
-            stabilizedCount = 0;
-          }
-          lastFetchedCount = currentCount;
-          if (stabilizedCount >= commentGrowthStabilized || requestCount >= maxRequestCount) {
-            break;
-          }
-          pn++;
-          requestCount++;
+      while (fetchedComments.length < Number(number ?? 20) && requestCount < maxRequestCount) {
+        if (number === 0 || number === void 0) {
+          requestCount = 0;
+        } else {
+          requestCount = Math.min(20, Number(number) - fetchedComments.length);
         }
-      } catch {
-        return false;
+        const url = bilibiliApiUrls.\u8BC4\u8BBA\u533A\u660E\u7EC6({
+          type,
+          oid,
+          number: requestCount,
+          pn
+        });
+        const checkStatusUrl = bilibiliApiUrls.\u8BC4\u8BBA\u533A\u72B6\u6001({ oid, type });
+        const checkStatusRes = await GlobalGetData({
+          url: checkStatusUrl,
+          headers: headers2,
+          ...data2
+        });
+        if (checkStatusRes.data === null) {
+          logger.error("\u8BC4\u8BBA\u533A\u672A\u5F00\u653E");
+          return {
+            code: 404,
+            message: "\u8BC4\u8BBA\u533A\u672A\u5F00\u653E",
+            data: null
+          };
+        }
+        const response = await GlobalGetData({
+          url,
+          headers: headers2,
+          ...data2
+        });
+        tmpresp = response;
+        const currentCount = response.data.replies ? response.data.replies.length : 0;
+        fetchedComments.push(...response.data.replies || []);
+        if (currentCount === lastFetchedCount) {
+          stabilizedCount++;
+        } else {
+          stabilizedCount = 0;
+        }
+        lastFetchedCount = currentCount;
+        if (stabilizedCount >= commentGrowthStabilized || requestCount >= maxRequestCount) {
+          break;
+        }
+        pn++;
+        requestCount++;
       }
       const finalResponse = {
         ...tmpresp,
@@ -839,32 +835,41 @@ var BilibiliData = async (data2, cookie) => {
   }
 };
 var GlobalGetData = async (options) => {
-  const result = await new Networks(options).getData();
-  if (result && result.code === 0) {
-    return result;
-  } else if (result.code === 12061) {
-    const warningMessage = `\u83B7\u53D6\u54CD\u5E94\u6570\u636E\u5931\u8D25\uFF01
+  try {
+    const result = await new Networks(options).getData();
+    if (result && result.code === 0) {
+      return result;
+    } else if (result.code === 12061) {
+      const warningMessage = `\u83B7\u53D6\u54CD\u5E94\u6570\u636E\u5931\u8D25\uFF01
 \u8BF7\u6C42\u63A5\u53E3\u7C7B\u578B\uFF1A\u300C${options.methodType}\u300D
 \u8BF7\u6C42URL\uFF1A${options.url}
 \u9519\u8BEF\u4EE3\u7801\uFF1A${result.code}\uFF0C
 \u542B\u4E49\uFF1A${result.message}`;
-    logger.warn(warningMessage);
-    return {
-      ...result,
-      warning: warningMessage
-    };
-  } else {
-    const errorMessage = errorMap[result.code] || result.message || "\u672A\u77E5\u9519\u8BEF";
-    const warningMessage = `\u83B7\u53D6\u54CD\u5E94\u6570\u636E\u5931\u8D25\uFF01
+      logger.warn(warningMessage);
+      throw {
+        ...result,
+        warning: warningMessage
+      };
+    } else {
+      const errorMessage = errorMap[result.code] || result.message || "\u672A\u77E5\u9519\u8BEF";
+      const warningMessage = `\u83B7\u53D6\u54CD\u5E94\u6570\u636E\u5931\u8D25\uFF01
 \u8BF7\u6C42\u63A5\u53E3\u7C7B\u578B\uFF1A\u300C${options.methodType}\u300D
 \u8BF7\u6C42URL\uFF1A${options.url}
 \u9519\u8BEF\u4EE3\u7801\uFF1A${result.code}\uFF0C
 \u542B\u4E49\uFF1A${errorMessage}`;
-    logger.warn(warningMessage);
-    return {
-      ...result,
-      warning: warningMessage
-    };
+      logger.warn(warningMessage);
+      throw {
+        ...result,
+        warning: warningMessage
+      };
+    }
+  } catch (error) {
+    if (error && typeof error === "object") {
+      return {
+        ...error,
+        warning: error.warning || "\u672A\u77E5\u9519\u8BEF"
+      };
+    }
   }
 };
 var errorMap = {
@@ -1655,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/",
@@ -1884,22 +1889,46 @@ var fetchPaginatedData = async (apiUrlGenerator, params, maxPageSize, headers2)
   return finalResponse;
 };
 async function GlobalGetData2(options) {
-  const ResponseData = await new Networks(options).getData();
-  if (ResponseData === "" || !ResponseData) {
-    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);
-    return {
-      code: 500,
-      message: "\u83B7\u53D6\u54CD\u5E94\u6570\u636E\u5931\u8D25",
-      data: null,
-      warning: warningMessage,
-      response: ResponseData
-    };
+  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}
+      `;
+      logger.warn(warningMessage);
+      throw {
+        ...result,
+        code: result.status_code,
+        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") {
+      return {
+        ...error,
+        code: error.status_code || 500,
+        warning: error.warning || "\u672A\u77E5\u9519\u8BEF"
+      };
+    }
   }
-  return ResponseData;
 }
 
 // src/platform/kuaishou/API.ts
@@ -2074,23 +2103,32 @@ var KuaishouData = async (data2, cookie) => {
   }
 };
 async function GlobalGetData3(options) {
-  const ResponseData = await new Networks(options).getData();
-  if (ResponseData.result === 2) {
-    const warningMessage = `\u83B7\u53D6\u54CD\u5E94\u6570\u636E\u5931\u8D25\uFF01\u63A5\u53E3\u8FD4\u56DE\u5185\u5BB9\u4E3A\u7A7A
+  try {
+    const result = await new Networks(options).getData();
+    if (result === "" || !result || result.result === 2) {
+      const warningMessage = `\u83B7\u53D6\u54CD\u5E94\u6570\u636E\u5931\u8D25\uFF01\u63A5\u53E3\u8FD4\u56DE\u5185\u5BB9\u4E3A\u7A7A
 \u4F60\u7684\u5FEB\u624Bck\u53EF\u80FD\u5DF2\u7ECF\u5931\u6548\uFF01
-\u8BF7\u6C42\u7C7B\u578B\uFF1A${options.methodType}
+\u8BF7\u6C42\u7C7B\u578B\uFF1A\u300C${options.methodType}\u300D
 \u8BF7\u6C42URL\uFF1A${options.url}
 \u8BF7\u6C42\u53C2\u6570\uFF1A${JSON.stringify(options.body, null, 2)}`;
-    logger.warn(warningMessage);
-    return {
-      code: 500,
-      message: "\u83B7\u53D6\u54CD\u5E94\u6570\u636E\u5931\u8D25",
-      data: null,
-      warning: warningMessage,
-      response: ResponseData
-    };
+      logger.warn(warningMessage);
+      throw {
+        ...result,
+        code: result.result,
+        warning: warningMessage
+      };
+    }
+    return result;
+  } catch (error) {
+    if (error && typeof error === "object") {
+      return {
+        ...error,
+        code: error.result || 500,
+        message: error.error_msg,
+        warning: error.warning || "\u672A\u77E5\u9519\u8BEF"
+      };
+    }
   }
-  return ResponseData;
 }
 
 // src/model/DataFetchers.ts
@@ -2117,7 +2155,7 @@ async function getBilibiliData(methodType, arg2, arg3) {
     options = arg2;
     cookie = arg3;
   }
-  const data2 = await BilibiliData({ ...options, methodType }, cookie);
+  const data2 = await fetchBilibili({ ...options, methodType }, cookie);
   return data2;
 }
 async function getKuaishouData(methodType, arg2, arg3) {
@@ -2476,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;