koishi-plugin-weibo-post-monitor 1.0.2 → 1.0.3

package/lib/index.js

@@ -161,7 +161,7 @@ __name(fetchCookie, "fetchCookie");
 var import_koishi2 = require("koishi");
 
 // src/services/weibo.ts
-var import_https = __toESM(require("https"));
+var import_axios2 = __toESM(require("axios"));
 async function getWeibo(config, callback, retry = false) {
   const { weiboUID, is_using_cookie } = config;
   if (!weiboUID) {
@@ -177,8 +177,15 @@ async function getWeibo(config, callback, retry = false) {
     setCookie(auto_cookie2);
   }
   if (!auto_cookie2) {
-    throw new Error("Cookie config is null, please check the config");
+    const errorMsg = `[getWeibo] Cookie配置为空，请检查配置。weiboUID: ${weiboUID}, is_using_cookie: ${is_using_cookie}`;
+    logger.error(errorMsg);
+    throw new Error(errorMsg);
   }
+  const extractXSRFToken = /* @__PURE__ */ __name((cookie) => {
+    const match = cookie.match(/XSRF-TOKEN=([^;]+)/i);
+    return match ? match[1] : void 0;
+  }, "extractXSRFToken");
+  const xsrfToken = extractXSRFToken(auto_cookie2);
   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-language": "zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6",
@@ -187,45 +194,65 @@ async function getWeibo(config, callback, retry = false) {
     "referer": "https://www.weibo.com/u/" + weiboUID,
     "user-agent": now_user_agent2 || ""
   };
-  const options = {
-    hostname: "www.weibo.com",
-    path: "/ajax/statuses/mymblog?uid=" + weiboUID,
-    method: "GET",
-    headers
-  };
-  return new Promise((resolve, reject) => {
-    import_https.default.get(options, (res) => {
-      let body = "";
-      res.on("data", (chunk) => {
-        body += chunk;
-      });
-      res.on("end", async () => {
+  if (xsrfToken) {
+    headers["x-xsrf-token"] = xsrfToken;
+  }
+  const url = `https://www.weibo.com/ajax/statuses/mymblog?uid=${weiboUID}`;
+  try {
+    const response = await import_axios2.default.get(url, {
+      headers,
+      responseType: "json",
+      timeout: 1e4
+    });
+    const returnData = response.data;
+    callback?.(returnData);
+    return returnData;
+  } catch (error) {
+    if (error.response) {
+      const statusCode = error.response.status;
+      const bodyPreview = JSON.stringify(error.response.data).substring(0, 200);
+      const errorMsg = `[getWeibo] HTTP状态码错误: ${statusCode}`;
+      logger.error(`${errorMsg}, weiboUID: ${weiboUID}, 响应预览: ${bodyPreview}`);
+      if (statusCode === 403 && !retry && !is_using_cookie) {
+        logger.warn(`[getWeibo] 检测到403错误，尝试更新Cookie后重试。weiboUID: ${weiboUID}`);
         try {
-          const returnData = JSON.parse(body);
-          callback?.(returnData);
-          resolve(returnData);
-        } catch (error) {
-          if (!retry && !is_using_cookie) {
-            try {
-              const randomUserAgent = getRandomUserAgent();
-              setUserAgent(randomUserAgent);
-              const newCookie = await fetchCookie();
-              setCookie(newCookie);
-              const retryResult = await getWeibo(config, callback, true);
-              resolve(retryResult);
-            } catch (retryError) {
-              reject({ error, body, retryError });
-            }
-          } else {
-            reject({ error, body });
-          }
+          const randomUserAgent = getRandomUserAgent();
+          setUserAgent(randomUserAgent);
+          const newCookie = await fetchCookie();
+          setCookie(newCookie);
+          logger.info(`[getWeibo] Cookie更新成功，开始重试请求。weiboUID: ${weiboUID}`);
+          const retryResult = await getWeibo(config, callback, true);
+          return retryResult;
+        } catch (retryError) {
+          const retryErrorMsg = `[getWeibo] 403错误重试失败。weiboUID: ${weiboUID}`;
+          logger.error(`${retryErrorMsg}, 原始错误: ${errorMsg}, 重试错误: ${retryError?.message || retryError}`);
+          throw {
+            error: new Error(`${retryErrorMsg}: ${retryError?.message || retryError}`),
+            body: error.response.data,
+            statusCode,
+            retryError,
+            errorType: "HTTP_403_RETRY_FAILED"
+          };
         }
-      });
-      res.on("error", (error) => {
-        reject({ error, body });
-      });
-    });
-  });
+      } else {
+        const finalErrorMsg = statusCode === 403 ? `[getWeibo] HTTP 403错误，已重试过或使用手动Cookie，无法自动重试。weiboUID: ${weiboUID}` : `[getWeibo] HTTP ${statusCode}错误。weiboUID: ${weiboUID}`;
+        logger.error(`${finalErrorMsg}, 响应预览: ${bodyPreview}`);
+        throw {
+          error: new Error(finalErrorMsg),
+          body: error.response.data,
+          statusCode,
+          errorType: statusCode === 403 ? "HTTP_403_NO_RETRY" : `HTTP_${statusCode}`
+        };
+      }
+    }
+    const networkErrorMsg = `[getWeibo] 网络请求错误`;
+    logger.error(`${networkErrorMsg}, weiboUID: ${weiboUID}, 错误: ${error?.message || error}`);
+    throw {
+      error: new Error(`${networkErrorMsg}: ${error?.message || error}`),
+      originalError: error,
+      errorType: "NETWORK_ERROR"
+    };
+  }
 }
 __name(getWeibo, "getWeibo");
 
@@ -339,7 +366,7 @@ function stripHtmlTags(html) {
 __name(stripHtmlTags, "stripHtmlTags");
 
 // src/services/message.ts
-var import_axios2 = __toESM(require("axios"));
+var import_axios3 = __toESM(require("axios"));
 async function getWeiboAndSendMessageToGroup(ctx, params) {
   const [err, res] = await to(getWeibo(params));
   if (err) {
@@ -478,7 +505,7 @@ async function getDetailMessage(wb_url) {
     if (xsrfToken) {
       headers["x-xsrf-token"] = xsrfToken;
     }
-    const response = await import_axios2.default.get(wb_url, {
+    const response = await import_axios3.default.get(wb_url, {
       headers,
       responseType: "json",
       timeout: 1e4

package/package.json

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