@onebots/adapter-kook 1.0.0 → 1.0.5

package/lib/adapter.js

@@ -27,7 +27,8 @@ export class KookAdapter extends Adapter {
         if (!account)
             throw new Error(`Account ${uin} not found`);
         const bot = account.client;
-        const { scene_id, scene_type, message } = params;
+        const { scene_type, message } = params;
+        const sceneId = this.coerceId(params.scene_id);
         // 解析消息内容
         let content = '';
         let messageType = 9; // 默认使用 KMarkdown
@@ -63,15 +64,15 @@ export class KookAdapter extends Adapter {
         let result;
         if (scene_type === 'private' || scene_type === 'direct') {
             // 私聊消息
-            result = await bot.sendDirectMessage(scene_id.string, content);
+            result = await bot.sendDirectMessage(sceneId.string, content);
         }
         else if (scene_type === 'channel') {
             // 频道消息
-            result = await bot.sendChannelMessage(scene_id.string, content);
+            result = await bot.sendChannelMessage(sceneId.string, content);
         }
         else if (scene_type === 'group') {
             // 群组消息也发送到频道
-            result = await bot.sendChannelMessage(scene_id.string, content);
+            result = await bot.sendChannelMessage(sceneId.string, content);
         }
         else {
             throw new Error(`KOOK 不支持的消息场景类型: ${scene_type}`);
@@ -88,11 +89,11 @@ export class KookAdapter extends Adapter {
         if (!account)
             throw new Error(`Account ${uin} not found`);
         const bot = account.client;
-        const msgId = params.message_id.string;
+        const msgId = this.coerceId(params.message_id).string;
         // 根据场景类型删除消息
         // 需要从消息中获取 channel_id，这里简化处理
         // 实际应该从消息缓存或数据库中获取
-        const channelId = params.scene_id?.string || '';
+        const channelId = params.scene_id != null ? this.coerceId(params.scene_id).string : '';
         if (channelId) {
             await bot.deleteMessage(channelId, msgId);
         }
@@ -105,8 +106,8 @@ export class KookAdapter extends Adapter {
         if (!account)
             throw new Error(`Account ${uin} not found`);
         const bot = account.client;
-        const msgId = params.message_id.string;
-        const channelId = params.scene_id?.string || '';
+        const msgId = this.coerceId(params.message_id).string;
+        const channelId = params.scene_id != null ? this.coerceId(params.scene_id).string : '';
         const msg = await bot.getMessage(channelId, msgId);
         return {
             message_id: this.createId(msg.id),
@@ -132,7 +133,7 @@ export class KookAdapter extends Adapter {
         if (!account)
             throw new Error(`Account ${uin} not found`);
         const bot = account.client;
-        const msgId = params.message_id.string;
+        const msgId = this.coerceId(params.message_id).string;
         // 解析消息内容
         let content = '';
         for (const seg of params.message) {
@@ -145,7 +146,8 @@ export class KookAdapter extends Adapter {
         }
         // 更新消息需要 channelId，但参数中没有，尝试从消息中获取
         // 如果无法获取，则使用第一个可用的频道（简化处理）
-        const channelId = params.scene_id?.string || '';
+        const rawScene = params.scene_id;
+        const channelId = rawScene != null ? this.coerceId(rawScene).string : '';
         if (!channelId) {
             throw new Error('更新消息需要 channel_id，但参数中未提供');
         }
@@ -258,6 +260,9 @@ export class KookAdapter extends Adapter {
         const bot = account.client;
         const guildId = params.group_id.string;
         const guild = await bot.getGuild(guildId);
+        if (!guild?.id) {
+            throw new Error(`获取群信息失败：无效的 guild 响应（guild_id=${guildId}）`);
+        }
         return {
             group_id: this.createId(guild.id),
             group_name: guild.name,
@@ -476,6 +481,9 @@ export class KookAdapter extends Adapter {
             throw new Error(`Account ${uin} not found`);
         const bot = account.client;
         const guild = await bot.getGuild(params.guild_id.string);
+        if (!guild?.id) {
+            throw new Error(`获取服务器信息失败：无效的 guild 响应（guild_id=${params.guild_id.string}）`);
+        }
         return {
             guild_id: this.createId(guild.id),
             guild_name: guild.name,

package/lib/index.js

@@ -1,3 +1,14 @@
+// 导出类型
+import { AdapterRegistry } from 'onebots';
 export * from './adapter.js';
 export * from './bot.js';
+const kookSchema = {
+    account_id: { type: 'string', required: true, label: '账号标识' },
+    token: { type: 'string', required: true, label: 'Bot Token' },
+    verifyToken: { type: 'string', label: 'Webhook 验证 Token' },
+    encryptKey: { type: 'string', label: '消息加密 Key' },
+    mode: { type: 'string', enum: ['webhook', 'websocket'], default: 'websocket', label: '连接模式' },
+    maxRetry: { type: 'number', default: 10, label: '最大重连次数' },
+};
+AdapterRegistry.registerSchema('kook', kookSchema);
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onebots/adapter-kook",
-  "version": "1.0.0",
+  "version": "1.0.5",
   "description": "onebots KOOK(开黑了)适配器",
   "type": "module",
   "main": "lib/index.js",
@@ -22,16 +22,20 @@
     "/lib/**/*.d.ts"
   ],
   "devDependencies": {
+    "@types/node": "^22.7.3",
     "tsc-alias": "latest",
-    "typescript": "latest",
-    "@types/node": "^22.7.3"
+    "typescript": "latest"
   },
   "peerDependencies": {
-    "onebots": "1.0.0"
+    "onebots": "1.0.5"
   },
   "dependencies": {
     "kook-client": "^1.0.4"
   },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lc-cn/onebots.git"
+  },
   "scripts": {
     "build": "rm -f *.tsbuildinfo && tsc --project tsconfig.json && tsc-alias -p tsconfig.json",
     "clean": "rm -rf lib *.tsbuildinfo"