@ikenxuan/amagi 4.5.0 → 4.5.2

package/dist/default/esm/v5.mjs

@@ -337,7 +337,20 @@ var BiLiBiLiAPI = class {
   }
   /** 评论区类型，type参数详见 [评论区类型代码](https://github.com/SocialSisterYi/bilibili-API-collect/blob/master/docs/comment/readme.md#评论区类型代码) */
   \u8BC4\u8BBA\u533A\u660E\u7EC6(data2) {
-    return `https://api.bilibili.com/x/v2/reply?sort=1&ps=${data2.number ?? 20}&type=${data2.type}&oid=${data2.oid}&pn=${data2.pn}`;
+    const params = new URLSearchParams({
+      oid: data2.oid.toString(),
+      type: data2.type.toString(),
+      mode: (data2.mode ?? 3).toString(),
+      plat: "1",
+      seek_rpid: "",
+      web_location: "1315875"
+    });
+    if (data2.pagination_str) {
+      params.append("pagination_str", JSON.stringify({ offset: data2.pagination_str }));
+    } else {
+      params.append("pagination_str", JSON.stringify({ offset: "" }));
+    }
+    return `https://api.bilibili.com/x/v2/reply/wbi/main?${params.toString()}`;
   }
   \u8BC4\u8BBA\u533A\u72B6\u6001(data2) {
     return `https://api.bilibili.com/x/v2/reply/subject/description?type=${data2.type}&oid=${data2.oid}`;
@@ -393,6 +406,112 @@ var kuaishouAPIErrorCode = /* @__PURE__ */ ((kuaishouAPIErrorCode2) => {
   kuaishouAPIErrorCode2["UNKNOWN"] = "UNKNOWN_ERROR" /* UNKNOWN */;
   return kuaishouAPIErrorCode2;
 })(kuaishouAPIErrorCode || {});
+var 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
+];
+var getMixinKey = (orig) => mixinKeyEncTab.map((n) => orig[n]).join("").slice(0, 32);
+var encWbi = (params, img_key, sub_key) => {
+  const mixin_key = getMixinKey(img_key + sub_key);
+  const curr_time = Math.round(Date.now() / 1e3);
+  const chr_filter = /[!'()*]/g;
+  Object.assign(params, { wts: curr_time });
+  const query = Object.keys(params).sort().map((key) => {
+    const value = params[key].toString().replace(chr_filter, "");
+    return `${encodeURIComponent(key)}=${encodeURIComponent(value)}`;
+  }).join("&");
+  const wbi_sign2 = crypto.createHash("md5").update(query + mixin_key).digest("hex");
+  return `&wts=${curr_time}&w_rid=${wbi_sign2}`;
+};
+var getWbiKeys = async (cookie) => {
+  const res = await axios("https://api.bilibili.com/x/web-interface/nav", {
+    headers: {
+      Cookie: cookie
+    }
+  });
+  const response = res.data;
+  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("."))
+  };
+};
+var wbi_sign = async (BASEURL, cookie) => {
+  const web_keys = await getWbiKeys(cookie);
+  const url = new URL(BASEURL);
+  const params = {};
+  for (const [key, value] of url.searchParams.entries()) {
+    params[key] = value;
+  }
+  const query = encWbi(params, web_keys.img_key, web_keys.sub_key);
+  return query;
+};
 
 // src/platform/bilibili/getdata.ts
 var defheaders = {
@@ -411,6 +530,7 @@ var defheaders = {
   referer: "https://www.bilibili.com/"
 };
 var fetchBilibili = async (data2, cookie) => {
+  var _a, _b, _c;
   const headers2 = {
     ...defheaders,
     cookie: cookie ? cookie.replace(/\s+/g, "") : ""
@@ -434,67 +554,65 @@ var fetchBilibili = async (data2, cookie) => {
       return DATA;
     }
     case "\u8BC4\u8BBA\u6570\u636E": {
-      let { oid, number, pn, type } = data2;
+      let { oid, number, type, mode, pagination_str, plat, seek_rpid, web_location } = data2;
       let fetchedComments = [];
-      pn = pn ?? 1;
       const maxRequestCount = 100;
-      const commentGrowthStabilized = 5;
-      let lastFetchedCount = 0;
-      let stabilizedCount = 0;
       let requestCount = 0;
       let tmpresp;
-      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({
+      let nextPaginationStr = pagination_str;
+      let isEnd = false;
+      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
+        };
+      }
+      while (fetchedComments.length < Number(number ?? 20) && requestCount < maxRequestCount && !isEnd) {
+        const baseUrl = 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
+          mode: mode ?? 3,
+          pagination_str: nextPaginationStr,
+          plat: plat ?? 1,
+          seek_rpid,
+          web_location: web_location ?? "1315875"
         });
-        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 wbiSignQuery = await wbi_sign(baseUrl, headers2.cookie);
+        const finalUrl = baseUrl + wbiSignQuery;
         const response = await GlobalGetData({
-          url,
+          url: finalUrl,
           headers: headers2,
           ...data2
         });
         tmpresp = response;
-        const currentCount = response.data.replies ? response.data.replies.length : 0;
-        fetchedComments.push(...response.data.replies || []);
-        if (currentCount === lastFetchedCount) {
-          stabilizedCount++;
+        const currentComments = ((_a = response.data) == null ? void 0 : _a.replies) || [];
+        fetchedComments.push(...currentComments);
+        if ((_b = response.data) == null ? void 0 : _b.cursor) {
+          nextPaginationStr = (_c = response.data.cursor.pagination_reply) == null ? void 0 : _c.next_offset;
+          isEnd = response.data.cursor.is_end;
         } else {
-          stabilizedCount = 0;
+          isEnd = true;
         }
-        lastFetchedCount = currentCount;
-        if (stabilizedCount >= commentGrowthStabilized || requestCount >= maxRequestCount) {
+        requestCount++;
+        if (isEnd || currentComments.length === 0 || !nextPaginationStr) {
+          logger.info("\u5DF2\u5230\u8FBE\u8BC4\u8BBA\u672B\u5C3E\u6216\u65E0\u66F4\u591A\u8BC4\u8BBA");
           break;
         }
-        pn++;
-        requestCount++;
       }
       const finalResponse = {
         ...tmpresp,
         data: {
           ...tmpresp.data,
-          // 去重
-          replies: Array.from(new Map(fetchedComments.map((item) => [item.rpid, item])).values()).slice(0, Number(data2.number))
+          // 去重并限制数量
+          replies: Array.from(new Map(fetchedComments.map((item) => [item.rpid, item])).values()).slice(0, Number(data2.number || 20))
         }
       };
       return finalResponse;
@@ -751,112 +869,6 @@ var bilibiliErrorCodeMap = {
   "-799": "\u8BF7\u6C42\u8FC7\u4E8E\u9891\u7E41\uFF0C\u8BF7\u7A0D\u540E\u518D\u8BD5",
   "-8888": "\u5BF9\u4E0D\u8D77\uFF0C\u670D\u52A1\u5668\u5F00\u5C0F\u5DEE\u4E86~ (\u0CA5\uFE4F\u0CA5)"
 };
-var 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
-];
-var getMixinKey = (orig) => mixinKeyEncTab.map((n) => orig[n]).join("").slice(0, 32);
-var encWbi = (params, img_key, sub_key) => {
-  const mixin_key = getMixinKey(img_key + sub_key);
-  const curr_time = Math.round(Date.now() / 1e3);
-  const chr_filter = /[!'()*]/g;
-  Object.assign(params, { wts: curr_time });
-  const query = Object.keys(params).sort().map((key) => {
-    const value = params[key].toString().replace(chr_filter, "");
-    return `${encodeURIComponent(key)}=${encodeURIComponent(value)}`;
-  }).join("&");
-  const wbi_sign2 = crypto.createHash("md5").update(query + mixin_key).digest("hex");
-  return `&wts=${curr_time}&w_rid=${wbi_sign2}`;
-};
-var getWbiKeys = async (cookie) => {
-  const res = await axios("https://api.bilibili.com/x/web-interface/nav", {
-    headers: {
-      Cookie: cookie
-    }
-  });
-  const response = res.data;
-  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("."))
-  };
-};
-var wbi_sign = async (BASEURL, cookie) => {
-  const web_keys = await getWbiKeys(cookie);
-  const url = new URL(BASEURL);
-  const params = {};
-  for (const [key, value] of url.searchParams.entries()) {
-    params[key] = value;
-  }
-  const query = encWbi(params, web_keys.img_key, web_keys.sub_key);
-  return query;
-};
 
 // src/platform/douyin/sign/a_bogus.ts
 var SM3 = class {
@@ -1805,11 +1817,6 @@ var DouyinMusicParamsSchema = z.object({
   methodType: z.literal("\u97F3\u4E50\u6570\u636E"),
   music_id: z.string({ required_error: "\u97F3\u4E50ID\u4E0D\u80FD\u4E3A\u7A7A" }).min(1, "\u97F3\u4E50ID\u4E0D\u80FD\u4E3A\u7A7A")
 });
-var DouyinLiveRoomParamsSchema = z.object({
-  methodType: z.literal("\u76F4\u64AD\u95F4\u4FE1\u606F\u6570\u636E"),
-  room_id: z.string({ required_error: "\u76F4\u64AD\u95F4ID\u4E0D\u80FD\u4E3A\u7A7A" }).min(1, "\u76F4\u64AD\u95F4ID\u4E0D\u80FD\u4E3A\u7A7A"),
-  web_rid: z.string({ required_error: "\u76F4\u64AD\u95F4\u771F\u5B9E\u623F\u95F4\u53F7\u4E0D\u80FD\u4E3A\u7A7A" }).min(1, "\u76F4\u64AD\u95F4\u771F\u5B9E\u623F\u95F4\u53F7\u4E0D\u80FD\u4E3A\u7A7A")
-});
 var DouyinQrcodeParamsSchema = z.object({
   methodType: z.literal("\u7533\u8BF7\u4E8C\u7EF4\u7801\u6570\u636E"),
   verify_fp: z.string({ required_error: "fp\u6307\u7EB9\u4E0D\u80FD\u4E3A\u7A7A" }).min(1, "fp\u6307\u7EB9\u4E0D\u80FD\u4E3A\u7A7A")
@@ -1831,7 +1838,7 @@ var DouyinValidationSchemas2 = {
   "\u70ED\u70B9\u8BCD\u6570\u636E": DouyinSearchParamsSchema,
   "\u641C\u7D22\u6570\u636E": DouyinSearchParamsSchema,
   "\u97F3\u4E50\u6570\u636E": DouyinMusicParamsSchema,
-  "\u76F4\u64AD\u95F4\u4FE1\u606F\u6570\u636E": DouyinLiveRoomParamsSchema,
+  "\u76F4\u64AD\u95F4\u4FE1\u606F\u6570\u636E": DouyinUserParamsSchema,
   "\u7533\u8BF7\u4E8C\u7EF4\u7801\u6570\u636E": DouyinQrcodeParamsSchema,
   "Emoji\u6570\u636E": DouyinEmojiListParamsSchema,
   "\u52A8\u6001\u8868\u60C5\u6570\u636E": DouyinEmojiProParamsSchema,
@@ -1848,7 +1855,7 @@ var BilibiliVideoDownloadParamsSchema = z.object({
 });
 var BilibiliCommentParamsSchema = z.object({
   methodType: z.literal("\u8BC4\u8BBA\u6570\u636E"),
-  oid: smartNumber("OID\u4E0D\u80FD\u4E3A\u7A7A", 1, true),
+  oid: z.string({ required_error: "OID\u4E0D\u80FD\u4E3A\u7A7A" }).min(1, "OID\u4E0D\u80FD\u4E3A\u7A7A"),
   type: smartNumber("\u8BC4\u8BBA\u7C7B\u578B\u4E0D\u80FD\u4E3A\u7A7A", 1, true).refine(
     (val) => [1, 2, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 33].includes(val),
     { message: "\u65E0\u6548\u7684\u8BC4\u8BBA\u533A\u7C7B\u578B" }
@@ -3010,4 +3017,4 @@ var v5_default = amagi;
  * GPL-3.0 Licensed
  */
 
-export { ApiError, BilibiliAv2BvParamsSchema, BilibiliBangumiInfoParamsSchema, BilibiliBangumiStreamParamsSchema, BilibiliBv2AvParamsSchema, BilibiliCommentParamsSchema, BilibiliDynamicParamsSchema, BilibiliEmojiParamsSchema, BilibiliLiveParamsSchema, BilibiliLoginParamsSchema, BilibiliQrcodeParamsSchema, BilibiliQrcodeStatusParamsSchema, BilibiliUserParamsSchema, BilibiliValidationSchemas2 as BilibiliValidationSchemas, BilibiliVideoDownloadParamsSchema, BilibiliVideoParamsSchema, CreateApp as Client, CreateApp, DouyinCommentParamsSchema, DouyinCommentReplyParamsSchema, DouyinEmojiListParamsSchema, DouyinEmojiProParamsSchema, DouyinLiveRoomParamsSchema, DouyinMusicParamsSchema, DouyinQrcodeParamsSchema, DouyinSearchParamsSchema, DouyinUserParamsSchema, DouyinValidationSchemas2 as DouyinValidationSchemas, DouyinWorkParamsSchema, KuaishouCommentParamsSchema, KuaishouEmojiParamsSchema, KuaishouValidationSchemas2 as KuaishouValidationSchemas, KuaishouVideoParamsSchema, Networks, ValidationError, amagiClient, av2bv, bilibili, bilibiliApiUrls, bilibiliErrorCodeMap, bilibiliUtils, bv2av, createAmagiClient, createBilibiliRoutes, createBoundBilibiliApi, createBoundDouyinApi, createBoundKuaishouApi, createDouyinRoutes, createErrorResponse, createKuaishouRoutes, createSuccessResponse, v5_default as default, douyin, douyinApiUrls, douyinSign, douyinUtils, getBilibiliData, getDouyinData, getKuaishouData, handleError, httpLogger, kuaishou, kuaishouApiUrls, kuaishouUtils, logMiddleware, logger, qtparam, validateBilibiliParams, validateDouyinParams, validateKuaishouParams, wbi_sign };
+export { ApiError, BilibiliAv2BvParamsSchema, BilibiliBangumiInfoParamsSchema, BilibiliBangumiStreamParamsSchema, BilibiliBv2AvParamsSchema, BilibiliCommentParamsSchema, BilibiliDynamicParamsSchema, BilibiliEmojiParamsSchema, BilibiliLiveParamsSchema, BilibiliLoginParamsSchema, BilibiliQrcodeParamsSchema, BilibiliQrcodeStatusParamsSchema, BilibiliUserParamsSchema, BilibiliValidationSchemas2 as BilibiliValidationSchemas, BilibiliVideoDownloadParamsSchema, BilibiliVideoParamsSchema, CreateApp as Client, CreateApp, DouyinCommentParamsSchema, DouyinCommentReplyParamsSchema, DouyinEmojiListParamsSchema, DouyinEmojiProParamsSchema, DouyinMusicParamsSchema, DouyinQrcodeParamsSchema, DouyinSearchParamsSchema, DouyinUserParamsSchema, DouyinValidationSchemas2 as DouyinValidationSchemas, DouyinWorkParamsSchema, KuaishouCommentParamsSchema, KuaishouEmojiParamsSchema, KuaishouValidationSchemas2 as KuaishouValidationSchemas, KuaishouVideoParamsSchema, Networks, ValidationError, amagiClient, av2bv, bilibili, bilibiliApiUrls, bilibiliErrorCodeMap, bilibiliUtils, bv2av, createAmagiClient, createBilibiliRoutes, createBoundBilibiliApi, createBoundDouyinApi, createBoundKuaishouApi, createDouyinRoutes, createErrorResponse, createKuaishouRoutes, createSuccessResponse, v5_default as default, douyin, douyinApiUrls, douyinSign, douyinUtils, getBilibiliData, getDouyinData, getKuaishouData, handleError, httpLogger, kuaishou, kuaishouApiUrls, kuaishouUtils, logMiddleware, logger, qtparam, validateBilibiliParams, validateDouyinParams, validateKuaishouParams, wbi_sign };