@karinjs/adapter-qqbot 3.0.0 → 3.0.1

package/dist/apps/cleanup.js

@@ -1,4 +1,4 @@
-import { t as getMessageStore } from "../message-BTGL3TSn.js";
+import { t as getMessageStore } from "../message-CVJVFAGR.js";
 import karin from "node-karin";
 
 //#region src/apps/cleanup.ts

package/dist/apps/login.d.ts

@@ -1,18 +1,4 @@
 //#region src/apps/login.d.ts
-/**
- * #QQ登录 指令
- *
- * 仅主人可用。匹配 `#QQ登录` 或 `#qqlogin`（大小写均可）。
- * 必须带 `#` 前缀。
- *
- * 流程：
- * 1. 立即回复"开始扫码"
- * 2. 触发扫码授权流程
- * 3. 每次生成新二维码 → 把 PNG 图片回复给触发者
- * 4. 授权成功 → 回复结果，watch 回调自动初始化 bot
- *
- * ⚠ 注意：扫码授权会刷新该 appId 的 secret，旧 secret 立即失效
- */
-declare const qqLogin: import("node-karin").Command<keyof import("node-karin").MessageEventMap>;
+declare const QQBotLogin: import("node-karin").Command<keyof import("node-karin").MessageEventMap>;
 //#endregion
-export { qqLogin };
+export { QQBotLogin };

package/dist/apps/login.js

@@ -1,106 +1,159 @@
-import { m as log } from "../config-BUuU6FnQ.js";
-import { n as runQrOnboard } from "../onboard-vIEoe9dB.js";
+import { i as getDefaultConfig, n as config } from "../config-D1_LqrcJ.js";
 import karin, { segment } from "node-karin";
+import qrcode from "qrcode";
+import axios from "node-karin/axios";
+import crypto from "node:crypto";
 
-//#region src/apps/login.ts
+//#region src/core/qrcode/session.ts
+const BASEURL = "q.qq.com";
+const headers = {
+	"Content-Type": "application/json",
+	Accept: "application/json"
+};
+/** 生成随机密钥 */
+const RandomKey = () => {
+	return crypto.randomBytes(32).toString("base64");
+};
 /**
-* #QQ登录 指令
-*
-* 仅主人可用。匹配 `#QQ登录` 或 `#qqlogin`（大小写均可）。
-* 必须带 `#` 前缀。
-*
-* 流程：
-* 1. 立即回复"开始扫码"
-* 2. 触发扫码授权流程
-* 3. 每次生成新二维码 → 把 PNG 图片回复给触发者
-* 4. 授权成功 → 回复结果，watch 回调自动初始化 bot
-*
-* ⚠ 注意：扫码授权会刷新该 appId 的 secret，旧 secret 立即失效
+* 解密密钥
+* @param encryptedBase64
+* @param keyBase64
+* @returns
 */
-/** 互斥锁：避免并发扫码 */
-let busy = false;
+const decryptSecret = (encryptedBase64, keyBase64) => {
+	const key = Buffer.from(keyBase64, "base64");
+	const data = Buffer.from(encryptedBase64, "base64");
+	const IV = data.subarray(0, 12);
+	const authtag = data.subarray(data.length - 16);
+	const ciphertext = data.subarray(12, data.length - 16);
+	const decipher = crypto.createDecipheriv("aes-256-gcm", key, IV);
+	decipher.setAuthTag(authtag);
+	return Buffer.concat([decipher.update(ciphertext), decipher.final()]).toString("utf8");
+};
 /**
-* 判断触发 #QQ登录 的上游是否为 Karin 控制台适配器。
-* Console 适配器无法直接在聊天窗口展示二维码图片，因此需要额外打印终端二维码。
+* 创建绑定任务
+* @param timeout 超时时间
 */
-const isConsoleAdapter = (bot) => {
-	const selfId = String(bot.selfId || "").toLowerCase();
-	const name = String(bot.adapter.name || "").toLowerCase();
-	const protocol = String(bot.adapter.protocol || "").toLowerCase();
-	return selfId === "console" || name === "console" || name.endsWith("/console") || protocol === "console";
+const createBindTask = async (timeout = 1e4) => {
+	const url = `https://${BASEURL}/lite/create_bind_task`;
+	const key = RandomKey();
+	const { data } = await axios.post(url, { key }, {
+		headers,
+		timeout
+	});
+	if (data.retcode !== 0) throw new Error(data.msg ?? "创建绑定任务失败");
+	if (!data.data?.task_id) throw new Error("创建绑定任务失败: task_id 缺失");
+	return {
+		taskId: data.data.task_id,
+		aesKey: key
+	};
 };
 /**
-* 记录一次回复返回的消息 ID，便于扫码流程结束后清理二维码、链接等临时信息。
-* @param result 回复返回值。
-* @param messageIds 已登记的消息 ID 集合。
+* 查询绑定结果
+* @param taskId 任务id
+* @param timeout 超时时间
 */
-const trackReply = (result, messageIds) => {
-	const messageId = result?.messageId;
-	if (messageId && !messageIds.includes(messageId)) messageIds.push(messageId);
+const checkBindResult = async (taskId, timeout = 1e4) => {
+	const url = `https://${BASEURL}/lite/poll_bind_result`;
+	const { data } = await axios.post(url, { task_id: taskId }, {
+		headers,
+		timeout
+	});
+	if (data.retcode !== 0) throw new Error(data.msg ?? "查询绑定结果失败");
+	return {
+		status: data.data?.status ?? 0,
+		appId: String(data.data?.bot_appid ?? ""),
+		encryptedSecret: data.data?.bot_encrypt_secret ?? "",
+		userOpenid: data.data?.user_openid ?? void 0
+	};
 };
+/** 构建连接URL */
+const buildConnectUrl = (taskId) => `https://${BASEURL}/qqbot/openclaw/connect.html?task_id=${encodeURIComponent(taskId)}&source=karin&_wv=2`;
+
+//#endregion
+//#region src/core/qrcode/qr.ts
+const WaitingMS = 2e3;
 /**
-* 撤回扫码流程中发出的临时消息。
-* @param bot 触发登录的机器人实例。
-* @param contact 回复所在会话。
-* @param messageIds 需要撤回的消息 ID。
+* 轮询绑定结果
+* @param taskId 任务ID
+* @param key 解密密钥
+* @returns QQBot 的appid与secret
 */
-const recallTrackedReplies = async (bot, contact, messageIds) => {
-	for (const messageId of messageIds) try {
-		await bot.recallMsg(contact, messageId);
-	} catch (err) {
-		log("warn", `[扫码登录] 撤回临时消息失败: ${messageId}`, err);
+const PollBindResult = async (taskId, key) => {
+	while (true) {
+		let data;
+		try {
+			data = await checkBindResult(taskId);
+		} catch {
+			await new Promise((resolve) => setTimeout(resolve, WaitingMS));
+			continue;
+		}
+		if (data.status === 2) {
+			const secret = decryptSecret(data.encryptedSecret, key);
+			return {
+				status: data.status,
+				appId: data.appId,
+				secret
+			};
+		}
+		if (data.status === 3) return { status: data.status };
+		await new Promise((resolve) => setTimeout(resolve, WaitingMS));
 	}
-	messageIds.length = 0;
 };
-const qqLogin = karin.command(/^#(?:qq登录|qqlogin)$/i, async (e) => {
-	if (busy) {
-		await e.reply("已有扫码授权在进行中，请稍候再试");
-		return;
-	}
-	busy = true;
-	const messageIds = [];
-	/**
-	* 发送并登记扫码流程的临时回复。
-	* @param elements 回复内容。
-	*/
-	const replyAndTrack = async (elements) => {
-		const result = await e.reply(elements);
-		trackReply(result, messageIds);
-		return result;
+
+//#endregion
+//#region src/apps/login.ts
+let busy = false;
+const QQBotLogin = karin.command(/^#qqbot(登录|login)$/i, async (e) => {
+	const msgIds = [];
+	const reply = async (elements) => {
+		const res = await e.reply(elements, { at: true });
+		msgIds.push(res.messageId);
 	};
-	try {
-		await replyAndTrack([segment.text("已开始 QQ 扫码登录授权\n⚠ 扫码完成会刷新该机器人的 secret，旧 secret 立即失效")]);
-		log("info", `[扫码登录] 由用户 ${e.userId} 触发`);
-		const ok = await runQrOnboard({
-			printTerminal: isConsoleAdapter(e.bot),
-			onQr: async ({ base64, url, refresh }) => {
-				const head = refresh === 0 ? "请使用手机 QQ 扫描二维码完成授权（二维码 60s 内有效，过期会自动刷新最多 3 次）：" : `上一张二维码已过期，已自动刷新（第 ${refresh}/3 次，仍为 60s 有效期）：`;
-				try {
-					await replyAndTrack([
-						segment.text(head),
-						segment.image(base64),
-						segment.text(`或在手机 QQ 打开链接：\n${url}`)
-					]);
-				} catch (err) {
-					log("warn", "[扫码登录] 推送二维码失败:", err);
-				}
-			}
+	if (busy) return await e.reply("已有扫码授权在进行中，请稍候再试", { reply: true });
+	busy = true;
+	await reply("注意: 确认登录后将刷新 QQBot 的 AppSecret,旧的 AppSecret 将失效");
+	const task = await createBindTask();
+	const url = buildConnectUrl(task.taskId);
+	const msg = [segment.text("请使用 QQ 扫码登录")];
+	if (e.bot.adapter.protocol === "console") {
+		const qrcode$1 = await qrcode.toString(url, {
+			type: "terminal",
+			small: true
 		});
-		await recallTrackedReplies(e.bot, e.contact, messageIds);
-		if (ok) await e.reply("扫码授权成功，配置已保存，QQBot 实例正在初始化…");
-		else await e.reply("扫码授权失败或超时，请重试 #QQ登录");
-	} catch (err) {
-		log("error", "[扫码登录] 异常:", err);
-		await recallTrackedReplies(e.bot, e.contact, messageIds);
-		await e.reply("扫码授权过程中发生异常，详情见服务端日志");
-	} finally {
-		busy = false;
+		msg.push(segment.text(`\n${qrcode$1}`));
+	} else {
+		const qrcode$2 = await qrcode.toDataURL(url);
+		msg.push(segment.image(qrcode$2));
+	}
+	msg.push(segment.text(`或使用手机 QQ 打开链接登录: ${url}`));
+	await reply(msg);
+	const ok = await PollBindResult(task.taskId, task.aesKey);
+	msgIds.forEach(async (id) => {
+		await e.bot.recallMsg(e.contact, id).catch(() => {});
+	});
+	if (ok.status === 2) {
+		const list = config();
+		const idx = list.findIndex((item) => item.appId === ok.appId);
+		if (idx >= 0) {
+			list[idx].secret = ok.secret;
+			e.reply(`Bot存在,已更新[${ok.appId}]配置`, { reply: true });
+		} else {
+			const defaults = getDefaultConfig()[0];
+			list.push({
+				...defaults,
+				appId: ok.appId,
+				secret: ok.secret
+			});
+			e.reply(`[${ok.appId}] 扫码登录成功`, { reply: true });
+		}
+		return;
 	}
+	return await e.reply("二维码过期,请重新触发指令", { reply: true });
 }, {
-	name: "qqbot:login",
-	permission: "master",
-	authFailMsg: "#QQ登录 仅限主人使用"
+	perm: "master",
+	name: "QQBot 扫码登录"
 });
 
 //#endregion
-export { qqLogin };
+export { QQBotLogin };

package/dist/{config-BUuU6FnQ.js → config-D1_LqrcJ.js}

@@ -11,30 +11,6 @@ const dirPath = path.resolve(filePath, "../..");
 /** 插件包的名称 */
 const basename = path.basename(dirPath);
 
-//#endregion
-//#region src/utils/logger.ts
-const PREFIX = "[QQ Official Bot]";
-const m = {
-	trace: (...a) => logger.trace(PREFIX, ...a),
-	debug: (...a) => logger.debug(PREFIX, ...a),
-	info: (...a) => logger.info(PREFIX, ...a),
-	warn: (...a) => logger.warn(PREFIX, ...a),
-	error: (...a) => logger.error(PREFIX, ...a),
-	fatal: (...a) => logger.fatal(PREFIX, ...a),
-	mark: (...a) => logger.mark(PREFIX, ...a)
-};
-/**
-* QQBot 日志函数
-* - log('info', '消息')
-* - log.info('消息')
-*
-* 日志级别由 karin 框架的 log.level 控制
-*/
-function log(level, ...args) {
-	m[level](...args);
-}
-Object.assign(log, m);
-
 //#endregion
 //#region src/utils/plugin.ts
 /**
@@ -48,56 +24,6 @@ const pluginName = pkg().name;
 /** 文件系统目录名：把 npm 包名里的 `/` 规范化为 `-`，与 Karin 框架对齐。 */
 const pluginDirName = pluginName.replace(/\//g, "-");
 
-//#endregion
-//#region src/utils/proxy-url.ts
-/**
-* HTTP / token 地址只清理首尾空白。完整接口地址是否带尾斜杠可能有路由含义，不能替用户改。
-*/
-const normalizeHttpUrl = (raw) => raw.trim();
-/**
-* 拼接 OpenAPI 路径时再处理斜杠，避免配置值本身被改写。
-*/
-const joinHttpPath = (base, path) => {
-	return `${normalizeHttpUrl(base).replace(/\/+$/, "")}/${path.replace(/^\/+/, "")}`;
-};
-/**
-* WebSocket 网关地址：
-* - ws:// / wss:// 原样保留协议
-* - http:// / https:// 映射为 ws:// / wss://
-* - 未写协议时按 wss:// 处理
-*
-* 这里只做最小处理，不改 path / query / hash。自定义网关的尾斜杠和查询参数都可能有路由含义。
-*/
-const normalizeWsGatewayUrl = (raw) => {
-	const value = raw.trim();
-	if (!value) return "";
-	let normalized = value;
-	const scheme = value.match(/^([a-z][a-z\d+.-]*):\/\//i)?.[1]?.toLowerCase();
-	if (scheme === "http" || scheme === "https") normalized = value.replace(/^http/i, "ws");
-	else if (scheme && scheme !== "ws" && scheme !== "wss") throw new Error(`unsupported websocket protocol: ${scheme}:`);
-	else if (!scheme) normalized = `wss://${value}`;
-	const parsed = new URL(normalized);
-	if (parsed.protocol !== "ws:" && parsed.protocol !== "wss:") throw new Error(`unsupported websocket protocol: ${parsed.protocol}`);
-	return normalized;
-};
-/**
-* 只有从 OpenAPI 根地址推导官方 fallback 网关时，才主动拼 `/websocket/`。
-*/
-const buildFallbackWsUrlFromApi = (apiUrl) => {
-	const parsed = new URL(normalizeWsGatewayUrl(apiUrl));
-	parsed.pathname = `${parsed.pathname.replace(/\/+$/, "")}/websocket/`;
-	parsed.search = "";
-	parsed.hash = "";
-	return parsed.toString();
-};
-const normalizeProxyConfig = (proxy) => ({
-	prodApi: normalizeHttpUrl(proxy.prodApi),
-	sandboxApi: normalizeHttpUrl(proxy.sandboxApi),
-	tokenApi: normalizeHttpUrl(proxy.tokenApi),
-	prodWs: normalizeWsGatewayUrl(proxy.prodWs),
-	sandboxWs: normalizeWsGatewayUrl(proxy.sandboxWs)
-});
-
 //#endregion
 //#region src/utils/config.ts
 let cache;
@@ -159,23 +85,10 @@ const writeConfig = (data) => {
 const formatConfig = (user) => {
 	const def = getDefaultConfig()[0];
 	return user.map((item) => {
-		const { prodApi, sandboxApi, tokenApi, wsUrl, proxy, keyboard, markdown, messageCache, event, ...rest } = item;
+		const { markdown, messageCache, event, ...rest } = item;
 		return {
 			...def,
 			...rest,
-			proxy: normalizeProxyConfig({
-				...def.proxy,
-				...proxy,
-				prodApi: proxy?.prodApi || prodApi || def.proxy.prodApi,
-				sandboxApi: proxy?.sandboxApi || sandboxApi || def.proxy.sandboxApi,
-				tokenApi: proxy?.tokenApi || tokenApi || def.proxy.tokenApi,
-				prodWs: proxy?.prodWs || proxy?.wsUrl || wsUrl || def.proxy.prodWs,
-				sandboxWs: proxy?.sandboxWs || proxy?.wsUrl || wsUrl || def.proxy.sandboxWs
-			}),
-			keyboard: {
-				...def.keyboard,
-				...keyboard
-			},
 			markdown: {
 				...def.markdown,
 				...markdown
@@ -231,17 +144,8 @@ const clampNumber = (value, min, max, fallback) => {
 * 默认配置
 */
 const getDefaultConfig = () => [{
-	name: "",
 	appId: "",
 	secret: "",
-	proxy: {
-		prodApi: "https://api.sgroup.qq.com",
-		sandboxApi: "https://sandbox.api.sgroup.qq.com",
-		tokenApi: "https://bots.qq.com/app/getAppAccessToken",
-		prodWs: "wss://api.sgroup.qq.com/websocket/",
-		sandboxWs: "wss://sandbox.api.sgroup.qq.com/websocket/"
-	},
-	sandbox: false,
 	qqEnable: true,
 	guildEnable: true,
 	guildMode: 0,
@@ -249,7 +153,6 @@ const getDefaultConfig = () => [{
 		reg: "^/",
 		rep: "#"
 	}],
-	keyboard: { enable: true },
 	markdown: { enable: true },
 	messageCache: {
 		enable: false,
@@ -290,4 +193,4 @@ setTimeout(() => {
 }, 2e3);
 
 //#endregion
-export { readConfigFile as a, joinHttpPath as c, normalizeWsGatewayUrl as d, pkg as f, basename as h, getDefaultConfig as i, normalizeHttpUrl as l, log as m, config as n, writeConfig as o, pluginDirName as p, getConfig as r, buildFallbackWsUrlFromApi as s, bindHandlers as t, normalizeProxyConfig as u };
+export { readConfigFile as a, pluginDirName as c, getDefaultConfig as i, basename as l, config as n, writeConfig as o, getConfig as r, pkg as s, bindHandlers as t };

package/dist/index.d.ts

@@ -334,7 +334,7 @@ interface UploadMediaResponse {
 /**
  * 创建 axios 实例，自动从 tokens map 取最新 access_token
  */
-declare const createAxiosInstance: (baseURL: string, appId: string) => import("node-karin/axios").AxiosInstance;
+declare const createAxiosInstance: (appId: string) => import("node-karin/axios").AxiosInstance;
 //#endregion
 //#region src/core/api/http.d.ts
 type AxiosInstance = ReturnType<typeof createAxiosInstance>;
@@ -517,11 +517,18 @@ declare class GroupsApi extends Http {
   /**
    * 获取群成员详情
    *
-   * 未公开文档，来自腾讯官方 openclaw 插件（v2.0.0）的接口速查。
    * @param groupOpenid 群 openid
    * @param memberOpenid 群成员 openid
    */
   getGroupMember(groupOpenid: string, memberOpenid: string): Promise<QQGroupMemberResponse>;
+  /**
+   * 设置群成员禁言
+   * @param groupOpenid 群 openid
+   * @param memberOpenid 群成员 openid
+   * @param op 操作: add 增加禁言，update 更新禁言到期时间，del 解除禁言
+   * @param duration 禁言时间使用RFC3339 格式
+   */
+  setGroupMetu(groupOpenid: string, memberOpenid: string, op: 'add' | 'update' | 'del', duration: string): Promise<{}>;
 }
 //#endregion
 //#region src/core/api/index.d.ts
@@ -562,21 +569,6 @@ declare class QQBotApi {
 }
 //#endregion
 //#region src/types/config.d.ts
-/**
- * 自定义连接代理配置
- */
-interface QQBotProxyConfig {
-  /** 正式环境 API */
-  prodApi: string;
-  /** 测试环境 API */
-  sandboxApi: string;
-  /** 调用凭证 API */
-  tokenApi: string;
-  /** 正式环境 WebSocket 网关 */
-  prodWs: string;
-  /** 测试环境 WebSocket 网关 */
-  sandboxWs: string;
-}
 /**
  * 消息缓存存储分级。
  *
@@ -589,16 +581,10 @@ type MessageCacheLevel = 'minimal' | 'standard' | 'full';
  * 单个 QQBot 配置
  */
 interface QQBotConfig {
-  /** 机器人名称 */
-  name: string;
   /** 机器人 ID */
   appId: string;
   /** 机器人密钥 */
   secret: string;
-  /** 自定义连接代理 */
-  proxy: QQBotProxyConfig;
-  /** 开启沙盒环境 */
-  sandbox: boolean;
   /** 开启 QQ 场景能力（单聊 / 群聊） */
   qqEnable: boolean;
   /** 开启频道场景能力 */
@@ -610,11 +596,6 @@ interface QQBotConfig {
     reg: string | RegExp;
     rep: string;
   }[];
-  /** 按钮自动化 */
-  keyboard: {
-    /** 是否将文本中的 URL 自动转换为 keyboard 按钮 */
-    enable: boolean;
-  };
   /** Markdown 通道 */
   markdown: {
     /** 是否启用 Markdown 通道发送消息 */
@@ -1165,7 +1146,7 @@ declare class AdapterQQBot extends AdapterBase implements AdapterType {
   /**
    * 禁言群成员
    */
-  setGroupMute(_groupId: string, _targetId: string, _duration: number): Promise<void>;
+  setGroupMute(_groupId: string, _targetId: string, duration: number): Promise<void>;
   /**
    * 群全员禁言
    */