koishi-plugin-vr-fever 0.0.1 → 0.0.2

package/lib/commands/weibo.js

@@ -111,7 +111,7 @@ const registerWeiboCommand = (ctx, config, pollWeibo) => {
         if (message === "login") {
             try {
                 await (0, puppeteer_cookie_1.ensurePuppeteerBrowser)(ctx);
-                await (0, login_1.getQRcode)(ctx, argv.session);
+                await (0, login_1.getQRcode)(ctx, argv.session, config.isDebugMode);
             }
             catch (error) {
                 (0, send_msg_1.sendMsg)((0, puppeteer_cookie_1.formatPuppeteerError)(error), argv.session);

package/lib/index.d.ts

@@ -31,6 +31,7 @@ export interface Config {
     adminGroupID: string;
     waitMinutes: number;
     isTextMode: boolean;
+    isDebugMode: boolean;
 }
 export declare const Config: Schema<Config>;
 export declare function apply(ctx: Context, config: Config): Promise<void>;

package/lib/index.js

@@ -24,6 +24,9 @@ exports.Config = koishi_1.Schema.object({
     isTextMode: koishi_1.Schema.boolean()
         .default(false)
         .description("开启后以文本推送微博，关闭则以截图图片推送"),
+    isDebugMode: koishi_1.Schema.boolean()
+        .default(false)
+        .description("开启后保存调试截图（登录二维码、微博推送截图等）"),
 });
 async function apply(ctx, config) {
     ctx.model.extend("weibo_cookies", {

package/lib/service/login.d.ts

@@ -1,4 +1,4 @@
 import { Context, Session } from "koishi";
 /** 打开微博登录页，截图二维码并等待扫码完成 */
-export declare const getQRcode: (ctx: Context, session: Session) => Promise<boolean>;
+export declare const getQRcode: (ctx: Context, session: Session, isDebugMode?: boolean) => Promise<boolean>;
 export declare const checkLoginStatus: (ctx: Context) => Promise<boolean | null>;

package/lib/service/login.js

@@ -4,8 +4,9 @@ exports.checkLoginStatus = exports.getQRcode = void 0;
 const constants_1 = require("../util/constants");
 const puppeteer_cookie_1 = require("../util/puppeteer-cookie");
 const send_msg_1 = require("../util/send-msg");
+const timer_1 = require("../util/timer");
 /** 打开微博登录页，截图二维码并等待扫码完成 */
-const getQRcode = async (ctx, session) => {
+const getQRcode = async (ctx, session, isDebugMode = false) => {
     await (0, puppeteer_cookie_1.ensurePuppeteerBrowser)(ctx);
     const page = await ctx.puppeteer.page();
     if (!page) {
@@ -14,14 +15,16 @@ const getQRcode = async (ctx, session) => {
     }
     try {
         (0, send_msg_1.sendMsg)("开启网站中...", session);
-        await (0, puppeteer_cookie_1.navigatePage)(page, constants_1.CONSTANTS.WEIBO_PASSPORT_URL);
+        await (0, puppeteer_cookie_1.navigatePage)(page, constants_1.CONSTANTS.WEIBO_PASSPORT_URL, (0, timer_1.getWaitMs)(0.4));
         (0, send_msg_1.sendMsg)("正在切换到扫码登录...", session);
-        const qrResult = await (0, puppeteer_cookie_1.captureLoginQrFromPage)(page, 15000);
+        const qrResult = await (0, puppeteer_cookie_1.captureLoginQrFromPage)(page, (0, timer_1.getWaitMs)(0.4), isDebugMode);
         if (qrResult.debugDir) {
             (0, send_msg_1.sendMsg)(`调试截图已保存到: ${qrResult.debugDir}`, session);
         }
         if (!qrResult.detected || !qrResult.dataUrl) {
-            (0, send_msg_1.sendMsg)("未找到二维码，请查看调试目录中的 page.png / meta.json", session);
+            (0, send_msg_1.sendMsg)(isDebugMode
+                ? "未找到二维码，请查看调试目录中的 page.png / meta.json"
+                : "未找到二维码，请重试", session);
             return false;
         }
         const base64 = qrResult.dataUrl.replace(/^data:image\/\w+;base64,/, "");

package/lib/service/poll.js

@@ -79,14 +79,18 @@ const createPollWeibo = (ctx, config, sendMsgOnebot) => {
                     for (let i = 0; i < images.length; i++) {
                         const image = images[i];
                         const postCount = Math.min(constants_1.CONSTANTS.POSTS_PER_SCREENSHOT, entry.timeline.length - i * constants_1.CONSTANTS.POSTS_PER_SCREENSHOT);
-                        const saved = await (0, save_screenshot_1.saveScreenshotDebug)(image, {
-                            uid,
-                            name,
-                            chunkIndex: i,
-                            totalChunks: images.length,
-                            postCount,
-                        });
-                        ctx.logger.info(`截图已保存: ${saved.filePath} (${saved.sizeKB} KB, ${name} ${i + 1}/${images.length})`);
+                        const saved = config.isDebugMode
+                            ? await (0, save_screenshot_1.saveScreenshotDebug)(image, {
+                                uid,
+                                name,
+                                chunkIndex: i,
+                                totalChunks: images.length,
+                                postCount,
+                            })
+                            : null;
+                        if (saved) {
+                            ctx.logger.info(`截图已保存: ${saved.filePath} (${saved.sizeKB} KB, ${name} ${i + 1}/${images.length})`);
+                        }
                         await (0, send_msg_1.sendImg)(image, session);
                     }
                 }

package/lib/service/weibo-fetch.js

@@ -10,9 +10,17 @@ const getWeiboByUID = async (weiboUID, ctx, _session) => {
     if (!weiboHttp) {
         return null;
     }
-    const profile = await weiboHttp
-        .get(`/ajax/profile/info?uid=${weiboUID}&scene=profile`)
+    const profilePath = `/ajax/profile/info?uid=${weiboUID}&scene=profile`;
+    const fetchProfile = () => weiboHttp
+        .get(profilePath)
         .then((res) => res?.data || null);
+    let profile;
+    try {
+        profile = await fetchProfile();
+    }
+    catch {
+        profile = await fetchProfile();
+    }
     const timeline = await weiboHttp
         .get(`/ajax/statuses/mymblog?uid=${weiboUID}&page=1&feature=0`)
         .then((res) => res?.data || null);

package/lib/util/constants.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.REGEX = exports.CONSTANTS = void 0;
-const WEIBO_PASSPORT_URL = "https://passport.weibo.com/";
+const WEIBO_PASSPORT_URL = "https://passport.weibo.com/sso/signin?entry=account&source=sinassopage&url=https%3A%2F%2Fmy.sina.com.cn";
+// const WEIBO_PASSPORT_URL = "https://passport.weibo.com/";
 const WEB_TIMEOUT = 120000;
 const USER_AGENT = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36";
 const WEIBO_SAMPLE_UID = "8376019184";

package/lib/util/puppeteer-cookie.d.ts

@@ -21,20 +21,21 @@ export declare function waitForLogin(page: any, timeoutMs?: number): Promise<boo
 export declare function collectFullCookiesAfterLogin(page: any): Promise<AnyCookie[]>;
 export interface QrLoginOptions {
     timeoutMs?: number;
+    saveDebug?: boolean;
     onPageCreated?: (page: any) => void | Promise<void>;
     onQrCaptured?: (dataUrl: string | null) => void | Promise<void>;
 }
 /** 微博登录页默认可能是短信登录，需先点击 scan.png 图标所在父 span 切换到「扫码登录」 */
 export declare function clickWeiboQrLoginTab(page: any): Promise<boolean>;
 /** 导出登录页截图到 data/weibo-login-debug 便于排查白图问题 */
-export declare function saveLoginQrDebug(page: any, element: any | null, label: string): Promise<string>;
+export declare function saveLoginQrDebug(page: any, element: any | null, label: string, saveDebug?: boolean): Promise<string | null>;
 /** 切换到扫码登录并等待二维码出现 */
-export declare function captureLoginQrFromPage(page: any, timeoutMs?: number): Promise<{
+export declare function captureLoginQrFromPage(page: any, timeoutMs?: number, saveDebug?: boolean): Promise<{
     dataUrl: string | null;
     detected: boolean;
     debugDir?: string;
 }>;
-export declare function captureQrFromPage(page: any, timeoutMs?: number, debugLabel?: string): Promise<{
+export declare function captureQrFromPage(page: any, timeoutMs?: number, debugLabel?: string, saveDebug?: boolean): Promise<{
     dataUrl: string | null;
     detected: boolean;
     debugDir?: string;

package/lib/util/puppeteer-cookie.js

@@ -336,7 +336,9 @@ async function waitForQrElementReady(page) {
     });
 }
 /** 导出登录页截图到 data/weibo-login-debug 便于排查白图问题 */
-async function saveLoginQrDebug(page, element, label) {
+async function saveLoginQrDebug(page, element, label, saveDebug = false) {
+    if (!saveDebug)
+        return null;
     await promises_1.default.mkdir(LOGIN_QR_DEBUG_DIR, { recursive: true });
     const stamp = `${label}-${Date.now()}`;
     const meta = { label, savedAt: new Date().toISOString() };
@@ -417,26 +419,26 @@ async function saveLoginQrDebug(page, element, label) {
 }
 const bufferToDataUrl = (buffer) => `data:image/png;base64,${buffer.toString("base64")}`;
 /** 切换到扫码登录并等待二维码出现 */
-async function captureLoginQrFromPage(page, timeoutMs = 15000) {
+async function captureLoginQrFromPage(page, timeoutMs = 15000, saveDebug = false) {
     for (let i = 0; i < 3; i++) {
         await clickWeiboQrLoginTab(page);
         await wait(1000);
-        const qrResult = await captureQrFromPage(page, 5000, `attempt-${i + 1}`);
+        const qrResult = await captureQrFromPage(page, 5000, `attempt-${i + 1}`, saveDebug);
         if (qrResult.detected)
             return qrResult;
     }
-    return captureQrFromPage(page, timeoutMs, "final");
+    return captureQrFromPage(page, timeoutMs, "final", saveDebug);
 }
-async function captureQrFromPage(page, timeoutMs = 1500, debugLabel = "capture") {
+async function captureQrFromPage(page, timeoutMs = 1500, debugLabel = "capture", saveDebug = false) {
     let element = null;
     try {
         element = await waitForQrElement(page, timeoutMs);
         if (!element) {
-            const debugDir = await saveLoginQrDebug(page, null, `${debugLabel}-missing`);
-            return { dataUrl: null, detected: false, debugDir };
+            const debugDir = await saveLoginQrDebug(page, null, `${debugLabel}-missing`, saveDebug);
+            return { dataUrl: null, detected: false, debugDir: debugDir ?? undefined };
         }
         await waitForQrElementReady(page);
-        const debugDir = await saveLoginQrDebug(page, element, debugLabel);
+        const debugDir = await saveLoginQrDebug(page, element, debugLabel, saveDebug);
         const box = await element.boundingBox();
         if (box?.width && box?.height) {
             const clipBuffer = await page.screenshot({
@@ -450,20 +452,20 @@ async function captureQrFromPage(page, timeoutMs = 1500, debugLabel = "capture")
             return {
                 dataUrl: bufferToDataUrl(Buffer.from(clipBuffer)),
                 detected: true,
-                debugDir,
+                debugDir: debugDir ?? undefined,
             };
         }
         const elementBuffer = await element.screenshot();
         return {
             dataUrl: bufferToDataUrl(Buffer.from(elementBuffer)),
             detected: true,
-            debugDir,
+            debugDir: debugDir ?? undefined,
         };
     }
     catch (error) {
-        const debugDir = await saveLoginQrDebug(page, element, `${debugLabel}-error`).catch(() => LOGIN_QR_DEBUG_DIR);
+        const debugDir = await saveLoginQrDebug(page, element, `${debugLabel}-error`, saveDebug).catch(() => null);
         console.error("captureQrFromPage failed:", error, "debugDir:", debugDir);
-        return { dataUrl: null, detected: false, debugDir };
+        return { dataUrl: null, detected: false, debugDir: debugDir ?? undefined };
     }
 }
 async function loginWithQrViaService(ctx, opts = {}) {
@@ -477,7 +479,7 @@ async function loginWithQrViaService(ctx, opts = {}) {
     try {
         await opts.onPageCreated?.(page);
         await gotoAndWait(page, WEIBO_PASSPORT_URL, opts.timeoutMs || 120000);
-        const qrResult = await captureLoginQrFromPage(page, opts.timeoutMs ? Math.min(opts.timeoutMs, 15000) : 15000);
+        const qrResult = await captureLoginQrFromPage(page, opts.timeoutMs ? Math.min(opts.timeoutMs, 15000) : 15000, opts.saveDebug ?? false);
         if (!qrResult.detected) {
             // Take a screenshot for debugging
             const screenshot = await page.screenshot({ encoding: "base64" });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-vr-fever",
   "description": "自用改型",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [