@ikenxuan/amagi 4.4.1 → 4.4.2

package/dist/cjs/index.cjs

@@ -102,7 +102,7 @@ var BilibiliData = async (data2, cookie) => {
   };
   switch (data2.methodType) {
     case "\u5355\u4E2A\u89C6\u9891\u4F5C\u54C1\u6570\u636E": {
-      validateData(data2, ["bvid"]);
+      BilibiliValidateData(data2, ["bvid"]);
       const INFODATA = await GlobalGetData({
         url: bilibiliAPI.\u89C6\u9891\u8BE6\u7EC6\u4FE1\u606F({ bvid: data2.bvid }),
         ...data2
@@ -110,7 +110,7 @@ var BilibiliData = async (data2, cookie) => {
       return INFODATA;
     }
     case "\u5355\u4E2A\u89C6\u9891\u4E0B\u8F7D\u4FE1\u606F\u6570\u636E": {
-      validateData(data2, ["avid", "cid"]);
+      BilibiliValidateData(data2, ["avid", "cid"]);
       const BASEURL = bilibiliAPI.\u89C6\u9891\u6D41\u4FE1\u606F({ avid: data2.avid, cid: data2.cid });
       const SIGN = await qtparam(BASEURL, headers2.cookie);
       const DATA = await GlobalGetData({
@@ -121,7 +121,7 @@ var BilibiliData = async (data2, cookie) => {
       return DATA;
     }
     case "\u8BC4\u8BBA\u6570\u636E": {
-      validateData(data2, ["oid", "type"]);
+      BilibiliValidateData(data2, ["oid", "type"]);
       let { oid, number, pn, type } = data2;
       let fetchedComments = [];
       pn = pn ?? 1;
@@ -200,7 +200,7 @@ var BilibiliData = async (data2, cookie) => {
     case "\u756A\u5267\u57FA\u672C\u4FE1\u606F\u6570\u636E": {
       let id = data2.ep_id ? data2.ep_id : data2.season_id;
       if (!id) {
-        validateData(data2, ["ep_id"]);
+        BilibiliValidateData(data2, ["ep_id"]);
         return false;
       }
       const idType = id ? id.startsWith("ep") ? "ep_id" : "season_id" : "ep_id";
@@ -213,15 +213,18 @@ var BilibiliData = async (data2, cookie) => {
       return INFO;
     }
     case "\u756A\u5267\u4E0B\u8F7D\u4FE1\u606F\u6570\u636E": {
-      validateData(data2, ["cid", "ep_id"]);
-      const result = await GlobalGetData({
-        url: bilibiliAPI.\u756A\u5267\u89C6\u9891\u6D41\u4FE1\u606F({ cid: data2.cid, ep_id: data2.ep_id.replace("ep", "") }),
+      BilibiliValidateData(data2, ["cid", "ep_id"]);
+      const BASEURL = bilibiliAPI.\u756A\u5267\u89C6\u9891\u6D41\u4FE1\u606F({ cid: data2.cid, ep_id: data2.ep_id.replace("ep", "") });
+      const SIGN = await qtparam(BASEURL, headers2.cookie);
+      const DATA = await GlobalGetData({
+        url: bilibiliAPI.\u756A\u5267\u89C6\u9891\u6D41\u4FE1\u606F({ cid: data2.cid, ep_id: data2.ep_id.replace("ep", "") }) + SIGN.QUERY,
+        headers: headers2,
         ...data2
       });
-      return result;
+      return DATA;
     }
     case "\u7528\u6237\u4E3B\u9875\u52A8\u6001\u5217\u8868\u6570\u636E": {
-      validateData(data2, ["host_mid"]);
+      BilibiliValidateData(data2, ["host_mid"]);
       delete headers2.referer;
       const { host_mid } = data2;
       const result = await GlobalGetData({
@@ -232,7 +235,7 @@ var BilibiliData = async (data2, cookie) => {
       return result;
     }
     case "\u52A8\u6001\u8BE6\u60C5\u6570\u636E": {
-      validateData(data2, ["dynamic_id"]);
+      BilibiliValidateData(data2, ["dynamic_id"]);
       delete headers2.referer;
       const dynamicINFO = await GlobalGetData({
         url: bilibiliAPI.\u52A8\u6001\u8BE6\u60C5({ dynamic_id: data2.dynamic_id }),
@@ -242,7 +245,7 @@ var BilibiliData = async (data2, cookie) => {
       return dynamicINFO;
     }
     case "\u52A8\u6001\u5361\u7247\u6570\u636E": {
-      validateData(data2, ["dynamic_id"]);
+      BilibiliValidateData(data2, ["dynamic_id"]);
       delete headers2.referer;
       const { dynamic_id } = data2;
       const dynamicINFO_CARD = await GlobalGetData({
@@ -253,7 +256,7 @@ var BilibiliData = async (data2, cookie) => {
       return dynamicINFO_CARD;
     }
     case "\u7528\u6237\u4E3B\u9875\u6570\u636E": {
-      validateData(data2, ["host_mid"]);
+      BilibiliValidateData(data2, ["host_mid"]);
       const { host_mid } = data2;
       const result = await GlobalGetData({
         url: bilibiliAPI.\u7528\u6237\u540D\u7247\u4FE1\u606F({ host_mid }),
@@ -263,7 +266,7 @@ var BilibiliData = async (data2, cookie) => {
       return result;
     }
     case "\u76F4\u64AD\u95F4\u4FE1\u606F": {
-      validateData(data2, ["room_id"]);
+      BilibiliValidateData(data2, ["room_id"]);
       const result = await GlobalGetData({
         url: bilibiliAPI.\u76F4\u64AD\u95F4\u4FE1\u606F({ room_id: data2.room_id }),
         headers: headers2,
@@ -272,7 +275,7 @@ var BilibiliData = async (data2, cookie) => {
       return result;
     }
     case "\u76F4\u64AD\u95F4\u521D\u59CB\u5316\u4FE1\u606F": {
-      validateData(data2, ["room_id"]);
+      BilibiliValidateData(data2, ["room_id"]);
       const result = await GlobalGetData({
         url: bilibiliAPI.\u76F4\u64AD\u95F4\u521D\u59CB\u5316\u4FE1\u606F({ room_id: data2.room_id }),
         headers: headers2,
@@ -289,7 +292,7 @@ var BilibiliData = async (data2, cookie) => {
       return result;
     }
     case "\u4E8C\u7EF4\u7801\u72B6\u6001": {
-      validateData(data2, ["qrcode_key"]);
+      BilibiliValidateData(data2, ["qrcode_key"]);
       const result = await new Networks({
         url: bilibiliAPI.\u4E8C\u7EF4\u7801\u72B6\u6001({ qrcode_key: data2.qrcode_key }),
         headers: headers2,
@@ -306,7 +309,7 @@ var BilibiliData = async (data2, cookie) => {
       return result;
     }
     case "\u83B7\u53D6UP\u4E3B\u603B\u64AD\u653E\u91CF": {
-      validateData(data2, ["host_mid"]);
+      BilibiliValidateData(data2, ["host_mid"]);
       const result = await GlobalGetData({
         url: bilibiliAPI.\u83B7\u53D6UP\u4E3B\u603B\u64AD\u653E\u91CF({ host_mid: data2.host_mid }),
         headers: headers2,
@@ -315,7 +318,7 @@ var BilibiliData = async (data2, cookie) => {
       return result;
     }
     case "AV\u8F6CBV": {
-      validateData(data2, ["avid"]);
+      BilibiliValidateData(data2, ["avid"]);
       const result = av2bv(Number(data2.avid.toString().replace(/^av/i, "")));
       return {
         code: 0,
@@ -326,7 +329,7 @@ var BilibiliData = async (data2, cookie) => {
       };
     }
     case "BV\u8F6CAV": {
-      validateData(data2, ["bvid"]);
+      BilibiliValidateData(data2, ["bvid"]);
       const result = "av" + bv2av(data2.bvid);
       return {
         code: 0,
@@ -358,7 +361,7 @@ var GlobalGetData = async (options) => {
 \u8BF7\u6C42URL\uFF1A${options.url}
 \u9519\u8BEF\u4EE3\u7801\uFF1A${result.code}\uFF0C
 \u542B\u4E49\uFF1A${errorMessage}`);
-    return false;
+    return result;
   }
 };
 var errorMap = {
@@ -1195,7 +1198,7 @@ var DouyinData = async (data2, cookie) => {
     case "\u89C6\u9891\u4F5C\u54C1\u6570\u636E":
     case "\u56FE\u96C6\u4F5C\u54C1\u6570\u636E":
     case "\u5408\u8F91\u4F5C\u54C1\u6570\u636E": {
-      validateData(data2, ["aweme_id"]);
+      DouyinValidateData(data2, ["aweme_id"]);
       const url = douyinAPI.\u89C6\u9891\u6216\u56FE\u96C6({ aweme_id: data2.aweme_id });
       const VideoData = await GlobalGetData2({
         url: `${url}&a_bogus=${douyinSign.AB(url)}`,
@@ -1205,13 +1208,13 @@ var DouyinData = async (data2, cookie) => {
       return VideoData;
     }
     case "\u8BC4\u8BBA\u6570\u636E": {
-      validateData(data2, ["aweme_id"]);
+      DouyinValidateData(data2, ["aweme_id"]);
       const urlGenerator = (params) => douyinAPI.\u8BC4\u8BBA(params);
       const response = await fetchPaginatedData(urlGenerator, data2, 50, headers2);
       return response;
     }
     case "\u6307\u5B9A\u8BC4\u8BBA\u56DE\u590D\u6570\u636E": {
-      validateData(data2, ["aweme_id", "comment_id"]);
+      DouyinValidateData(data2, ["aweme_id", "comment_id"]);
       const urlGenerator = (params) => douyinAPI.\u4E8C\u7EA7\u8BC4\u8BBA(params);
       const response = await fetchPaginatedData(
         urlGenerator,
@@ -1225,7 +1228,7 @@ var DouyinData = async (data2, cookie) => {
       return response;
     }
     case "\u7528\u6237\u4E3B\u9875\u6570\u636E": {
-      validateData(data2, ["sec_uid"]);
+      DouyinValidateData(data2, ["sec_uid"]);
       const url = douyinAPI.\u7528\u6237\u4E3B\u9875\u4FE1\u606F({ sec_uid: data2.sec_uid });
       const UserInfoData = await GlobalGetData2({
         url: `${url}&a_bogus=${douyinSign.AB(url)}`,
@@ -1247,7 +1250,7 @@ var DouyinData = async (data2, cookie) => {
       return EmojiData;
     }
     case "\u7528\u6237\u4E3B\u9875\u89C6\u9891\u5217\u8868\u6570\u636E": {
-      validateData(data2, ["sec_uid"]);
+      DouyinValidateData(data2, ["sec_uid"]);
       const url = douyinAPI.\u7528\u6237\u4E3B\u9875\u89C6\u9891({ sec_uid: data2.sec_uid });
       const UserVideoListData = await GlobalGetData2({
         url: `${url}&a_bogus=${douyinSign.AB(url)}`,
@@ -1260,7 +1263,7 @@ var DouyinData = async (data2, cookie) => {
       return UserVideoListData;
     }
     case "\u70ED\u70B9\u8BCD\u6570\u636E": {
-      validateData(data2, ["query"]);
+      DouyinValidateData(data2, ["query"]);
       const url = douyinAPI.\u70ED\u70B9\u8BCD({ query: data2.query, number: data2.number ?? 10 });
       const SuggestWordsData = await GlobalGetData2({
         url: `${url}&a_bogus=${douyinSign.AB(url)}`,
@@ -1273,7 +1276,7 @@ var DouyinData = async (data2, cookie) => {
       return SuggestWordsData;
     }
     case "\u641C\u7D22\u6570\u636E": {
-      validateData(data2, ["query"]);
+      DouyinValidateData(data2, ["query"]);
       let search_id = "";
       const maxPageSize = 15;
       let fetchedSearchList = [];
@@ -1316,7 +1319,7 @@ var DouyinData = async (data2, cookie) => {
       return ExpressionPlusData;
     }
     case "\u97F3\u4E50\u6570\u636E": {
-      validateData(data2, ["music_id"]);
+      DouyinValidateData(data2, ["music_id"]);
       const url = douyinAPI.\u80CC\u666F\u97F3\u4E50({ music_id: data2.music_id });
       const MusicData = await GlobalGetData2({
         url: `${url}&a_bogus=${douyinSign.AB(url)}`,
@@ -1326,7 +1329,7 @@ var DouyinData = async (data2, cookie) => {
       return MusicData;
     }
     case "\u76F4\u64AD\u95F4\u4FE1\u606F\u6570\u636E": {
-      validateData(data2, ["sec_uid"]);
+      DouyinValidateData(data2, ["sec_uid"]);
       let url = douyinAPI.\u7528\u6237\u4E3B\u9875\u4FE1\u606F({ sec_uid: data2.sec_uid });
       const UserInfoData = await GlobalGetData2({
         url: `${url}&a_bogus=${douyinSign.AB(url)}`,
@@ -1358,7 +1361,7 @@ var DouyinData = async (data2, cookie) => {
       return LiveRoomData;
     }
     case "\u7533\u8BF7\u4E8C\u7EF4\u7801\u6570\u636E": {
-      validateData(data2, ["verify_fp"]);
+      DouyinValidateData(data2, ["verify_fp"]);
       const url = douyinAPI.\u7533\u8BF7\u4E8C\u7EF4\u7801({ verify_fp: data2.verify_fp });
       const LoginQrcodeStatusData = await GlobalGetData2({
         url: `${url}&a_bogus=${douyinSign.AB(url)}`,
@@ -1576,7 +1579,7 @@ var KuaishouData = async (data2, cookie) => {
   };
   switch (data2.methodType) {
     case "\u5355\u4E2A\u89C6\u9891\u4F5C\u54C1\u6570\u636E": {
-      validateData(data2, ["photoId"]);
+      KusiahouValidateData(data2, ["photoId"]);
       const body = KuaishouAPI.\u5355\u4E2A\u4F5C\u54C1\u4FE1\u606F({ photoId: data2.photoId });
       const VideoData = await GlobalGetData3({
         url: body.url,
@@ -1588,7 +1591,7 @@ var KuaishouData = async (data2, cookie) => {
       return VideoData;
     }
     case "\u8BC4\u8BBA\u6570\u636E": {
-      validateData(data2, ["photoId"]);
+      KusiahouValidateData(data2, ["photoId"]);
       const body = KuaishouAPI.\u4F5C\u54C1\u8BC4\u8BBA\u4FE1\u606F({ photoId: data2.photoId });
       const VideoData = await GlobalGetData3({
         url: body.url,
@@ -1911,13 +1914,31 @@ var Networks = class {
 };
 
 // src/model/tools.ts
-var validateData = (data2, fields, atLeastOne = false) => {
+var DouyinValidateData = (data2, fields, atLeastOne = false) => {
+  const checkField = (field) => Object.prototype.hasOwnProperty.call(data2, field);
+  const isValid = atLeastOne ? fields.some(checkField) : fields.every(checkField);
+  if (!isValid) {
+    const missingFields = atLeastOne ? fields : fields.filter((f) => !checkField(f));
+    const missingStr = missingFields.map((f) => `'${logger.green(f.toString())}'`).join(", ");
+    throw new Error(`\u83B7\u53D6\u300C${data2.methodType}\u300D${logger.red("\u7F3A\u5C11\u53C2\u6570")}: ${missingStr}`);
+  }
+};
+var BilibiliValidateData = (data2, fields, atLeastOne = false) => {
+  const checkField = (field) => Object.prototype.hasOwnProperty.call(data2, field);
+  const isValid = atLeastOne ? fields.some(checkField) : fields.every(checkField);
+  if (!isValid) {
+    const missingFields = atLeastOne ? fields : fields.filter((f) => !checkField(f));
+    const missingStr = missingFields.map((f) => `'${logger.green(f.toString())}'`).join(", ");
+    throw new Error(`\u83B7\u53D6\u300C${data2.methodType}\u300D${logger.red("\u7F3A\u5C11\u53C2\u6570")}: ${missingStr}`);
+  }
+};
+var KusiahouValidateData = (data2, fields, atLeastOne = false) => {
   const checkField = (field) => Object.prototype.hasOwnProperty.call(data2, field);
   const isValid = atLeastOne ? fields.some(checkField) : fields.every(checkField);
-  if (isValid === false) {
-    const missingFields = atLeastOne ? fields : fields.filter((field) => !checkField(field));
-    const missingFieldsString = missingFields.map((field) => `'${logger.green(field)}'`).join(", ");
-    throw new Error(`\u83B7\u53D6\u300C${data2.methodType}\u300D${logger.red("\u7F3A\u5C11\u5FC5\u8981\u7684\u53C2\u6570")}: ${missingFieldsString}`);
+  if (!isValid) {
+    const missingFields = atLeastOne ? fields : fields.filter((f) => !checkField(f));
+    const missingStr = missingFields.map((f) => `'${logger.green(f.toString())}'`).join(", ");
+    throw new Error(`\u83B7\u53D6\u300C${data2.methodType}\u300D${logger.red("\u7F3A\u5C11\u53C2\u6570")}: ${missingStr}`);
   }
 };
 var amagi = class {
@@ -2059,9 +2080,12 @@ function Amagi(options) {
 
 exports.Amagi = Amagi;
 exports.BilibiliData = BilibiliData;
+exports.BilibiliValidateData = BilibiliValidateData;
 exports.DouyinData = DouyinData;
+exports.DouyinValidateData = DouyinValidateData;
 exports.KuaishouAPI = KuaishouAPI;
 exports.KuaishouData = KuaishouData;
+exports.KusiahouValidateData = KusiahouValidateData;
 exports.Networks = Networks;
 exports.amagi = amagi;
 exports.av2bv = av2bv;
@@ -2082,5 +2106,4 @@ exports.registerBilibiliRoutes = registerBilibiliRoutes;
 exports.registerDouyinRoutes = registerDouyinRoutes;
 exports.registerKuaishouRoutes = registerKuaishouRoutes;
 exports.startClient = startClient;
-exports.validateData = validateData;
 exports.wbi_sign = wbi_sign;

package/dist/esm/index.mjs

@@ -90,7 +90,7 @@ var BilibiliData = async (data2, cookie) => {
   };
   switch (data2.methodType) {
     case "\u5355\u4E2A\u89C6\u9891\u4F5C\u54C1\u6570\u636E": {
-      validateData(data2, ["bvid"]);
+      BilibiliValidateData(data2, ["bvid"]);
       const INFODATA = await GlobalGetData({
         url: bilibiliAPI.\u89C6\u9891\u8BE6\u7EC6\u4FE1\u606F({ bvid: data2.bvid }),
         ...data2
@@ -98,7 +98,7 @@ var BilibiliData = async (data2, cookie) => {
       return INFODATA;
     }
     case "\u5355\u4E2A\u89C6\u9891\u4E0B\u8F7D\u4FE1\u606F\u6570\u636E": {
-      validateData(data2, ["avid", "cid"]);
+      BilibiliValidateData(data2, ["avid", "cid"]);
       const BASEURL = bilibiliAPI.\u89C6\u9891\u6D41\u4FE1\u606F({ avid: data2.avid, cid: data2.cid });
       const SIGN = await qtparam(BASEURL, headers2.cookie);
       const DATA = await GlobalGetData({
@@ -109,7 +109,7 @@ var BilibiliData = async (data2, cookie) => {
       return DATA;
     }
     case "\u8BC4\u8BBA\u6570\u636E": {
-      validateData(data2, ["oid", "type"]);
+      BilibiliValidateData(data2, ["oid", "type"]);
       let { oid, number, pn, type } = data2;
       let fetchedComments = [];
       pn = pn ?? 1;
@@ -188,7 +188,7 @@ var BilibiliData = async (data2, cookie) => {
     case "\u756A\u5267\u57FA\u672C\u4FE1\u606F\u6570\u636E": {
       let id = data2.ep_id ? data2.ep_id : data2.season_id;
       if (!id) {
-        validateData(data2, ["ep_id"]);
+        BilibiliValidateData(data2, ["ep_id"]);
         return false;
       }
       const idType = id ? id.startsWith("ep") ? "ep_id" : "season_id" : "ep_id";
@@ -201,15 +201,18 @@ var BilibiliData = async (data2, cookie) => {
       return INFO;
     }
     case "\u756A\u5267\u4E0B\u8F7D\u4FE1\u606F\u6570\u636E": {
-      validateData(data2, ["cid", "ep_id"]);
-      const result = await GlobalGetData({
-        url: bilibiliAPI.\u756A\u5267\u89C6\u9891\u6D41\u4FE1\u606F({ cid: data2.cid, ep_id: data2.ep_id.replace("ep", "") }),
+      BilibiliValidateData(data2, ["cid", "ep_id"]);
+      const BASEURL = bilibiliAPI.\u756A\u5267\u89C6\u9891\u6D41\u4FE1\u606F({ cid: data2.cid, ep_id: data2.ep_id.replace("ep", "") });
+      const SIGN = await qtparam(BASEURL, headers2.cookie);
+      const DATA = await GlobalGetData({
+        url: bilibiliAPI.\u756A\u5267\u89C6\u9891\u6D41\u4FE1\u606F({ cid: data2.cid, ep_id: data2.ep_id.replace("ep", "") }) + SIGN.QUERY,
+        headers: headers2,
         ...data2
       });
-      return result;
+      return DATA;
     }
     case "\u7528\u6237\u4E3B\u9875\u52A8\u6001\u5217\u8868\u6570\u636E": {
-      validateData(data2, ["host_mid"]);
+      BilibiliValidateData(data2, ["host_mid"]);
       delete headers2.referer;
       const { host_mid } = data2;
       const result = await GlobalGetData({
@@ -220,7 +223,7 @@ var BilibiliData = async (data2, cookie) => {
       return result;
     }
     case "\u52A8\u6001\u8BE6\u60C5\u6570\u636E": {
-      validateData(data2, ["dynamic_id"]);
+      BilibiliValidateData(data2, ["dynamic_id"]);
       delete headers2.referer;
       const dynamicINFO = await GlobalGetData({
         url: bilibiliAPI.\u52A8\u6001\u8BE6\u60C5({ dynamic_id: data2.dynamic_id }),
@@ -230,7 +233,7 @@ var BilibiliData = async (data2, cookie) => {
       return dynamicINFO;
     }
     case "\u52A8\u6001\u5361\u7247\u6570\u636E": {
-      validateData(data2, ["dynamic_id"]);
+      BilibiliValidateData(data2, ["dynamic_id"]);
       delete headers2.referer;
       const { dynamic_id } = data2;
       const dynamicINFO_CARD = await GlobalGetData({
@@ -241,7 +244,7 @@ var BilibiliData = async (data2, cookie) => {
       return dynamicINFO_CARD;
     }
     case "\u7528\u6237\u4E3B\u9875\u6570\u636E": {
-      validateData(data2, ["host_mid"]);
+      BilibiliValidateData(data2, ["host_mid"]);
       const { host_mid } = data2;
       const result = await GlobalGetData({
         url: bilibiliAPI.\u7528\u6237\u540D\u7247\u4FE1\u606F({ host_mid }),
@@ -251,7 +254,7 @@ var BilibiliData = async (data2, cookie) => {
       return result;
     }
     case "\u76F4\u64AD\u95F4\u4FE1\u606F": {
-      validateData(data2, ["room_id"]);
+      BilibiliValidateData(data2, ["room_id"]);
       const result = await GlobalGetData({
         url: bilibiliAPI.\u76F4\u64AD\u95F4\u4FE1\u606F({ room_id: data2.room_id }),
         headers: headers2,
@@ -260,7 +263,7 @@ var BilibiliData = async (data2, cookie) => {
       return result;
     }
     case "\u76F4\u64AD\u95F4\u521D\u59CB\u5316\u4FE1\u606F": {
-      validateData(data2, ["room_id"]);
+      BilibiliValidateData(data2, ["room_id"]);
       const result = await GlobalGetData({
         url: bilibiliAPI.\u76F4\u64AD\u95F4\u521D\u59CB\u5316\u4FE1\u606F({ room_id: data2.room_id }),
         headers: headers2,
@@ -277,7 +280,7 @@ var BilibiliData = async (data2, cookie) => {
       return result;
     }
     case "\u4E8C\u7EF4\u7801\u72B6\u6001": {
-      validateData(data2, ["qrcode_key"]);
+      BilibiliValidateData(data2, ["qrcode_key"]);
       const result = await new Networks({
         url: bilibiliAPI.\u4E8C\u7EF4\u7801\u72B6\u6001({ qrcode_key: data2.qrcode_key }),
         headers: headers2,
@@ -294,7 +297,7 @@ var BilibiliData = async (data2, cookie) => {
       return result;
     }
     case "\u83B7\u53D6UP\u4E3B\u603B\u64AD\u653E\u91CF": {
-      validateData(data2, ["host_mid"]);
+      BilibiliValidateData(data2, ["host_mid"]);
       const result = await GlobalGetData({
         url: bilibiliAPI.\u83B7\u53D6UP\u4E3B\u603B\u64AD\u653E\u91CF({ host_mid: data2.host_mid }),
         headers: headers2,
@@ -303,7 +306,7 @@ var BilibiliData = async (data2, cookie) => {
       return result;
     }
     case "AV\u8F6CBV": {
-      validateData(data2, ["avid"]);
+      BilibiliValidateData(data2, ["avid"]);
       const result = av2bv(Number(data2.avid.toString().replace(/^av/i, "")));
       return {
         code: 0,
@@ -314,7 +317,7 @@ var BilibiliData = async (data2, cookie) => {
       };
     }
     case "BV\u8F6CAV": {
-      validateData(data2, ["bvid"]);
+      BilibiliValidateData(data2, ["bvid"]);
       const result = "av" + bv2av(data2.bvid);
       return {
         code: 0,
@@ -346,7 +349,7 @@ var GlobalGetData = async (options) => {
 \u8BF7\u6C42URL\uFF1A${options.url}
 \u9519\u8BEF\u4EE3\u7801\uFF1A${result.code}\uFF0C
 \u542B\u4E49\uFF1A${errorMessage}`);
-    return false;
+    return result;
   }
 };
 var errorMap = {
@@ -1183,7 +1186,7 @@ var DouyinData = async (data2, cookie) => {
     case "\u89C6\u9891\u4F5C\u54C1\u6570\u636E":
     case "\u56FE\u96C6\u4F5C\u54C1\u6570\u636E":
     case "\u5408\u8F91\u4F5C\u54C1\u6570\u636E": {
-      validateData(data2, ["aweme_id"]);
+      DouyinValidateData(data2, ["aweme_id"]);
       const url = douyinAPI.\u89C6\u9891\u6216\u56FE\u96C6({ aweme_id: data2.aweme_id });
       const VideoData = await GlobalGetData2({
         url: `${url}&a_bogus=${douyinSign.AB(url)}`,
@@ -1193,13 +1196,13 @@ var DouyinData = async (data2, cookie) => {
       return VideoData;
     }
     case "\u8BC4\u8BBA\u6570\u636E": {
-      validateData(data2, ["aweme_id"]);
+      DouyinValidateData(data2, ["aweme_id"]);
       const urlGenerator = (params) => douyinAPI.\u8BC4\u8BBA(params);
       const response = await fetchPaginatedData(urlGenerator, data2, 50, headers2);
       return response;
     }
     case "\u6307\u5B9A\u8BC4\u8BBA\u56DE\u590D\u6570\u636E": {
-      validateData(data2, ["aweme_id", "comment_id"]);
+      DouyinValidateData(data2, ["aweme_id", "comment_id"]);
       const urlGenerator = (params) => douyinAPI.\u4E8C\u7EA7\u8BC4\u8BBA(params);
       const response = await fetchPaginatedData(
         urlGenerator,
@@ -1213,7 +1216,7 @@ var DouyinData = async (data2, cookie) => {
       return response;
     }
     case "\u7528\u6237\u4E3B\u9875\u6570\u636E": {
-      validateData(data2, ["sec_uid"]);
+      DouyinValidateData(data2, ["sec_uid"]);
       const url = douyinAPI.\u7528\u6237\u4E3B\u9875\u4FE1\u606F({ sec_uid: data2.sec_uid });
       const UserInfoData = await GlobalGetData2({
         url: `${url}&a_bogus=${douyinSign.AB(url)}`,
@@ -1235,7 +1238,7 @@ var DouyinData = async (data2, cookie) => {
       return EmojiData;
     }
     case "\u7528\u6237\u4E3B\u9875\u89C6\u9891\u5217\u8868\u6570\u636E": {
-      validateData(data2, ["sec_uid"]);
+      DouyinValidateData(data2, ["sec_uid"]);
       const url = douyinAPI.\u7528\u6237\u4E3B\u9875\u89C6\u9891({ sec_uid: data2.sec_uid });
       const UserVideoListData = await GlobalGetData2({
         url: `${url}&a_bogus=${douyinSign.AB(url)}`,
@@ -1248,7 +1251,7 @@ var DouyinData = async (data2, cookie) => {
       return UserVideoListData;
     }
     case "\u70ED\u70B9\u8BCD\u6570\u636E": {
-      validateData(data2, ["query"]);
+      DouyinValidateData(data2, ["query"]);
       const url = douyinAPI.\u70ED\u70B9\u8BCD({ query: data2.query, number: data2.number ?? 10 });
       const SuggestWordsData = await GlobalGetData2({
         url: `${url}&a_bogus=${douyinSign.AB(url)}`,
@@ -1261,7 +1264,7 @@ var DouyinData = async (data2, cookie) => {
       return SuggestWordsData;
     }
     case "\u641C\u7D22\u6570\u636E": {
-      validateData(data2, ["query"]);
+      DouyinValidateData(data2, ["query"]);
       let search_id = "";
       const maxPageSize = 15;
       let fetchedSearchList = [];
@@ -1304,7 +1307,7 @@ var DouyinData = async (data2, cookie) => {
       return ExpressionPlusData;
     }
     case "\u97F3\u4E50\u6570\u636E": {
-      validateData(data2, ["music_id"]);
+      DouyinValidateData(data2, ["music_id"]);
       const url = douyinAPI.\u80CC\u666F\u97F3\u4E50({ music_id: data2.music_id });
       const MusicData = await GlobalGetData2({
         url: `${url}&a_bogus=${douyinSign.AB(url)}`,
@@ -1314,7 +1317,7 @@ var DouyinData = async (data2, cookie) => {
       return MusicData;
     }
     case "\u76F4\u64AD\u95F4\u4FE1\u606F\u6570\u636E": {
-      validateData(data2, ["sec_uid"]);
+      DouyinValidateData(data2, ["sec_uid"]);
       let url = douyinAPI.\u7528\u6237\u4E3B\u9875\u4FE1\u606F({ sec_uid: data2.sec_uid });
       const UserInfoData = await GlobalGetData2({
         url: `${url}&a_bogus=${douyinSign.AB(url)}`,
@@ -1346,7 +1349,7 @@ var DouyinData = async (data2, cookie) => {
       return LiveRoomData;
     }
     case "\u7533\u8BF7\u4E8C\u7EF4\u7801\u6570\u636E": {
-      validateData(data2, ["verify_fp"]);
+      DouyinValidateData(data2, ["verify_fp"]);
       const url = douyinAPI.\u7533\u8BF7\u4E8C\u7EF4\u7801({ verify_fp: data2.verify_fp });
       const LoginQrcodeStatusData = await GlobalGetData2({
         url: `${url}&a_bogus=${douyinSign.AB(url)}`,
@@ -1564,7 +1567,7 @@ var KuaishouData = async (data2, cookie) => {
   };
   switch (data2.methodType) {
     case "\u5355\u4E2A\u89C6\u9891\u4F5C\u54C1\u6570\u636E": {
-      validateData(data2, ["photoId"]);
+      KusiahouValidateData(data2, ["photoId"]);
       const body = KuaishouAPI.\u5355\u4E2A\u4F5C\u54C1\u4FE1\u606F({ photoId: data2.photoId });
       const VideoData = await GlobalGetData3({
         url: body.url,
@@ -1576,7 +1579,7 @@ var KuaishouData = async (data2, cookie) => {
       return VideoData;
     }
     case "\u8BC4\u8BBA\u6570\u636E": {
-      validateData(data2, ["photoId"]);
+      KusiahouValidateData(data2, ["photoId"]);
       const body = KuaishouAPI.\u4F5C\u54C1\u8BC4\u8BBA\u4FE1\u606F({ photoId: data2.photoId });
       const VideoData = await GlobalGetData3({
         url: body.url,
@@ -1899,13 +1902,31 @@ var Networks = class {
 };
 
 // src/model/tools.ts
-var validateData = (data2, fields, atLeastOne = false) => {
+var DouyinValidateData = (data2, fields, atLeastOne = false) => {
+  const checkField = (field) => Object.prototype.hasOwnProperty.call(data2, field);
+  const isValid = atLeastOne ? fields.some(checkField) : fields.every(checkField);
+  if (!isValid) {
+    const missingFields = atLeastOne ? fields : fields.filter((f) => !checkField(f));
+    const missingStr = missingFields.map((f) => `'${logger.green(f.toString())}'`).join(", ");
+    throw new Error(`\u83B7\u53D6\u300C${data2.methodType}\u300D${logger.red("\u7F3A\u5C11\u53C2\u6570")}: ${missingStr}`);
+  }
+};
+var BilibiliValidateData = (data2, fields, atLeastOne = false) => {
+  const checkField = (field) => Object.prototype.hasOwnProperty.call(data2, field);
+  const isValid = atLeastOne ? fields.some(checkField) : fields.every(checkField);
+  if (!isValid) {
+    const missingFields = atLeastOne ? fields : fields.filter((f) => !checkField(f));
+    const missingStr = missingFields.map((f) => `'${logger.green(f.toString())}'`).join(", ");
+    throw new Error(`\u83B7\u53D6\u300C${data2.methodType}\u300D${logger.red("\u7F3A\u5C11\u53C2\u6570")}: ${missingStr}`);
+  }
+};
+var KusiahouValidateData = (data2, fields, atLeastOne = false) => {
   const checkField = (field) => Object.prototype.hasOwnProperty.call(data2, field);
   const isValid = atLeastOne ? fields.some(checkField) : fields.every(checkField);
-  if (isValid === false) {
-    const missingFields = atLeastOne ? fields : fields.filter((field) => !checkField(field));
-    const missingFieldsString = missingFields.map((field) => `'${logger.green(field)}'`).join(", ");
-    throw new Error(`\u83B7\u53D6\u300C${data2.methodType}\u300D${logger.red("\u7F3A\u5C11\u5FC5\u8981\u7684\u53C2\u6570")}: ${missingFieldsString}`);
+  if (!isValid) {
+    const missingFields = atLeastOne ? fields : fields.filter((f) => !checkField(f));
+    const missingStr = missingFields.map((f) => `'${logger.green(f.toString())}'`).join(", ");
+    throw new Error(`\u83B7\u53D6\u300C${data2.methodType}\u300D${logger.red("\u7F3A\u5C11\u53C2\u6570")}: ${missingStr}`);
   }
 };
 var amagi = class {
@@ -2045,4 +2066,4 @@ function Amagi(options) {
   return new amagi(options);
 }
 
-export { Amagi, BilibiliData, DouyinData, KuaishouAPI, KuaishouData, Networks, amagi, av2bv, bilibiliAPI, bv2av, index_default as default, douyinAPI, douyinSign, fetchBilibiliData, fetchDouyinData, fetchKuaishouData, getBilibiliData, getDouyinData, getKuaishouData, logger, qtparam, registerBilibiliRoutes, registerDouyinRoutes, registerKuaishouRoutes, startClient, validateData, wbi_sign };
+export { Amagi, BilibiliData, BilibiliValidateData, DouyinData, DouyinValidateData, KuaishouAPI, KuaishouData, KusiahouValidateData, Networks, amagi, av2bv, bilibiliAPI, bv2av, index_default as default, douyinAPI, douyinSign, fetchBilibiliData, fetchDouyinData, fetchKuaishouData, getBilibiliData, getDouyinData, getKuaishouData, logger, qtparam, registerBilibiliRoutes, registerDouyinRoutes, registerKuaishouRoutes, startClient, wbi_sign };