@karinjs/adapter-qqbot 3.0.0 → 3.0.2

package/dist/web.config.js

@@ -1,9 +1,8 @@
-import { a as readConfigFile, f as pkg, i as getDefaultConfig, n as config, o as writeConfig, s as buildFallbackWsUrlFromApi, u as normalizeProxyConfig } from "./config-BUuU6FnQ.js";
-import "./utils-N9PNiHjE.js";
+import { a as readConfigFile, n as config, o as writeConfig, s as pkg } from "./config-D1_LqrcJ.js";
+import "./utils-QpIUJhxK.js";
 import { components, defineConfig } from "node-karin";
 
 //#region src/web.config.ts
-const defaultProxy = () => getDefaultConfig()[0].proxy;
 const unwrapValue = (value) => {
 	if (value && typeof value === "object" && "value" in value) return value.value;
 	return value;
@@ -42,51 +41,6 @@ const toStringList = (value) => {
 	if (!Array.isArray(raw)) return [];
 	return raw.map((item) => toStringValue(item)).filter(Boolean);
 };
-const proxyKeys = (sandbox) => sandbox ? {
-	api: "sandboxApi",
-	ws: "sandboxWs"
-} : {
-	api: "prodApi",
-	ws: "prodWs"
-};
-const getBotProxyInput = (item) => {
-	const keys = proxyKeys(!!item.sandbox);
-	const proxy = item.proxy || defaultProxy();
-	return {
-		"proxy:api": proxy[keys.api] || defaultProxy()[keys.api],
-		"proxy:ws": proxy[keys.ws] || defaultProxy()[keys.ws]
-	};
-};
-const proxyFromInput = (item, previous) => {
-	const def = defaultProxy();
-	const sandbox = toBool(item.sandbox, previous?.sandbox ?? false);
-	const previousSandbox = previous?.sandbox ?? sandbox;
-	const keys = proxyKeys(sandbox);
-	const previousVisibleKeys = proxyKeys(previousSandbox);
-	const previousProxy = previous?.proxy;
-	const base = {
-		...def,
-		...previousProxy
-	};
-	const envChanged = !!previous && previousSandbox !== sandbox;
-	const rawApi = toStringValue(item["proxy:api"]).trim();
-	const rawWs = toStringValue(item["proxy:ws"]).trim();
-	const previousVisibleApi = previousProxy?.[previousVisibleKeys.api] || def[previousVisibleKeys.api];
-	const previousVisibleWs = previousProxy?.[previousVisibleKeys.ws] || def[previousVisibleKeys.ws];
-	const api = envChanged && rawApi === previousVisibleApi ? base[keys.api] || def[keys.api] : rawApi || base[keys.api] || def[keys.api];
-	const previousApi = previousProxy?.[keys.api] || def[keys.api];
-	const previousWs = previousProxy?.[keys.ws] || def[keys.ws];
-	const wsInput = envChanged && rawWs === previousVisibleWs ? base[keys.ws] || def[keys.ws] : rawWs;
-	let ws = wsInput || previousWs || def[keys.ws];
-	const previousAutoWs = buildFallbackWsUrlFromApi(previousApi);
-	if (!wsInput || wsInput === previousWs && previousWs === previousAutoWs && api !== previousApi) ws = buildFallbackWsUrlFromApi(api);
-	return normalizeProxyConfig({
-		...base,
-		[keys.api]: api,
-		tokenApi: base.tokenApi || def.tokenApi,
-		[keys.ws]: ws
-	});
-};
 var web_config_default = defineConfig({
 	info: {
 		id: pkg().name,
@@ -102,25 +56,21 @@ var web_config_default = defineConfig({
 		const data = [];
 		config().forEach((item) => {
 			data.push({
-				title: item.name || item.appId,
+				title: item.appId,
 				subtitle: item.appId,
-				name: item.name,
 				appId: item.appId,
 				secret: item.secret,
 				"event:type": String(item.event?.type ?? 2),
-				sandbox: item.sandbox,
 				qqEnable: item.qqEnable,
 				guildEnable: item.guildEnable,
 				guildMode: item.guildMode === 1,
 				regex: item.regex.map((r) => `${r.reg} ${r.rep}`),
-				"keyboard:enable": item.keyboard?.enable !== false,
 				"markdown:enable": item.markdown?.enable !== false,
 				"messageCache:enable": item.messageCache?.enable === true,
 				"messageCache:self": item.messageCache?.self === true,
 				"messageCache:level": item.messageCache?.level || "standard",
 				"messageCache:ttlHours": String(item.messageCache?.ttlHours ?? 24),
-				"messageCache:maxRows": String(item.messageCache?.maxRows ?? 2e5),
-				...getBotProxyInput(item)
+				"messageCache:maxRows": String(item.messageCache?.maxRows ?? 2e5)
 			});
 		});
 		return [components.divider.horizontal("bot-section", {
@@ -158,10 +108,6 @@ var web_config_default = defineConfig({
 						description: "基础信息",
 						descPosition: 5
 					}),
-					components.input.create("name", {
-						label: "机器人显示名称",
-						description: "只用于 Karin 配置页和日志里识别这个机器人，不影响 QQ 平台资料。扫码登录写入配置时通常会自动填充。"
-					}),
 					components.input.create("appId", {
 						label: "机器人 AppID",
 						description: "QQ 开放平台机器人应用的 AppID，是识别机器人账号的唯一编号。填错会导致鉴权和收发消息失败。",
@@ -176,11 +122,6 @@ var web_config_default = defineConfig({
 						description: "场景能力",
 						descPosition: 5
 					}),
-					components.switch.create("sandbox", {
-						label: "使用沙盒环境",
-						description: "开启后这个机器人会使用沙盒环境的 OpenAPI 和 WebSocket 地址；关闭时使用正式环境地址。正式上线机器人请关闭。",
-						defaultSelected: false
-					}),
 					components.switch.create("qqEnable", {
 						label: "启用 QQ 私聊 / 群聊",
 						description: "开启后会处理 QQ 单聊和群聊里的消息事件；如果这个机器人只用于频道，可以关闭。",
@@ -209,11 +150,6 @@ var web_config_default = defineConfig({
 							placeholder: "^/ #"
 						})
 					}),
-					components.switch.create("keyboard:enable", {
-						label: "把链接自动转成按钮",
-						description: "开启后，发送文本里出现的 http(s) 链接会尽量转成 QQ keyboard 按钮，用户可以直接点按钮打开链接。该能力依赖 Markdown 通道。",
-						defaultSelected: true
-					}),
 					components.switch.create("markdown:enable", {
 						label: "启用 Markdown 发送通道",
 						description: "开启后普通文本和图片优先合并为 QQ Markdown 消息，Markdown 里的图片会以内嵌图片形式发送；关闭后普通图片会按官方富媒体单独上传发送。插件显式传入的 segment.markdown 不受此开关影响。",
@@ -262,18 +198,6 @@ var web_config_default = defineConfig({
 					components.input.create("messageCache:maxRows", {
 						label: "缓存最大消息条数",
 						description: "数据库消息行数硬上限，超出后从最旧的消息开始删除，保证磁盘占用可预期。范围 1000~5000000，默认 200000。"
-					}),
-					components.divider.horizontal("bot-proxy-section", {
-						description: "连接代理（高级设置：通常只在使用 Webhook 转 WebSocket 服务时填写，除非你知道你在做什么，否则不建议更改）",
-						descPosition: 5
-					}),
-					components.input.create("proxy:ws", {
-						label: "WebSocket 接入地址",
-						description: "事件接收方式为 WebSocket 时连接的地址。常见用途是填写第三方 Webhook 转 WebSocket 服务地址，因为 QQ 后台开启 Webhook 后通常无法再直连官方 WebSocket。不填会使用当前环境的官方默认网关。"
-					}),
-					components.input.create("proxy:api", {
-						label: "OpenAPI 反代地址",
-						description: "用于发送消息、上传媒体、查询网关和获取机器人资料的 QQ OpenAPI 根地址。多数 Webhook 转 WebSocket 场景不用改这里；只有 OpenAPI 请求也需要走反代时才填写。"
 					})
 				]
 			}
@@ -289,12 +213,10 @@ var web_config_default = defineConfig({
 		try {
 			data = input.qqbot.map((item) => {
 				const previous = prevConfig.find((cfg) => cfg.appId === toStringValue(item.appId));
-				const sandbox = toBool(item.sandbox, previous?.sandbox ?? false);
 				const qqEnable = toBool(item.qqEnable, previous?.qqEnable ?? true);
 				const guildEnable = toBool(item.guildEnable, previous?.guildEnable ?? true);
 				const guildMode = toBool(item.guildMode, previous?.guildMode === 1) ? 1 : 0;
 				const eventType = Number(toStringValue(item["event:type"], String(previous?.event?.type ?? 0)));
-				const keyboardEnable = toBool(item["keyboard:enable"], previous?.keyboard?.enable ?? true);
 				const markdownEnable = toBool(item["markdown:enable"], previous?.markdown?.enable ?? true);
 				const messageCacheEnable = toBool(item["messageCache:enable"], previous?.messageCache?.enable ?? false);
 				const messageCacheSelf = toBool(item["messageCache:self"], previous?.messageCache?.self ?? false);
@@ -312,18 +234,13 @@ var web_config_default = defineConfig({
 						rep: parts[1]?.replace(/^<|>$/g, "") || ""
 					};
 				});
-				const proxy = proxyFromInput(item, previous);
 				return {
-					name: toStringValue(item.name),
 					appId: toStringValue(item.appId),
 					secret: toStringValue(item.secret),
-					proxy,
-					sandbox,
 					qqEnable,
 					guildEnable,
 					guildMode,
 					regex,
-					keyboard: { enable: keyboardEnable },
 					markdown: { enable: markdownEnable },
 					messageCache: {
 						enable: messageCacheEnable,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@karinjs/adapter-qqbot",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "description": "karin adapter for QQ Official Bot (2.0)",
   "homepage": "https://github.com/KarinJS/karin-plugin-adapter-qqbot",
   "bugs": {
@@ -25,7 +25,8 @@
     "lint:fix": "eslint src --fix",
     "pub": "npm publish --access public",
     "sort": "npx sort-package-json",
-    "test": "node tests/schema-sql.test.mjs && node tests/codec.test.mjs && node tests/store.test.mjs"
+    "test": "node tests/schema-sql.test.mjs && node tests/codec.test.mjs && node tests/store.test.mjs",
+    "typecheck": "npx tsc --noEmit"
   },
   "dependencies": {
     "@karinjs/geturls": "^1.0.2",

package/dist/common-by1GpV0b.js

@@ -1,49 +0,0 @@
-import { common, logger } from "node-karin";
-import qrcode from "qrcode";
-import size from "image-size";
-import lodash from "node-karin/lodash";
-import GetUrls from "@karinjs/geturls";
-
-//#region src/utils/common.ts
-/** 睡眠 */
-const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-/** 随机数 */
-const random = (min, max) => lodash.random(min, max);
-/**
-* 伪事件日志（红字）
-*/
-const fakeEvent = (log) => {
-	logger.fatal(`${logger.red("[QQ Official Bot][虚假事件]")} ${log.replace(/\n/g, "\\n")}`);
-};
-/**
-* 提取文本中的 URL 列表
-* 中文不符合 URL 规范，先替换为 `|` 再扫描
-*/
-const handleUrl = (text, exclude = []) => {
-	const cleaned = text.replace(/[一-龥]/g, "|");
-	return GetUrls.getUrls(cleaned, {
-		exclude,
-		stripWWW: false,
-		normalizeProtocol: false,
-		removeQueryParameters: false,
-		removeSingleSlash: false,
-		sortQueryParameters: false,
-		stripAuthentication: false,
-		stripTextFragment: false,
-		removeTrailingSlash: false,
-		normalize: false
-	});
-};
-/**
-* 读取图片宽高
-*/
-const getImageSize = async (url) => {
-	const { width = 100, height = 100 } = size(await common.buffer(url));
-	return {
-		width,
-		height
-	};
-};
-
-//#endregion
-export { sleep as a, random as i, getImageSize as n, handleUrl as r, fakeEvent as t };

package/dist/onboard-vIEoe9dB.js

@@ -1,252 +0,0 @@
-import { i as getDefaultConfig, m as log, n as config, o as writeConfig } from "./config-BUuU6FnQ.js";
-import { a as sleep } from "./common-by1GpV0b.js";
-import qrcode from "qrcode";
-import axios from "node-karin/axios";
-import crypto from "node:crypto";
-
-//#region src/core/onboard/crypto.ts
-/**
-* 生成 256-bit 随机 AES 密钥（base64）
-*/
-const generateBindKey = () => crypto.randomBytes(32).toString("base64");
-/**
-* 解密 bot_encrypt_secret（AES-256-GCM）
-*
-* 密文布局：IV (12 bytes) || ciphertext (N bytes) || AuthTag (16 bytes)
-*/
-const decryptSecret = (encryptedBase64, keyBase64) => {
-	const key = Buffer.from(keyBase64, "base64");
-	if (key.length !== 32) throw new Error(`AES key length must be 32 bytes, got ${key.length}`);
-	const raw = Buffer.from(encryptedBase64, "base64");
-	const iv = raw.subarray(0, 12);
-	const ciphertext = raw.subarray(12, raw.length - 16);
-	const authTag = raw.subarray(raw.length - 16);
-	const decipher = crypto.createDecipheriv("aes-256-gcm", key, iv);
-	decipher.setAuthTag(authTag);
-	let plaintext = decipher.update(ciphertext, void 0, "utf8");
-	plaintext += decipher.final("utf8");
-	return plaintext;
-};
-
-//#endregion
-//#region src/core/onboard/portal.ts
-/** QQ 开放平台扫码绑定服务域名 */
-const PORTAL_HOST = "q.qq.com";
-const CREATE_PATH = "/lite/create_bind_task";
-const POLL_PATH = "/lite/poll_bind_result";
-/** 扫码页面模板 */
-const CONNECT_URL = "https://q.qq.com/qqbot/openclaw/connect.html?task_id={task_id}&_wv=2&source=karin";
-const headers = {
-	"Content-Type": "application/json",
-	Accept: "application/json"
-};
-/** 绑定状态 */
-const BindStatus = {
-	NONE: 0,
-	PENDING: 1,
-	COMPLETED: 2,
-	EXPIRED: 3
-};
-/**
-* 创建绑定任务
-* @returns task_id 与本地生成的 AES key
-*/
-const createBindTask = async () => {
-	const key = generateBindKey();
-	const { data } = await axios.post(`https://${PORTAL_HOST}${CREATE_PATH}`, { key }, { headers });
-	if (data.retcode !== 0) throw new Error(`create_bind_task: ${data.msg || "unknown error"}`);
-	const taskId = data.data?.task_id;
-	if (!taskId) throw new Error("create_bind_task: missing task_id");
-	return {
-		taskId,
-		aesKey: key
-	};
-};
-/**
-* 轮询绑定结果
-*/
-const pollBindResult = async (taskId) => {
-	const { data } = await axios.post(`https://${PORTAL_HOST}${POLL_PATH}`, { task_id: taskId }, { headers });
-	if (data.retcode !== 0) throw new Error(`poll_bind_result: ${data.msg || "unknown error"}`);
-	const d = data.data ?? {};
-	return {
-		status: d.status ?? BindStatus.NONE,
-		appId: String(d.bot_appid ?? ""),
-		encryptedSecret: d.bot_encrypt_secret ?? "",
-		userOpenid: d.user_openid ?? ""
-	};
-};
-/**
-* 构造扫码 URL
-*/
-const buildConnectUrl = (taskId) => CONNECT_URL.replace("{task_id}", encodeURIComponent(taskId));
-/**
-* 通过 appId + secret 直接调一次 @me，拿到 bot 昵称
-* 用于扫码完成后的展示与写入配置
-*/
-const fetchBotName = async (appId, secret) => {
-	try {
-		const accessToken = (await axios.post("https://bots.qq.com/app/getAppAccessToken", {
-			appId,
-			clientSecret: secret
-		})).data?.access_token;
-		if (!accessToken) return "";
-		return (await axios.get("https://api.sgroup.qq.com/users/@me", { headers: { Authorization: `QQBot ${accessToken}` } })).data?.username || "";
-	} catch {
-		return "";
-	}
-};
-
-//#endregion
-//#region src/core/onboard/qr.ts
-/** 默认轮询间隔（毫秒） */
-const POLL_INTERVAL = 2e3;
-/** 默认总超时（秒） */
-const DEFAULT_TIMEOUT_S = 600;
-/** 单张二维码硬编码有效期：60s，到时主动判定过期触发刷新 */
-const QR_TTL_MS = 6e4;
-/** 二维码过期最大刷新次数 */
-const MAX_REFRESHES = 3;
-/**
-* 生成二维码（同时拿到 ascii / base64）
-*/
-const renderQr = async (url) => {
-	return {
-		ascii: await qrcode.toString(url, {
-			type: "terminal",
-			small: true
-		}).catch(() => ""),
-		base64: `base64://${(await qrcode.toDataURL(url, {
-			width: 320,
-			margin: 2
-		})).split(",")[1]}`
-	};
-};
-/**
-* 扫码登录主流程：
-* 1. 创建绑定任务，调用 onQr 暴露二维码
-* 2. 轮询直到 COMPLETED / 二维码过期刷新 / 超时
-* 3. 解密返回 secret
-*/
-const qrRegister = async (opts = {}) => {
-	const { timeoutSeconds = DEFAULT_TIMEOUT_S, printTerminal = false, onQr } = opts;
-	const deadline = Date.now() + timeoutSeconds * 1e3;
-	for (let refresh = 0; refresh <= MAX_REFRESHES; refresh++) {
-		let task;
-		try {
-			task = await createBindTask();
-		} catch (err) {
-			log("error", "[扫码登录] 创建绑定任务失败:", err);
-			return null;
-		}
-		const url = buildConnectUrl(task.taskId);
-		const { ascii, base64 } = await renderQr(url);
-		const qrDeadline = Date.now() + QR_TTL_MS;
-		if (printTerminal) {
-			if (ascii) {
-				console.log();
-				console.log(ascii);
-			}
-			console.log(`  请使用 QQ 扫码（60s 内有效），或在手机 QQ 打开：\n  ${url}\n`);
-		}
-		if (onQr) try {
-			await onQr({
-				url,
-				ascii,
-				base64,
-				refresh
-			});
-		} catch (err) {
-			log("warn", "[扫码登录] onQr 回调异常:", err);
-		}
-		let expired = false;
-		while (Date.now() < deadline) {
-			if (Date.now() >= qrDeadline) {
-				expired = true;
-				break;
-			}
-			let result;
-			try {
-				result = await pollBindResult(task.taskId);
-			} catch {
-				await sleep(POLL_INTERVAL);
-				continue;
-			}
-			if (result.status === BindStatus.COMPLETED) {
-				if (!result.encryptedSecret) {
-					log("error", "[扫码登录] 绑定结果缺少加密密钥");
-					return null;
-				}
-				let secret;
-				try {
-					secret = decryptSecret(result.encryptedSecret, task.aesKey);
-				} catch (err) {
-					log("error", "[扫码登录] 解密 secret 失败:", err);
-					return null;
-				}
-				log("info", `[扫码登录] 授权成功，App ID: ${result.appId}`);
-				return {
-					appId: result.appId,
-					secret,
-					userOpenid: result.userOpenid
-				};
-			}
-			if (result.status === BindStatus.EXPIRED) {
-				expired = true;
-				break;
-			}
-			await sleep(POLL_INTERVAL);
-		}
-		if (expired) {
-			if (refresh >= MAX_REFRESHES) {
-				log("error", `[扫码登录] 二维码已过期 4 次，终止流程`);
-				return null;
-			}
-			log("info", `[扫码登录] 二维码 60s 内未完成扫码，正在刷新 (${refresh + 1}/${MAX_REFRESHES})`);
-			continue;
-		}
-		log("error", `[扫码登录] 等待扫码总超时（${timeoutSeconds}s）`);
-		return null;
-	}
-	return null;
-};
-
-//#endregion
-//#region src/core/onboard/index.ts
-/** 是否需要触发扫码引导：完全没有 bot 配置时为 true */
-const needQrOnboard = () => config().length === 0;
-/**
-* 执行扫码登录并把结果写入 config.json
-*
-* - 同 appId 已存在 → 覆盖 secret / name
-* - 不存在 → 追加新配置
-*
-* 支持 `opts.onQr` 把新二维码透出给调用方（如 #QQ登录 指令把图片回给用户）
-*/
-const runQrOnboard = async (opts = {}) => {
-	const result = await qrRegister(opts);
-	if (!result) return false;
-	const name = await fetchBotName(result.appId, result.secret);
-	if (name) log("info", `[扫码登录] Bot 名称: ${name}`);
-	const list = config();
-	const idx = list.findIndex((item) => item.appId === result.appId);
-	if (idx >= 0) {
-		list[idx].secret = result.secret;
-		if (name) list[idx].name = name;
-		log("info", `[扫码登录] 已更新已有配置: ${result.appId}`);
-	} else {
-		const defaults = getDefaultConfig()[0];
-		list.push({
-			...defaults,
-			name: name || "",
-			appId: result.appId,
-			secret: result.secret
-		});
-		log("info", `[扫码登录] 已添加新配置: ${result.appId}`);
-	}
-	writeConfig(list);
-	return true;
-};
-
-//#endregion
-export { runQrOnboard as n, needQrOnboard as t };

package/dist/utils-N9PNiHjE.js

@@ -1,4 +0,0 @@
-import "./config-BUuU6FnQ.js";
-import "./common-by1GpV0b.js";
-
-export {  };