@onebots/adapter-icqq 1.0.0 → 1.0.5

package/lib/adapter.d.ts

@@ -1,7 +1,3 @@
-/**
- * ICQQ 适配器
- * 继承 Adapter 基类，实现 ICQQ 平台功能
- */
 import { Account } from "onebots";
 import { Adapter } from "onebots";
 import { BaseApp } from "onebots";
@@ -74,6 +70,18 @@ export declare class ICQQAdapter extends Adapter<ICQQBot, "icqq"> {
      */
     getStatus(uin: string): Promise<Adapter.StatusInfo>;
     createAccount(config: Account.Config<'icqq'>): Account<'icqq', ICQQBot>;
+    /**
+     * Web 验证提交：将前端提交的滑块 ticket 或短信验证码转交给 ICQQ Bot
+     * 支持 data.ticket / data.code（兼容）或通用 data.value
+     */
+    submitVerification(accountId: string, type: string, data: Record<string, unknown>): void;
+    /** 请求向密保手机发送短信验证码（设备锁时用户选短信验证前调用） */
+    requestSmsCode(accountId: string): Promise<void>;
+    /**
+     * 处理 base64:// 前缀的文件数据
+     * 如果是 base64 格式，转换为 Buffer；否则返回原始数据
+     */
+    private processFileData;
     /**
      * 构建 ICQQ 消息
      */

package/lib/adapter.js

@@ -2,7 +2,8 @@
  * ICQQ 适配器
  * 继承 Adapter 基类，实现 ICQQ 平台功能
  */
-import { Account, AdapterRegistry, AccountStatus } from "onebots";
+import { Buffer } from "node:buffer";
+import { Account, AdapterRegistry, AccountStatus, unixSecondsToEventMs } from "onebots";
 import { Adapter } from "onebots";
 import { ICQQBot, segment } from "./bot.js";
 export class ICQQAdapter extends Adapter {
@@ -21,10 +22,11 @@ export class ICQQAdapter 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);
         // 转换消息格式
         const icqqMessage = this.buildICQQMessage(message);
-        const targetId = parseInt(scene_id.string);
+        const targetId = parseInt(sceneId.string);
         let result;
         if (scene_type === 'private') {
             result = await bot.sendPrivateMessage(targetId, icqqMessage);
@@ -47,7 +49,7 @@ export class ICQQAdapter extends Adapter {
         if (!account)
             throw new Error(`Account ${uin} not found`);
         const bot = account.client;
-        await bot.recallMessage(params.message_id.string);
+        await bot.recallMessage(this.coerceId(params.message_id).string);
     }
     /**
      * 获取消息
@@ -57,11 +59,12 @@ export class ICQQAdapter extends Adapter {
         if (!account)
             throw new Error(`Account ${uin} not found`);
         const bot = account.client;
-        const msg = await bot.getMessage(params.message_id.string);
+        const msg = await bot.getMessage(this.coerceId(params.message_id).string);
         const isGroup = !!msg.group_id;
         return {
             message_id: this.createId(msg.message_id),
-            time: msg.time * 1000,
+            // MessageInfo.time 约定为 Unix 秒（与 OneBot get_msg 等一致）
+            time: msg.time,
             sender: {
                 scene_type: isGroup ? 'group' : 'private',
                 sender_id: this.createId(msg.user_id.toString()),
@@ -303,18 +306,61 @@ export class ICQQAdapter extends Adapter {
         });
         bot.on('qrcode', (event) => {
             this.logger.info(`ICQQ 请扫描二维码登录`);
-            // 可以通过事件通知前端显示二维码
             this.emit('qrcode', { account_id: config.account_id, image: event.image });
+            const imageBase64 = event.image instanceof Buffer ? event.image.toString('base64') : event.image;
+            this.emit('verification:request', {
+                platform: 'icqq',
+                account_id: config.account_id,
+                type: 'qrcode',
+                hint: '请使用手机 QQ 扫描下方二维码登录',
+                options: { blocks: [{ type: 'image', base64: imageBase64, alt: '登录二维码' }] },
+            });
         });
         bot.on('slider', (event) => {
             this.logger.info(`ICQQ 需要滑块验证: ${event.url}`);
-            // 可以通过事件通知前端进行滑块验证
             this.emit('slider', { account_id: config.account_id, url: event.url });
+            this.emit('verification:request', {
+                platform: 'icqq',
+                account_id: config.account_id,
+                type: 'slider',
+                hint: '请在浏览器中打开下方链接完成滑块验证，完成后将获取的 ticket 填入并提交',
+                options: {
+                    blocks: [
+                        { type: 'link', url: event.url, label: event.url },
+                        { type: 'input', key: 'ticket', placeholder: '粘贴 ticket' },
+                    ],
+                },
+            });
         });
         bot.on('device', (event) => {
             this.logger.info(`ICQQ 需要设备锁验证: ${event.url}`);
-            // 可以通过事件通知前端进行设备锁验证
             this.emit('device', { account_id: config.account_id, url: event.url, phone: event.phone });
+            const blocks = [
+                { type: 'link', url: event.url, label: event.url },
+            ];
+            if (event.phone)
+                blocks.push({ type: 'text', content: `手机号：${event.phone}` });
+            this.emit('verification:request', {
+                platform: 'icqq',
+                account_id: config.account_id,
+                type: 'device',
+                hint: '请在浏览器中打开下方链接完成设备锁验证',
+                options: { blocks },
+            });
+            if (event.phone) {
+                this.emit('verification:request', {
+                    platform: 'icqq',
+                    account_id: config.account_id,
+                    type: 'sms',
+                    hint: '使用短信验证：请先点击「发送验证码」，收到后填入 6 位验证码并提交',
+                    requestSmsAvailable: true,
+                    options: {
+                        blocks: [
+                            { type: 'input', key: 'code', placeholder: '6 位短信验证码', maxLength: 6 },
+                        ],
+                    },
+                });
+            }
         });
         bot.on('login_error', (event) => {
             this.logger.error(`ICQQ 登录失败:`, event);
@@ -331,7 +377,7 @@ export class ICQQAdapter extends Adapter {
             // 转换为 CommonEvent 格式
             const commonEvent = {
                 id: this.createId(event.message_id),
-                timestamp: event.time * 1000,
+                timestamp: unixSecondsToEventMs(event.time),
                 platform: 'icqq',
                 bot_id: this.createId(config.account_id),
                 type: 'message',
@@ -359,7 +405,7 @@ export class ICQQAdapter extends Adapter {
             // 转换为 CommonEvent 格式
             const commonEvent = {
                 id: this.createId(event.message_id),
-                timestamp: event.time * 1000,
+                timestamp: unixSecondsToEventMs(event.time),
                 platform: 'icqq',
                 bot_id: this.createId(config.account_id),
                 type: 'message',
@@ -384,7 +430,7 @@ export class ICQQAdapter extends Adapter {
         bot.on('group_increase', (event) => {
             const noticeEvent = {
                 id: this.createId(`${event.group_id}_${event.user_id}_${event.time}`),
-                timestamp: event.time * 1000,
+                timestamp: unixSecondsToEventMs(event.time),
                 platform: 'icqq',
                 bot_id: this.createId(config.account_id),
                 type: 'notice',
@@ -406,7 +452,7 @@ export class ICQQAdapter extends Adapter {
         bot.on('group_decrease', (event) => {
             const noticeEvent = {
                 id: this.createId(`${event.group_id}_${event.user_id}_${event.time}`),
-                timestamp: event.time * 1000,
+                timestamp: unixSecondsToEventMs(event.time),
                 platform: 'icqq',
                 bot_id: this.createId(config.account_id),
                 type: 'notice',
@@ -440,9 +486,68 @@ export class ICQQAdapter extends Adapter {
         });
         return account;
     }
+    /**
+     * Web 验证提交：将前端提交的滑块 ticket 或短信验证码转交给 ICQQ Bot
+     * 支持 data.ticket / data.code（兼容）或通用 data.value
+     */
+    submitVerification(accountId, type, data) {
+        const account = this.getAccount(accountId);
+        if (!account) {
+            this.logger.warn(`submitVerification: 账号不存在 ${accountId}`);
+            return;
+        }
+        const bot = account.client;
+        const value = typeof data.value === 'string' ? data.value : undefined;
+        if (type === 'slider') {
+            const ticket = (data.ticket ?? value);
+            if (typeof ticket === 'string')
+                bot.submitSlider(ticket);
+        }
+        else if (type === 'sms') {
+            const code = (data.code ?? value);
+            if (typeof code === 'string')
+                bot.submitSmsCode(code);
+        }
+        else {
+            this.logger.debug(`submitVerification: 忽略类型 ${type} 或缺少参数`);
+        }
+    }
+    /** 请求向密保手机发送短信验证码（设备锁时用户选短信验证前调用） */
+    requestSmsCode(accountId) {
+        const account = this.getAccount(accountId);
+        if (!account) {
+            this.logger.warn(`requestSmsCode: 账号不存在 ${accountId}`);
+            return Promise.resolve();
+        }
+        return account.client.sendSmsCode();
+    }
     // ============================================
     // 消息转换
     // ============================================
+    /**
+     * 处理 base64:// 前缀的文件数据
+     * 如果是 base64 格式，转换为 Buffer；否则返回原始数据
+     */
+    processFileData(file) {
+        if (typeof file === 'string' && file.startsWith('base64://')) {
+            const base64Data = file.replace(/^base64:\/\//, '');
+            // Strip whitespace (RFC 4648 allows whitespace in base64)
+            const cleanedData = base64Data.replace(/\s/g, '');
+            // Validate base64 format (basic validation)
+            if (!/^[A-Za-z0-9+/]*={0,2}$/.test(cleanedData)) {
+                this.logger.warn(`Invalid base64 data format (length: ${cleanedData.length})`);
+                return file; // Return original if invalid
+            }
+            try {
+                return Buffer.from(cleanedData, 'base64');
+            }
+            catch (error) {
+                this.logger.error(`Failed to convert base64 to Buffer:`, error);
+                return file; // Return original on error
+            }
+        }
+        return file;
+    }
     /**
      * 构建 ICQQ 消息
      */
@@ -467,7 +572,7 @@ export class ICQQAdapter extends Adapter {
             else if (seg.type === 'image') {
                 const file = seg.data.url || seg.data.file;
                 if (file) {
-                    result.push(segment.image(file));
+                    result.push(segment.image(this.processFileData(file)));
                 }
             }
             else if (seg.type === 'face') {
@@ -479,13 +584,13 @@ export class ICQQAdapter extends Adapter {
             else if (seg.type === 'record' || seg.type === 'audio') {
                 const file = seg.data.url || seg.data.file;
                 if (file) {
-                    result.push(segment.record(file));
+                    result.push(segment.record(this.processFileData(file)));
                 }
             }
             else if (seg.type === 'video') {
                 const file = seg.data.url || seg.data.file;
                 if (file) {
-                    result.push(segment.video(file));
+                    result.push(segment.video(this.processFileData(file)));
                 }
             }
             else if (seg.type === 'reply') {

package/lib/bot.d.ts

@@ -135,6 +135,10 @@ export declare class ICQQBot extends EventEmitter {
      * 提交滑块 ticket
      */
     submitSlider(ticket: string): void;
+    /**
+     * 请求发送短信验证码（设备锁时可选，先调用此方法再提交验证码）
+     */
+    sendSmsCode(): Promise<void>;
     /**
      * 提交短信验证码
      */

package/lib/bot.js

@@ -565,6 +565,14 @@ export class ICQQBot extends EventEmitter {
             throw new Error('Bot not connected');
         this.client.submitSlider(ticket);
     }
+    /**
+     * 请求发送短信验证码（设备锁时可选，先调用此方法再提交验证码）
+     */
+    sendSmsCode() {
+        if (!this.client)
+            throw new Error('Bot not connected');
+        return this.client.sendSmsCode();
+    }
     /**
      * 提交短信验证码
      */

package/lib/index.js

@@ -1,3 +1,23 @@
+import { AdapterRegistry } from 'onebots';
 export * from './adapter.js';
 export * from './bot.js';
+const icqqSchema = {
+    account_id: { type: 'string', required: true, label: 'QQ 号' },
+    password: { type: 'string', label: '密码(可选/支持扫码)' },
+    protocol: {
+        platform: { type: 'number', enum: [1, 2, 3, 4, 5, 6], default: 2, label: '登录平台' },
+        ver: { type: 'string', label: 'APK 版本' },
+        sign_api_addr: { type: 'string', label: '签名服务器地址' },
+        data_dir: { type: 'string', label: '数据目录' },
+        log_config: { type: 'object', label: 'log4js 配置' },
+        ignore_self: { type: 'boolean', default: true, label: '过滤自己消息' },
+        resend: { type: 'boolean', default: true, label: '风控分片发送' },
+        reconn_interval: { type: 'number', default: 5, label: '重连间隔(秒)' },
+        cache_group_member: { type: 'boolean', default: true, label: '缓存群员列表' },
+        auto_server: { type: 'boolean', default: true, label: '自动选择服务器' },
+        ffmpeg_path: { type: 'string', label: 'ffmpeg 路径' },
+        ffprobe_path: { type: 'string', label: 'ffprobe 路径' },
+    },
+};
+AdapterRegistry.registerSchema('icqq', icqqSchema);
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onebots/adapter-icqq",
-  "version": "1.0.0",
+  "version": "1.0.5",
   "description": "onebots ICQQ 适配器 - 基于 ICQQ 协议的 QQ 机器人",
   "type": "module",
   "main": "lib/index.js",
@@ -27,11 +27,15 @@
     "typescript": "latest"
   },
   "peerDependencies": {
-    "onebots": "1.0.0"
+    "onebots": "1.0.5"
   },
   "dependencies": {
     "@icqqjs/icqq": "^1.10.18"
   },
+  "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"