@karinjs/adapter-qqbot 3.0.3 → 3.0.6

package/README.md

@@ -12,7 +12,7 @@ pnpm add @karinjs/adapter-qqbot
 
 ## 配置
 
-首次启动没有 QQBot 配置时，使用**任意已连接的机器人**或在**控制台中**发送 `#QQ登录` 完成扫码授权。
+首次启动没有 QQBot 配置时，使用**任意已连接的机器人**或在**控制台中**发送 `#QQBot登录` 完成扫码授权。
 
 也可以访问 Karin WebUI 可视化编辑 或者 手动编辑：`@karinjs-adapter-qqbot/config/config.json`。
 
@@ -22,18 +22,9 @@ pnpm add @karinjs/adapter-qqbot
     "name": "我的机器人",
     "appId": "1234567890",
     "secret": "your-secret",
-    "sandbox": false,
     "qqEnable": true,
     "guildEnable": true,
     "guildMode": 0,
-    "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/"
-    },
-    "keyboard": { "enable": true },
     "markdown": { "enable": true },
     "event": { "type": 2 }
   }
@@ -42,7 +33,6 @@ pnpm add @karinjs/adapter-qqbot
 
 - `event.type`: `0` 关闭、`1` Webhook、`2` WebSocket（默认）。
 - `guildMode`: `0` 公域，只收 @ 消息；`1` 私域，接收全部频道消息。
-- `proxy`: 自定义连接代理地址。`prodApi` / `sandboxApi` 作为 OpenAPI 根地址使用，后端拼接路径时会兼容末尾 `/`；`tokenApi` 是完整接口地址；`prodWs` / `sandboxWs` 是完整 WebSocket 网关地址，支持 `ws://` 和 `wss://`，路径和查询参数会按配置原样连接。
 - `markdown.enable`: 是否让普通文本和图片自动合并为 Markdown 消息，默认开启。关闭后普通图片会改为单独上传发送；插件显式传入的 `segment.markdown` 不受此开关影响。
 
 ## 按钮

package/dist/apps/login.js

@@ -105,51 +105,55 @@ const PollBindResult = async (taskId, key) => {
 //#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);
-	};
-	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
-		});
-		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
+	try {
+		const msgIds = [];
+		const reply = async (elements) => {
+			const res = await e.reply(elements, { at: true });
+			msgIds.push(res.messageId);
+		};
+		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
 			});
-			e.reply(`[${ok.appId}] 扫码登录成功`, { reply: true });
+			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;
+		return await e.reply("二维码过期,请重新触发指令", { reply: true });
+	} finally {
+		busy = false;
 	}
-	return await e.reply("二维码过期,请重新触发指令", { reply: true });
 }, {
 	perm: "master",
 	name: "QQBot 扫码登录"

package/dist/index.js

@@ -3,7 +3,6 @@ import { t as log } from "./logger-sza6kuy3.js";
 import { i as random, n as fakeEvent, r as getImageSize, t as QQAPIBASEURL } from "./utils-QpIUJhxK.js";
 import { t as getMessageStore } from "./message-CVJVFAGR.js";
 import karin, { AdapterBase, app, buttonHandle, common, createDirectMessage, createFriendDecreaseNotice, createFriendIncreaseNotice, createFriendMessage, createGroupApplyRequest, createGroupInviteRequest, createGroupMemberAddNotice, createGroupMemberDelNotice, createGroupMessage, createGuildMessage, fileToUrl, fileToUrlHandlerKey, handler, karin as karin$1, karinToQQBot, logger, registerBot, segment, senderGroup, unregisterBot } from "node-karin";
-import path from "path";
 import { URL } from "url";
 import lodash from "node-karin/lodash";
 import { createReadStream } from "node:fs";
@@ -11,7 +10,7 @@ import FormData from "form-data";
 import axios from "node-karin/axios";
 import crypto from "node:crypto";
 import { open, readFile, stat } from "node:fs/promises";
-import path$1 from "node:path";
+import path from "node:path";
 import { fileURLToPath as fileURLToPath$1 } from "node:url";
 import os from "node:os";
 import EventEmitter from "node:events";
@@ -688,7 +687,7 @@ const formatBytes = (bytes) => {
 const normalizeUploadFileName = (type, name) => {
 	const value = name?.trim();
 	if (!value) return DEFAULT_FILENAME$1[type];
-	return path$1.basename(value) || DEFAULT_FILENAME$1[type];
+	return path.basename(value) || DEFAULT_FILENAME$1[type];
 };
 /**
 * 检查 fallback 资源大小是否超过 QQ 对应类型上限。
@@ -774,7 +773,7 @@ const buildFallbackSource = async (type, source, fileName) => {
 	if (isLocalPathSource(value)) {
 		const file = normalizeLocalPath(value);
 		const info = await stat(file);
-		const name = normalizeUploadFileName(type, fileName || path$1.basename(file));
+		const name = normalizeUploadFileName(type, fileName || path.basename(file));
 		return {
 			kind: "local",
 			file,
@@ -1343,7 +1342,7 @@ const tokens = /* @__PURE__ */ new Map();
 const getAccessToken = async (appId, secret) => {
 	let res;
 	try {
-		const tokenurl = path.join(QQAPIBASEURL, "/app/getAppAccessToken");
+		const tokenurl = `${QQAPIBASEURL}/app/getAppAccessToken`;
 		res = await axios.post(tokenurl, {
 			appId: String(appId),
 			clientSecret: secret
@@ -2151,7 +2150,7 @@ const buildGuildImageItem = async (source) => {
 };
 const resolveImageFilename = (source) => {
 	const file = source.split(/[?#]/)[0] || "";
-	const name = path$1.basename(file);
+	const name = path.basename(file);
 	return name.includes(".") ? name : "image.jpg";
 };
 const buildKeyboard = (grouping) => {
@@ -4456,7 +4455,7 @@ const fetchGateway = async (cfg) => {
 		return "wss://api.bot.qq.com/websocket";
 	}
 	try {
-		const { data } = await axios.get(path$1.join(apiUrl, "gateway"), {
+		const { data } = await axios.get(path.join(apiUrl, "gateway"), {
 			headers: {
 				Authorization: `QQBot ${accessToken}`,
 				"User-Agent": getUserAgent()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@karinjs/adapter-qqbot",
-  "version": "3.0.3",
+  "version": "3.0.6",
   "description": "karin adapter for QQ Official Bot (2.0)",
   "homepage": "https://github.com/KarinJS/karin-plugin-adapter-qqbot",
   "bugs": {