koishi-plugin-weibo-post-monitor 1.0.1-beta.4 → 1.0.1-beta.7

package/lib/index.js

@@ -308,10 +308,38 @@ function checkWords(params, message) {
   return true;
 }
 __name(checkWords, "checkWords");
+function stripHtmlTags(html) {
+  if (!html) return "";
+  let text = html;
+  text = text.replace(/<br\s*\/?>/gi, "\n");
+  text = text.replace(/<span\s+class=['"]surl-text['"][^>]*>([^<]*)<\/span>/gi, "$1");
+  text = text.replace(/<img[^>]*>/gi, "");
+  let lastText = "";
+  let iterations = 0;
+  while (text !== lastText && iterations < 10) {
+    lastText = text;
+    text = text.replace(/<a[^>]*>([^<]*(?:<[^>]*>[^<]*<\/[^>]*>[^<]*)*)<\/a>/gi, "$1");
+    iterations++;
+  }
+  text = text.replace(/<[^>]+>/g, "");
+  text = text.replace(/&nbsp;/g, " ");
+  text = text.replace(/&lt;/g, "<");
+  text = text.replace(/&gt;/g, ">");
+  text = text.replace(/&quot;/g, '"');
+  text = text.replace(/&#39;/g, "'");
+  text = text.replace(/&apos;/g, "'");
+  text = text.replace(/&amp;/g, "&");
+  text = text.replace(/[ \t]+/g, " ");
+  text = text.replace(/\n[ \t]+/g, "\n");
+  text = text.replace(/[ \t]+\n/g, "\n");
+  text = text.replace(/\n{3,}/g, "\n\n");
+  text = text.trim();
+  return text;
+}
+__name(stripHtmlTags, "stripHtmlTags");
 
 // src/services/message.ts
 var import_axios2 = __toESM(require("axios"));
-var import_vm = require("vm");
 async function getWeiboAndSendMessageToGroup(ctx, params) {
   const [err, res] = await to(getWeibo(params));
   if (err) {
@@ -395,16 +423,15 @@ async function getMessage(params, wbPost) {
     tempMessage += screenName + " 发布了微博:\n{temp_text}\n" + picture || "";
   }
   const mid = wbPost?.mid || "";
-  const url = `https://m.weibo.cn/status/${mid}`;
+  const url = `https://m.weibo.cn/statuses/extend?id=${mid}`;
   const detailMessage = await getDetailMessage(url);
-  logger.info("detailMessage = " + detailMessage);
   if (detailMessage) {
     message_text = detailMessage;
   } else {
     message_text = wbPost?.text_raw;
   }
   const urlMessage = `
-微博链接：${url}`;
+微博链接：https://m.weibo.cn/status/${mid}`;
   if (!checkWords(params, message_text)) {
     return null;
   }
@@ -413,35 +440,6 @@ async function getMessage(params, wbPost) {
   return { post: wbpost, islast: true };
 }
 __name(getMessage, "getMessage");
-function stripHtmlTags(html) {
-  if (!html) return "";
-  let text = html;
-  text = text.replace(/<br\s*\/?>/gi, "\n");
-  text = text.replace(/<span\s+class=['"]surl-text['"][^>]*>([^<]*)<\/span>/gi, "$1");
-  text = text.replace(/<img[^>]*>/gi, "");
-  let lastText = "";
-  let iterations = 0;
-  while (text !== lastText && iterations < 10) {
-    lastText = text;
-    text = text.replace(/<a[^>]*>([^<]*(?:<[^>]*>[^<]*<\/[^>]*>[^<]*)*)<\/a>/gi, "$1");
-    iterations++;
-  }
-  text = text.replace(/<[^>]+>/g, "");
-  text = text.replace(/&nbsp;/g, " ");
-  text = text.replace(/&lt;/g, "<");
-  text = text.replace(/&gt;/g, ">");
-  text = text.replace(/&quot;/g, '"');
-  text = text.replace(/&#39;/g, "'");
-  text = text.replace(/&apos;/g, "'");
-  text = text.replace(/&amp;/g, "&");
-  text = text.replace(/[ \t]+/g, " ");
-  text = text.replace(/\n[ \t]+/g, "\n");
-  text = text.replace(/[ \t]+\n/g, "\n");
-  text = text.replace(/\n{3,}/g, "\n\n");
-  text = text.trim();
-  return text;
-}
-__name(stripHtmlTags, "stripHtmlTags");
 async function getDetailMessage(wb_url) {
   try {
     let auto_cookie2 = getCookie();
@@ -449,52 +447,59 @@ async function getDetailMessage(wb_url) {
     if (!auto_cookie2) {
       return null;
     }
+    let xsrfToken = "";
+    const cookieParts = auto_cookie2.split(";");
+    for (const part of cookieParts) {
+      const trimmed = part.trim();
+      if (trimmed.startsWith("XSRF-TOKEN=")) {
+        xsrfToken = trimmed.substring("XSRF-TOKEN=".length);
+        break;
+      }
+    }
+    const urlMatch = wb_url.match(/id=(\d+)/);
+    const weiboId = urlMatch ? urlMatch[1] : "";
     const headers = {
-      "accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7",
+      "accept": "application/json, text/plain, */*",
       "accept-language": "zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6",
       "cache-control": "no-cache",
+      "mweibo-pwa": "1",
+      "pragma": "no-cache",
+      "priority": "u=1, i",
+      "referer": weiboId ? `https://m.weibo.cn/status/${weiboId}` : "https://m.weibo.cn/",
+      "sec-ch-ua": '"Chromium";v="142", "Microsoft Edge";v="142", "Not_A Brand";v="99"',
+      "sec-ch-ua-mobile": "?0",
+      "sec-ch-ua-platform": '"Windows"',
+      "sec-fetch-dest": "empty",
+      "sec-fetch-mode": "cors",
+      "sec-fetch-site": "same-origin",
       "user-agent": now_user_agent2,
+      "x-requested-with": "XMLHttpRequest",
       "cookie": auto_cookie2
     };
+    if (xsrfToken) {
+      headers["x-xsrf-token"] = xsrfToken;
+    }
     const response = await import_axios2.default.get(wb_url, {
       headers,
-      responseType: "text",
+      responseType: "json",
       timeout: 1e4
     });
-    const html = response.data;
-    const startMarker = "var $render_data = ";
-    const startIndex = html.indexOf(startMarker);
-    if (startIndex === -1) {
+    const responseData = response.data;
+    logger.info("responseData = " + JSON.stringify(responseData));
+    if (!responseData || responseData.ok !== 1 || !responseData.data) {
+      logger.error("获取微博response返回报错: " + JSON.stringify(responseData));
       return null;
     }
-    const scriptEndIndex = html.indexOf("</script>", startIndex);
-    const nextVarIndex = html.indexOf("\n  var ", startIndex + startMarker.length);
-    let codeEndIndex = html.length;
-    if (scriptEndIndex !== -1 && scriptEndIndex < codeEndIndex) {
-      codeEndIndex = scriptEndIndex;
-    }
-    if (nextVarIndex !== -1 && nextVarIndex < codeEndIndex) {
-      codeEndIndex = nextVarIndex;
-    }
-    let code = html.substring(startIndex, codeEndIndex).trim();
-    if (!code.endsWith(";")) {
-      const lastSemicolon = code.lastIndexOf(";");
-      if (lastSemicolon !== -1) {
-        code = code.substring(0, lastSemicolon + 1);
-      }
-    }
-    const context = (0, import_vm.createContext)({});
-    (0, import_vm.runInContext)(code, context);
-    const renderData = context.$render_data;
-    logger.info("renderData = " + JSON.stringify(renderData));
-    if (!renderData || !renderData.status || !renderData.status.text) {
+    const longTextContent = responseData.data.longTextContent;
+    if (!longTextContent) {
+      logger.error("获取微博返回的longTextContent为空");
       return null;
     }
-    const htmlText = renderData.status.text;
-    const plainText = stripHtmlTags(htmlText);
+    logger.info("longTextContent = " + JSON.stringify(responseData));
+    const plainText = stripHtmlTags(longTextContent);
     return plainText;
   } catch (error) {
-    console.error("获取微博详情失败:", error);
+    logger.error("获取微博详情失败:", error);
     return null;
   }
 }

package/lib/services/utils.d.ts

@@ -1,3 +1,4 @@
 export declare function to<T, U = Error>(promise: Promise<T>, errorExt?: object): Promise<[U, undefined] | [null, T]>;
 export declare function parseDateString(dateString: string): Date;
 export declare function checkWords(params: any, message: string): boolean;
+export declare function stripHtmlTags(html: string): string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-weibo-post-monitor",
   "description": "微博帖子更新推送插件，用于获取指定微博用户的最新帖子推送到指定群聊，参考代码https://github.com/moehuhu/weibo-monitor",
-  "version": "1.0.1-beta.4",
+  "version": "1.0.1-beta.7",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [