@karinjs/adapter-qqbot 1.3.1 → 2.0.0

package/dist/web.config.js

@@ -1,224 +1,173 @@
-import {
-  config_exports,
-  pkg,
-  writeConfig
-} from "./chunk-PYOUSZ6B.js";
+import { a as pkg, n as config, o as writeConfig } from "./config-H7LrvlNU.js";
+import "./utils-DO4gEkVN.js";
+import { components, defineConfig } from "node-karin";
 
-// src/web.config.ts
-import { defineConfig, components } from "node-karin";
+//#region src/web.config.ts
 var web_config_default = defineConfig({
-  info: {
-    id: pkg().name,
-    name: "QQBot\u9002\u914D\u5668",
-    version: pkg().version,
-    description: "\u4E3Akarin\u63D0\u4F9BQQ\u5B98\u65B9Bot\u8FDE\u63A5\u80FD\u529B",
-    author: [
-      {
-        name: "shijin",
-        avatar: "https://github.com/sj817.png"
-      }
-    ]
-  },
-  components: () => {
-    const data = [];
-    const cfg = config_exports.config();
-    cfg.forEach((item) => {
-      data.push({
-        title: item.appId,
-        subtitle: "",
-        appId: item.appId,
-        secret: item.secret,
-        prodApi: item.prodApi,
-        sandboxApi: item.sandboxApi,
-        tokenApi: item.tokenApi,
-        sandbox: item.sandbox,
-        qqEnable: item.qqEnable,
-        guildEnable: item.guildEnable,
-        guildMode: item.guildMode,
-        exclude: item.exclude,
-        regex: item.regex.map((item2) => `<${item2.reg}> <${item2.rep}>`)
-      });
-    });
-    return [
-      components.accordionPro.create(
-        "qqbot",
-        data,
-        {
-          label: "QQBot",
-          description: "QQBot\u914D\u7F6E",
-          children: {
-            key: "qqbotConfig",
-            children: [
-              components.input.create("appId", {
-                label: "AppID",
-                description: "\u8BF7\u8F93\u5165\u4F60\u7684AppID",
-                isRequired: true
-              }),
-              components.input.create("secret", {
-                label: "Secret",
-                description: "\u8BF7\u8F93\u5165\u4F60\u7684Secret",
-                isRequired: true
-              }),
-              components.input.create("prodApi", {
-                label: "\u6B63\u5F0F\u73AF\u5883Api",
-                description: "\u8BF7\u8F93\u5165\u4F60\u7684\u6B63\u5F0F\u73AF\u5883Api",
-                defaultValue: "https://api.sgroup.qq.com",
-                isRequired: true
-              }),
-              components.input.create("sandboxApi", {
-                label: "\u6C99\u76D2\u73AF\u5883Api",
-                description: "\u8BF7\u8F93\u5165\u4F60\u7684\u6C99\u76D2\u73AF\u5883Api",
-                defaultValue: "https://sandbox.api.sgroup.qq.com",
-                isRequired: true
-              }),
-              components.input.create("tokenApi", {
-                label: "\u8C03\u7528\u51ED\u8BC1\u7684Api",
-                description: "\u8BF7\u8F93\u5165\u4F60\u7684\u8C03\u7528\u51ED\u8BC1\u7684Api",
-                defaultValue: "https://bots.qq.com/app/getAppAccessToken",
-                isRequired: true
-              }),
-              components.switch.create("sandbox", {
-                label: "\u6C99\u76D2\u73AF\u5883",
-                description: "\u662F\u5426\u542F\u7528\u6C99\u76D2\u73AF\u5883",
-                defaultSelected: false
-              }),
-              components.switch.create("qqEnable", {
-                label: "QQ\u573A\u666F",
-                description: "\u662F\u5426\u542F\u7528QQ\u573A\u666F",
-                defaultSelected: true
-              }),
-              components.switch.create("guildEnable", {
-                label: "\u9891\u9053\u573A\u666F",
-                description: "\u662F\u5426\u542F\u7528\u9891\u9053\u573A\u666F",
-                defaultSelected: true
-              }),
-              components.switch.create("guildMode", {
-                label: "\u9891\u9053\u573A\u666F\u6A21\u5F0F",
-                description: "\u9891\u9053\u573A\u666F\u6A21\u5F0F \u6253\u5F00\u4E3A\u516C\u57DF \u5173\u95ED\u4E3A\u79C1\u57DF",
-                defaultSelected: true
-              }),
-              components.input.group("exclude", {
-                data: [],
-                label: "\u6587\u672C\u4E2D\u7684url\u8F6C\u4E8C\u7EF4\u7801\u767D\u540D\u5355",
-                description: "\u6587\u672C\u4E2D\u7684url\u8F6C\u4E8C\u7EF4\u7801\u767D\u540D\u5355 \u914D\u7F6E\u540E\u5C06\u4E0D\u8F6C\u6362\u8FD9\u4E9Burl\u4E3A\u4E8C\u7EF4\u7801",
-                template: components.input.create("exclude_url", {
-                  label: "\u767D\u540D\u5355"
-                })
-              }),
-              components.input.group("regex", {
-                data: [],
-                label: "\u63A5\u53D7\u5230\u6D88\u606F\u540E\u5BF9\u6587\u672C\u8FDB\u884C\u8868\u8FBE\u5F0F\u5904\u7406",
-                description: "\u683C\u5F0F\u6BD4\u8F83\u590D\u6742: <reg> <rep> \u5206\u522B\u8868\u793A\u6B63\u5219\u548C\u66FF\u6362\u5185\u5BB9\uFF0C\u8BF7\u6B63\u786E\u586B\u5199",
-                template: components.input.create("regex", {
-                  label: "\u6B63\u5219"
-                })
-              }),
-              components.radio.group("markdown:mode", {
-                label: "markdown\u53D1\u9001\u6A21\u5F0F",
-                description: "\u673A\u5668\u4EBA\u53D1\u9001\u6A21\u5F0F 0-\u76F4\u63A5\u53D1\u9001 1-\u539F\u751FMarkdown 3-\u65E7\u56FE\u6587\u6A21\u677FMarkdown 4-\u7EAF\u6587\u6A21\u677FMarkdown 5-\u81EA\u5B9A\u4E49\u5904\u7406",
-                defaultValue: "0",
-                radio: [
-                  components.radio.create("0", {
-                    label: "\u76F4\u63A5\u53D1\u9001",
-                    value: "0"
-                  }),
-                  components.radio.create("1", {
-                    label: "\u539F\u751FMarkdown",
-                    value: "1"
-                  }),
-                  components.radio.create("3", {
-                    label: "\u65E7\u56FE\u6587\u6A21\u677FMarkdown",
-                    value: "3"
-                  }),
-                  components.radio.create("4", {
-                    label: "\u7EAF\u6587\u6A21\u677FMarkdown",
-                    value: "4"
-                  })
-                  // components.radio.create('5', {
-                  //   label: '自定义处理',
-                  //   value: '5',
-                  // }),
-                ]
-              }),
-              components.input.create("markdown:id", {
-                label: "markdown\u6A21\u677FID",
-                description: "\u8BF7\u8F93\u5165\u4F60\u7684markdown\u6A21\u677FID"
-              }),
-              components.input.group("markdown:kv", {
-                data: [],
-                label: "markdown\u6A21\u677F\u53D8\u91CF",
-                description: "\u8BF7\u8F93\u5165\u4F60\u7684markdown\u6A21\u677F\u53D8\u91CF",
-                template: components.input.create("markdown:kv:key", {
-                  label: "\u53D8\u91CF"
-                })
-              }),
-              components.radio.group("event:type", {
-                label: "\u4E8B\u4EF6\u63A5\u6536\u65B9\u5F0F",
-                defaultValue: "0",
-                radio: [
-                  components.radio.create("0", {
-                    label: "\u5173\u95ED",
-                    value: "0",
-                    description: "\u5173\u95ED\u4E8B\u4EF6\u63A5\u6536 \u4E34\u65F6\u7981\u7528"
-                  }),
-                  components.radio.create("1", {
-                    label: "webhook",
-                    value: "1",
-                    description: "\u4F7F\u7528webhook\u63A5\u6536\u4E8B\u4EF6 \u9700\u8981\u81EA\u884C\u914D\u7F6ENginx"
-                  }),
-                  components.radio.create("2", {
-                    label: "ws",
-                    value: "2",
-                    description: "\u4F7F\u7528ws\u63A5\u6536\u4E8B\u4EF6 \u9700\u8981\u81EA\u884C\u914D\u7F6Ews"
-                  })
-                ]
-              }),
-              components.input.create("event:wsUrl", {
-                label: "ws\u5730\u5740",
-                description: "\u8BF7\u8F93\u5165\u4F60\u7684ws\u5730\u5740"
-              }),
-              components.input.create("event:wsToken", {
-                label: "wsToken",
-                description: "\u8BF7\u8F93\u5165\u4F60\u7684wsToken"
-              })
-            ]
-          }
-        }
-      )
-    ];
-  },
-  /** 前端点击保存之后调用的方法 */
-  save: (config) => {
-    const data = [];
-    config.qqbot.forEach((item) => {
-      data.push({
-        ...item,
-        regex: item.regex.map((item2) => {
-          const [reg, rep] = item2.split(" ");
-          return {
-            reg: reg.replace(/^<|>$|$/g, ""),
-            rep: rep.replace(/^<|>$|$/g, "")
-          };
-        }),
-        markdown: {
-          mode: item["markdown:mode"] ?? 0,
-          id: item["markdown:id"] ?? "",
-          kv: item["markdown:kv"] ?? []
-        },
-        event: {
-          type: item["event:type"] ?? 0,
-          wsUrl: item["event:wsUrl"] ?? "",
-          wsToken: item["event:wsToken"] ?? ""
-        }
-      });
-    });
-    writeConfig(data);
-    return {
-      success: true,
-      message: "\u4FDD\u5B58\u6210\u529F"
-    };
-  }
+	info: {
+		id: pkg().name,
+		name: "QQBot 适配器",
+		version: pkg().version,
+		description: "为 karin 提供 QQ 官方 Bot 连接能力（2.0）",
+		author: [{
+			name: "shijin",
+			avatar: "https://github.com/sj817.png"
+		}]
+	},
+	components: () => {
+		const data = [];
+		config().forEach((item) => {
+			data.push({
+				title: item.name || item.appId,
+				subtitle: item.appId,
+				name: item.name,
+				appId: item.appId,
+				secret: item.secret,
+				prodApi: item.prodApi,
+				sandboxApi: item.sandboxApi,
+				tokenApi: item.tokenApi,
+				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,
+				"event:type": String(item.event?.type ?? 2)
+			});
+		});
+		return [components.accordionPro.create("qqbot", data, {
+			label: "QQBot",
+			description: "QQBot 配置",
+			children: {
+				key: "qqbotConfig",
+				children: [
+					components.input.create("name", {
+						label: "机器人名称",
+						description: "机器人名称，扫码登录会自动获取"
+					}),
+					components.input.create("appId", {
+						label: "AppID",
+						description: "机器人 AppID",
+						isRequired: true
+					}),
+					components.input.create("secret", {
+						label: "Secret",
+						description: "机器人 Secret",
+						isRequired: true
+					}),
+					components.input.create("prodApi", {
+						label: "正式环境 API",
+						defaultValue: "https://api.sgroup.qq.com",
+						isRequired: true
+					}),
+					components.input.create("sandboxApi", {
+						label: "沙盒环境 API",
+						defaultValue: "https://sandbox.api.sgroup.qq.com",
+						isRequired: true
+					}),
+					components.input.create("tokenApi", {
+						label: "AccessToken 接口",
+						defaultValue: "https://bots.qq.com/app/getAppAccessToken",
+						isRequired: true
+					}),
+					components.switch.create("sandbox", {
+						label: "沙盒环境",
+						description: "启用后调用沙盒 API",
+						defaultSelected: false
+					}),
+					components.switch.create("qqEnable", {
+						label: "QQ 场景",
+						description: "是否处理私聊和群聊消息",
+						defaultSelected: true
+					}),
+					components.switch.create("guildEnable", {
+						label: "频道场景",
+						description: "是否处理频道消息",
+						defaultSelected: true
+					}),
+					components.switch.create("guildMode", {
+						label: "频道私域模式",
+						description: "开启 = 私域机器人；关闭 = 公域机器人",
+						defaultSelected: false
+					}),
+					components.input.group("regex", {
+						data: [],
+						label: "消息正则替换",
+						description: "每行格式：正则表达式 替换内容。如：^/ #",
+						template: components.input.create("regex", {
+							label: "正则规则",
+							placeholder: "^/ #"
+						})
+					}),
+					components.switch.create("keyboard:enable", {
+						label: "URL 自动按钮",
+						description: "将文本中的链接自动转为 keyboard 按钮",
+						defaultSelected: true
+					}),
+					components.radio.group("event:type", {
+						label: "事件接收方式",
+						description: "选择 QQ 官方推送事件的方式",
+						defaultValue: "2",
+						radio: [
+							components.radio.create("0", {
+								label: "关闭",
+								value: "0",
+								description: "不接收任何事件"
+							}),
+							components.radio.create("1", {
+								label: "Webhook",
+								value: "1",
+								description: "QQ 官方主动推送事件到本机"
+							}),
+							components.radio.create("2", {
+								label: "WebSocket",
+								value: "2",
+								description: "主动连接 QQ 官方 WebSocket 网关接收事件（推荐）"
+							})
+						]
+					})
+				]
+			}
+		})];
+	},
+	save: (input) => {
+		if (!Array.isArray(input.qqbot)) return {
+			success: false,
+			message: "保存失败：配置格式错误"
+		};
+		const data = input.qqbot.map((item) => {
+			const guildMode = item.guildMode === true ? 1 : 0;
+			const eventType = Number(item["event:type"] ?? 0);
+			const regex = (item.regex || []).map((str) => {
+				const parts = str.split(" ");
+				return {
+					reg: parts[0]?.replace(/^<|>$/g, "") || "",
+					rep: parts[1]?.replace(/^<|>$/g, "") || ""
+				};
+			});
+			return {
+				name: item.name || "",
+				appId: item.appId || "",
+				secret: item.secret || "",
+				prodApi: item.prodApi || "https://api.sgroup.qq.com",
+				sandboxApi: item.sandboxApi || "https://sandbox.api.sgroup.qq.com",
+				tokenApi: item.tokenApi || "https://bots.qq.com/app/getAppAccessToken",
+				sandbox: !!item.sandbox,
+				qqEnable: !!item.qqEnable,
+				guildEnable: !!item.guildEnable,
+				guildMode,
+				regex,
+				keyboard: { enable: item["keyboard:enable"] !== false },
+				event: { type: eventType }
+			};
+		});
+		writeConfig(data);
+		return {
+			success: true,
+			message: "保存成功"
+		};
+	}
 });
-export {
-  web_config_default as default
-};
+
+//#endregion
+export { web_config_default as default };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@karinjs/adapter-qqbot",
-  "version": "1.3.1",
-  "description": "karin plugin adapter for qqbot",
+  "version": "2.0.0",
+  "description": "karin adapter for QQ Official Bot (2.0)",
   "homepage": "https://github.com/KarinJS/karin-plugin-adapter-qqbot",
   "bugs": {
     "url": "https://github.com/KarinJS/karin-plugin-adapter-qqbot/issues"
@@ -13,41 +13,47 @@
   "author": "shijin",
   "type": "module",
   "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "files": [
     "dist"
   ],
   "scripts": {
-    "build": "tsc && tsup",
-    "dev": "tsx src/app.ts",
+    "build": "tsc && tsdown",
+    "dev": "tsx watch --include \"src/**/*.ts\" src/app.ts",
     "karin": "karin",
+    "lint": "eslint src",
+    "lint:fix": "eslint src --fix",
     "pub": "npm publish --access public",
-    "pub-beta": "npm publish --tag beta",
     "sort": "npx sort-package-json"
   },
   "dependencies": {
     "@karinjs/geturls": "^1.0.2",
-    "form-data": "^4.0.2",
-    "image-size": "^1.2.0",
+    "form-data": "^4.0.5",
+    "image-size": "^2.0.2",
     "qrcode": "^1.5.4",
-    "silk-wasm": "^3.6.3",
+    "silk-wasm": "^3.7.1",
     "tweetnacl": "^1.0.3"
   },
   "devDependencies": {
-    "@types/express": "5.0.5",
-    "@types/form-data": "^2.5.2",
-    "@types/node": "^20.17.19",
-    "@types/qrcode": "^1.5.5",
-    "eslint": "^9.21.0",
-    "neostandard": "^0.12.1",
-    "node-karin": "^1.12.2",
-    "tsup": "^8.3.6",
-    "tsx": "^4.19.3",
-    "typescript": "^5.7.3"
+    "@types/express": "5.0.6",
+    "@types/node": "^24.12.4",
+    "@types/qrcode": "^1.5.6",
+    "eslint": "^9.39.4",
+    "neostandard": "^0.13.0",
+    "node-karin": "^1.15.5",
+    "tsdown": "^0.22.0",
+    "tsx": "^4.22.0",
+    "typescript": "^6.0.3"
   },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
   },
+  "pnpm": {
+    "overrides": {
+      "yaml@>=2.0.0 <2.8.3": "^2.8.3"
+    }
+  },
   "karin": {
     "main": "src/index.ts",
     "apps": [