koishi-plugin-weibo-post-monitor 1.0.1 → 1.0.3-beta.0

package/lib/index.js

@@ -177,7 +177,9 @@ 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 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",
@@ -200,29 +202,93 @@ async function getWeibo(config, callback, retry = false) {
         body += chunk;
       });
       res.on("end", async () => {
+        if (res.statusCode !== 200) {
+          const statusCode = res.statusCode;
+          const bodyPreview = body.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 randomUserAgent = getRandomUserAgent();
+              setUserAgent(randomUserAgent);
+              const newCookie = await fetchCookie();
+              setCookie(newCookie);
+              logger.info(`[getWeibo] Cookie更新成功，开始重试请求。weiboUID: ${weiboUID}`);
+              const retryResult = await getWeibo(config, callback, true);
+              resolve(retryResult);
+            } catch (retryError) {
+              const retryErrorMsg = `[getWeibo] 403错误重试失败。weiboUID: ${weiboUID}`;
+              logger.error(`${retryErrorMsg}, 原始错误: ${errorMsg}, 重试错误: ${retryError?.message || retryError}`);
+              reject({
+                error: new Error(`${retryErrorMsg}: ${retryError?.message || retryError}`),
+                body,
+                statusCode,
+                retryError,
+                errorType: "HTTP_403_RETRY_FAILED"
+              });
+            }
+          } else {
+            const finalErrorMsg = statusCode === 403 ? `[getWeibo] HTTP 403错误，已重试过或使用手动Cookie，无法自动重试。weiboUID: ${weiboUID}` : `[getWeibo] HTTP ${statusCode}错误。weiboUID: ${weiboUID}`;
+            logger.error(`${finalErrorMsg}, 响应预览: ${bodyPreview}`);
+            reject({
+              error: new Error(finalErrorMsg),
+              body,
+              statusCode,
+              errorType: statusCode === 403 ? "HTTP_403_NO_RETRY" : `HTTP_${statusCode}`
+            });
+          }
+          return;
+        }
         try {
           const returnData = JSON.parse(body);
           callback?.(returnData);
           resolve(returnData);
         } catch (error) {
+          const parseErrorMsg = `[getWeibo] JSON解析失败`;
+          logger.error(`${parseErrorMsg}, weiboUID: ${weiboUID}, 错误: ${error?.message || error}, 响应体预览: ${body.substring(0, 200)}`);
           if (!retry && !is_using_cookie) {
+            logger.warn(`[getWeibo] JSON解析失败，尝试更新Cookie后重试。weiboUID: ${weiboUID}`);
             try {
               const randomUserAgent = getRandomUserAgent();
               setUserAgent(randomUserAgent);
               const newCookie = await fetchCookie();
               setCookie(newCookie);
+              logger.info(`[getWeibo] Cookie更新成功，开始重试请求。weiboUID: ${weiboUID}`);
               const retryResult = await getWeibo(config, callback, true);
               resolve(retryResult);
             } catch (retryError) {
-              reject({ error, body, retryError });
+              const retryErrorMsg = `[getWeibo] JSON解析错误重试失败`;
+              logger.error(`${retryErrorMsg}, weiboUID: ${weiboUID}, 原始错误: ${error?.message || error}, 重试错误: ${retryError?.message || retryError}`);
+              reject({
+                error: new Error(`${retryErrorMsg}: ${retryError?.message || retryError}`),
+                body,
+                retryError,
+                originalError: error,
+                errorType: "JSON_PARSE_RETRY_FAILED"
+              });
             }
           } else {
-            reject({ error, body });
+            const finalErrorMsg = `[getWeibo] JSON解析失败，已重试过或使用手动Cookie，无法自动重试`;
+            logger.error(`${finalErrorMsg}, weiboUID: ${weiboUID}, 错误: ${error?.message || error}`);
+            reject({
+              error: new Error(`${finalErrorMsg}: ${error?.message || error}`),
+              body,
+              originalError: error,
+              errorType: "JSON_PARSE_NO_RETRY"
+            });
           }
         }
       });
       res.on("error", (error) => {
-        reject({ error, body });
+        const networkErrorMsg = `[getWeibo] 网络请求错误`;
+        logger.error(`${networkErrorMsg}, weiboUID: ${weiboUID}, 错误: ${error?.message || error}, 已接收数据: ${body.substring(0, 100)}`);
+        reject({
+          error: new Error(`${networkErrorMsg}: ${error?.message || error}`),
+          body,
+          originalError: error,
+          errorType: "NETWORK_ERROR"
+        });
       });
     });
   });
@@ -512,7 +578,9 @@ function apply(ctx, config) {
     waitMinutes: config.waitMinutes,
     is_using_cookie: config.is_using_cookie
   };
-  setCookie(config.manual_cookie);
+  if (config.is_using_cookie) {
+    setCookie(config.manual_cookie);
+  }
   setUserAgent(USER_AGENT_LIST[0]);
   ctx.setInterval(async () => {
     for (const singleConfig of config.sendINFO) {

package/package.json

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