dsh-shlr-bilitoolkit 0.1.2 → 0.1.3

package/dist/dsh.d.ts

@@ -18,6 +18,9 @@ export interface DshTool {
     description: string;
     parameters: Record<string, unknown>;
     handler: (args: any) => Promise<unknown>;
+    render?: (args: any, value: any) => any[];
+    presentationMeta?: (args: any, value: any) => unknown;
+    presentResult?: (args: any, result: any) => any;
 }
 export declare const TOOLS: DshTool[];
 export declare function apply(ctx: any): void;

package/dist/dsh.js

@@ -13,10 +13,16 @@ import { defineTool } from "@deepseek-ai/dsh-tools";
 import QRCode from "qrcode";
 import { BiliClient } from "./client.js";
 import { Collection, Page, PlayInfo, Subtitle, User, Video } from "./models.js";
-// 插件入口必须导出的字段（Cordis 据此识别并注入 tools 服务）
+import { QR_STATUS_EXPIRED, QR_STATUS_SCANNED, QR_STATUS_SUCCESS, } from "./apis/auth.js";
+// 插件入口必须导出的字段（Cordis 据此识别并注入相应服务）
 export const name = "bili-toolkit";
-export const inject = ["tools"];
+// tools：注册工具；attachments：把二维码等图片登记成可在 UI 渲染的持久附件
+export const inject = ["tools", "attachments"];
 let cached = null;
+// 附件服务（apply 时从 ctx 捕获）；缺失时二维码退化为文本
+let attachmentStore = null;
+// 最近一次生成、等待扫码确认的二维码 key（登录完成链路用）
+let pendingQrKey = null;
 async function getClient() {
     if (!cached) {
         cached = new BiliClient({
@@ -406,27 +412,127 @@ export const TOOLS = [
     // ---- 登录状态 ----
     {
         id: "bili_login_status",
-        description: "查询当前是否已登录 B 站（返回用户名）。未登录时先让用户执行 `npm run login` 扫码，或调用 bili_gen_qr。",
+        description: "查询当前是否已登录 B 站（返回用户名）。若此前调用过 bili_gen_qr，本工具会顺带轮询扫码状态：用户扫码并在手机确认后，这里返回登录成功并自动保存 Cookie。",
         parameters: { type: "object", properties: {} },
         handler: async () => {
             const c = await getClient();
             const account = await c.getAccount();
+            if (account) {
+                return { isLoggedIn: true, username: account.uname, mid: account.mid };
+            }
+            // 未登录：若有等待确认的扫码，轮询一次
+            if (pendingQrKey) {
+                const [code, message] = await c.auth.poll(pendingQrKey);
+                if (code === QR_STATUS_SUCCESS) {
+                    await c.saveCookies();
+                    pendingQrKey = null;
+                    const acc = await c.getAccount();
+                    return {
+                        isLoggedIn: true,
+                        justLoggedIn: true,
+                        username: acc?.uname ?? null,
+                        mid: acc?.mid ?? null,
+                    };
+                }
+                if (code === QR_STATUS_EXPIRED) {
+                    pendingQrKey = null;
+                    return {
+                        isLoggedIn: false,
+                        qrStatus: "expired",
+                        hint: "二维码已过期，请重新调用 bili_gen_qr 生成新的二维码。",
+                    };
+                }
+                return {
+                    isLoggedIn: false,
+                    qrStatus: code === QR_STATUS_SCANNED ? "scanned" : "waiting",
+                    hint: code === QR_STATUS_SCANNED
+                        ? "已扫码，请在手机上点击「确认登录」，然后再调用一次 bili_login_status。"
+                        : "请用「哔哩哔哩」App 扫描刚生成的二维码，确认后再调用 bili_login_status。",
+                    message,
+                };
+            }
             return {
-                isLoggedIn: !!account,
-                username: account?.uname ?? null,
-                mid: account?.mid ?? null,
+                isLoggedIn: false,
+                username: null,
+                mid: null,
+                hint: "未登录，请先调用 bili_gen_qr 生成登录二维码。",
             };
         },
     },
     {
         id: "bili_gen_qr",
-        description: "生成 B 站扫码登录二维码。返回二维码内容链接 url、轮询用的 qrcodeKey，以及可直接在终端 / 对话里展示的 ascii 二维码（用「哔哩哔哩」App 扫码确认后，再调用 bili_login_status 查看登录态）。",
+        description: "生成 B 站扫码登录二维码，并在对话中以「图片」形式展示（用「哔哩哔哩」App 扫码）。返回二维码内容链接 url 与轮询用的 qrcodeKey。用户扫码确认后，调用 bili_login_status 完成登录并保存 Cookie。",
         parameters: { type: "object", properties: {} },
         handler: async () => {
             const c = await getClient();
             const [url, key] = await c.auth.generate();
-            const ascii = await QRCode.toString(url, { type: "utf8" });
-            return { url, qrcodeKey: key, ascii };
+            pendingQrKey = key;
+            // 生成 PNG 二维码并登记为附件，供 UI 以图片渲染
+            let qrImage = null;
+            try {
+                const png = await QRCode.toBuffer(url, {
+                    type: "png",
+                    errorCorrectionLevel: "M",
+                    margin: 2,
+                    width: 320,
+                });
+                if (attachmentStore?.saveImage) {
+                    qrImage = await attachmentStore.saveImage({
+                        data: new Uint8Array(png),
+                        mediaType: "image/png",
+                        name: "bili-login-qr.png",
+                    });
+                }
+            }
+            catch {
+                qrImage = null; // 附件不可用时退化为下方 ascii
+            }
+            // ascii 仅作为附件不可用时的兜底
+            let ascii = null;
+            if (!qrImage) {
+                try {
+                    ascii = await QRCode.toString(url, { type: "utf8" });
+                }
+                catch {
+                    ascii = null;
+                }
+            }
+            return { url, qrcodeKey: key, qrImage, ascii };
+        },
+        // 面向模型的文本：不塞图片 / ascii，给指引即可
+        render: (_args, value) => [
+            {
+                type: "text",
+                text: "已生成 B 站登录二维码（已在界面上以图片展示）。请让用户用「哔哩哔哩」App 扫码，" +
+                    "并在手机上确认登录；用户确认后，调用 bili_login_status 查询登录态并保存 Cookie。" +
+                    `qrcodeKey=${value?.qrcodeKey ?? ""}`,
+            },
+        ],
+        // 把图片引用 / ascii / url 透传给 presentResult（仅 UI 用）
+        presentationMeta: (_args, value) => ({
+            qrImage: value?.qrImage ?? null,
+            ascii: value?.ascii ?? null,
+            url: value?.url ?? null,
+        }),
+        // UI 呈现：优先渲染图片二维码；无附件时退化为 ascii 代码块 + 链接
+        presentResult: (_args, result) => {
+            const meta = (result?.meta ?? {});
+            const content = [];
+            if (meta.qrImage) {
+                content.push({ type: "image", attachment: meta.qrImage });
+                content.push({
+                    type: "text",
+                    text: "请用「哔哩哔哩」App 扫描上方二维码，并在手机上确认登录。",
+                });
+            }
+            else if (meta.ascii) {
+                content.push({ type: "text", text: "```\n" + meta.ascii + "\n```" });
+                content.push({ type: "text", text: `二维码链接：${meta.url ?? ""}` });
+            }
+            else {
+                content.push({ type: "text", text: `二维码链接：${meta.url ?? ""}` });
+            }
+            return { card: "generic", title: "扫码登录 B 站", content };
         },
     },
     // ---- 缓存维护 ----
@@ -442,22 +548,31 @@ export const TOOLS = [
     },
 ];
 export function apply(ctx) {
+    // 捕获附件服务，供 bili_gen_qr 把二维码登记成可在 UI 渲染的图片
+    attachmentStore = ctx?.attachments ?? null;
     for (const tool of TOOLS) {
-        // 官方路径：ctx.tools.register(defineTool({...}))
-        const def = defineTool({
+        const output = {
+            schema: { type: "object", additionalProperties: true },
+            render: tool.render ??
+                ((_args, value) => [{ type: "text", text: textOf(value) }]),
+        };
+        if (tool.presentationMeta) {
+            output.presentationMeta = tool.presentationMeta;
+        }
+        const options = {
             name: tool.id,
             description: tool.description,
             parameters: toDshParameters(tool.parameters),
-            output: {
-                schema: { type: "object", additionalProperties: true },
-                render: (_args, value) => [
-                    { type: "text", text: textOf(value) },
-                ],
-            },
+            output,
             async execute(args) {
                 return await tool.handler(args);
             },
-        });
+        };
+        if (tool.presentResult) {
+            options.presentResult = tool.presentResult;
+        }
+        // 官方路径：ctx.tools.register(defineTool({...}))
+        const def = defineTool(options);
         if (ctx?.tools?.register) {
             ctx.tools.register(def);
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-shlr-bilitoolkit",
-  "version": "0.1.2",
-  "description": "B 站（哔哩哔哩）接口工具箱 dsh 插件：视频 / 搜索 / 空间 / 专栏 / 动态 / 评论 / 关注 / 消息中心读取，以及点赞、收藏、投币、关注、评论、私信等写操作。",
+  "version": "0.1.3",
+  "description": "深海猎人专用B站接口工具箱 dsh 插件。",
   "type": "module",
   "main": "dist/dsh.js",
   "types": "dist/dsh.d.ts",