node-karin 0.4.1 → 0.5.0

package/config/defSet/config.yaml

@@ -17,6 +17,17 @@ multi_progress: false
 # 控制台触发插件日志颜色 十六进制 默认#FFFF00 不支持热更新
 log_color: "#E1D919"
 
+# input适配器配置 以下所有配置均不支持热更新
+AdapterInput:
+  # 是否启用
+  enable: true
+  # 是否将语音、图片、视频消息转为文件 转为文件后可通过url访问
+  msgToFile: true
+  # url访问token 如果为 AdapterInput 每次启动后会重新生成
+  token: "AdapterInput"
+  # 访问ip
+  ip: 127.0.0.1
+
 # ffmpeg配置 用于音视频处理
 ffmpeg_path:
 ffprobe_path:

package/lib/adapter/input/index.d.ts

@@ -0,0 +1,63 @@
+import { KarinAdapter } from '../../types/adapter.js';
+import { contact, KarinElement } from '../../types/index.js';
+/**
+ * - 标准输入输出适配器
+ */
+export declare class AdapterInput implements KarinAdapter {
+    #private;
+    socket: WebSocket;
+    account: KarinAdapter['account'];
+    adapter: KarinAdapter['adapter'];
+    version: KarinAdapter['version'];
+    constructor();
+    get self_id(): string;
+    stdin(): void;
+    logger(level: 'info' | 'error' | 'trace' | 'debug' | 'mark' | 'warn' | 'fatal', ...args: any[]): void;
+    GetVersion(): Promise<{
+        name: string;
+        app_name: string;
+        version: string;
+    }>;
+    SendMessage(_contact: contact, elements: Array<KarinElement>): Promise<{
+        message_id: string;
+    }>;
+    getAvatarUrl(): string;
+    getGroupAvatar(): string;
+    GetCurrentAccount(): Promise<{
+        account_uid: string;
+        account_uin: string;
+        account_name: string;
+    }>;
+    GetEssenceMessageList(): Promise<any>;
+    DownloadForwardMessage(): Promise<any>;
+    SetEssenceMessage(): Promise<any>;
+    DeleteEssenceMessage(): Promise<any>;
+    SetFriendApplyResult(): Promise<any>;
+    SetGroupApplyResultRequest(): Promise<any>;
+    SetInvitedJoinGroupResult(): Promise<any>;
+    ReactMessageWithEmojiRequest(): Promise<any>;
+    UploadPrivateFile(): Promise<any>;
+    UploadGroupFile(): Promise<any>;
+    UploadForwardMessage(): Promise<any>;
+    sendForwardMessage(): Promise<any>;
+    SendMessageByResId(): Promise<any>;
+    RecallMessage(): Promise<any>;
+    GetMessage(): Promise<any>;
+    GetHistoryMessage(): Promise<any>;
+    VoteUser(): Promise<any>;
+    KickMember(): Promise<any>;
+    BanMember(): Promise<any>;
+    SetGroupWholeBan(): Promise<any>;
+    SetGroupAdmin(): Promise<any>;
+    ModifyMemberCard(): Promise<any>;
+    ModifyGroupName(): Promise<any>;
+    LeaveGroup(): Promise<any>;
+    SetGroupUniqueTitle(): Promise<any>;
+    GetStrangerProfileCard(): Promise<any>;
+    GetFriendList(): Promise<any>;
+    GetGroupInfo(): Promise<any>;
+    GetGroupList(): Promise<any>;
+    GetGroupMemberInfo(): Promise<any>;
+    GetGroupMemberList(): Promise<any>;
+    GetGroupHonor(): Promise<any>;
+}

package/lib/adapter/input/index.js

@@ -0,0 +1,188 @@
+import fs from 'fs';
+import { randomUUID } from 'crypto';
+import { listener } from '../../core/index.js';
+import { KarinMessage } from '../../event/index.js';
+import { config, common, YamlEditor } from '../../utils/index.js';
+const { enable, msgToFile, token: oldToken, ip } = config.Config.AdapterInput;
+let token = oldToken;
+if (oldToken === 'AdapterInput') {
+    try {
+        token = randomUUID();
+        const yaml = new YamlEditor('./config/config/config.yaml');
+        const data = yaml.get('AdapterInput');
+        if (!data) {
+            const yaml1 = new YamlEditor('./config/defSet/config.yaml');
+            const data1 = yaml1.get('AdapterInput');
+            data1.token = token;
+            yaml.set('AdapterInput', data1);
+        }
+        else {
+            data.token = token;
+            yaml.set('AdapterInput', data);
+        }
+        yaml.save();
+    }
+    catch (e) {
+        logger.error('AdapterInput token更换失败，请手动更换token');
+    }
+}
+// 清空文件夹
+fs.readdirSync('./temp/input').forEach((file) => {
+    fs.unlinkSync(`./temp/input/${file}`);
+});
+/**
+ * - 标准输入输出适配器
+ */
+export class AdapterInput {
+    #stdin;
+    socket;
+    account;
+    adapter;
+    version;
+    constructor() {
+        this.#stdin = false;
+        this.account = { uid: 'input', uin: 'input', name: 'input' };
+        this.adapter = { id: 'shell', name: 'input', type: 'internal', sub_type: 'internal', start_time: Date.now(), connect: '' };
+        this.version = { name: 'input', app_name: 'input', version: '1.0.0' };
+    }
+    get self_id() {
+        return this.account.uid;
+    }
+    stdin() {
+        if (this.#stdin)
+            return;
+        this.#stdin = true;
+        process.stdin.on('data', data => this.#input(data.toString()));
+        process.once('stdin.close', () => process.stdin.removeAllListeners('data'));
+    }
+    logger(level, ...args) {
+        logger.bot(level, this.account.uid || this.account.uin, ...args);
+    }
+    async #input(elements) {
+        const message = {
+            event: 'message',
+            self_id: 'input',
+            user_id: 'input',
+            time: Date.now(),
+            message_id: `input.${Date.now()}`,
+            message_seq: '',
+            sender: {
+                uid: 'input',
+                uin: 'input',
+                nick: 'input',
+                role: 'member',
+            },
+            elements: [{ type: 'text', text: elements }],
+            contact: {
+                scene: 'private',
+                peer: 'input',
+                sub_peer: '',
+            },
+            group_id: '',
+            raw_message: elements,
+        };
+        const e = new KarinMessage(message);
+        e.bot = this;
+        /**
+         * 快速回复 开发者不应该使用这个方法，应该使用由karin封装过后的reply方法
+         */
+        e.replyCallback = async (elements) => {
+            this.SendMessage(e.contact, elements);
+            return { message_id: e.message_id };
+        };
+        listener.emit('message', e);
+    }
+    async #MsgToFile(type, file) {
+        if (!msgToFile)
+            return '';
+        // 判断是否为string 如果是则继续判断是否为url、path
+        if (typeof file === 'string') {
+            if (file.startsWith('http'))
+                return file;
+            if (common.exists(file))
+                return file;
+        }
+        const buffer = await common.buffer(file);
+        // 生成文件名 根据type生成不同的文件后缀
+        const name = `${Date.now()}.${type === 'image' ? 'jpg' : type === 'voice' ? 'mp3' : 'file'}`;
+        // 写入文件
+        fs.writeFileSync(`./temp/input/${name}`, buffer);
+        return `[${type === 'image' ? '图片' : '语音'}: http://${ip}:${config.Server.http.port}/api/input?name=${name}&token=${token} ]`;
+    }
+    async GetVersion() {
+        const data = this.version;
+        delete data.name;
+        return data;
+    }
+    async SendMessage(_contact, elements) {
+        const text = [];
+        for (const v of elements) {
+            switch (v.type) {
+                case 'at':
+                    text.push(`@${v.uid}`);
+                    break;
+                case 'face':
+                    text.push(`[表情:${v.id}]`);
+                    break;
+                case 'text':
+                    text.push(v.text);
+                    break;
+                case 'image':
+                case 'voice':
+                    text.push(await this.#MsgToFile(v.type, v.file));
+                    break;
+                default:
+                    text.push(`[未知消息类型:${JSON.stringify(v)}]`);
+            }
+        }
+        this.logger('info', text.join(''));
+        return { message_id: 'input' };
+    }
+    getAvatarUrl() {
+        return 'https://p.qlogo.cn/gh/967068507/967068507/0';
+    }
+    getGroupAvatar() {
+        return 'https://p.qlogo.cn/gh/967068507/967068507/0';
+    }
+    async GetCurrentAccount() {
+        return { account_uid: 'input', account_uin: 'input', account_name: 'input' };
+    }
+    async GetEssenceMessageList() { throw new Error('Method not implemented.'); }
+    async DownloadForwardMessage() { throw new Error('Method not implemented.'); }
+    async SetEssenceMessage() { throw new Error('Method not implemented.'); }
+    async DeleteEssenceMessage() { throw new Error('Method not implemented.'); }
+    async SetFriendApplyResult() { throw new Error('Method not implemented.'); }
+    async SetGroupApplyResultRequest() { throw new Error('Method not implemented.'); }
+    async SetInvitedJoinGroupResult() { throw new Error('Method not implemented.'); }
+    async ReactMessageWithEmojiRequest() { throw new Error('Method not implemented.'); }
+    async UploadPrivateFile() { throw new Error('Method not implemented.'); }
+    async UploadGroupFile() { throw new Error('Method not implemented.'); }
+    async UploadForwardMessage() { throw new Error('Method not implemented.'); }
+    async sendForwardMessage() { throw new Error('Method not implemented.'); }
+    async SendMessageByResId() { throw new Error('Method not implemented.'); }
+    async RecallMessage() { throw new Error('Method not implemented.'); }
+    async GetMessage() { throw new Error('Method not implemented.'); }
+    async GetHistoryMessage() { throw new Error('Method not implemented.'); }
+    async VoteUser() { throw new Error('Method not implemented.'); }
+    async KickMember() { throw new Error('Method not implemented.'); }
+    async BanMember() { throw new Error('Method not implemented.'); }
+    async SetGroupWholeBan() { throw new Error('Method not implemented.'); }
+    async SetGroupAdmin() { throw new Error('Method not implemented.'); }
+    async ModifyMemberCard() { throw new Error('Method not implemented.'); }
+    async ModifyGroupName() { throw new Error('Method not implemented.'); }
+    async LeaveGroup() { throw new Error('Method not implemented.'); }
+    async SetGroupUniqueTitle() { throw new Error('Method not implemented.'); }
+    async GetStrangerProfileCard() { throw new Error('Method not implemented.'); }
+    async GetFriendList() { throw new Error('Method not implemented.'); }
+    async GetGroupInfo() { throw new Error('Method not implemented.'); }
+    async GetGroupList() { throw new Error('Method not implemented.'); }
+    async GetGroupMemberInfo() { throw new Error('Method not implemented.'); }
+    async GetGroupMemberList() { throw new Error('Method not implemented.'); }
+    async GetGroupHonor() { throw new Error('Method not implemented.'); }
+}
+if (enable) {
+    const bot = new AdapterInput();
+    bot.stdin();
+    /** 注册bot */
+    listener.emit('bot', { type: 'internal', bot });
+}

package/lib/adapter/onebot/onebot11.d.ts

@@ -1,17 +1,13 @@
 import WebSocket from 'ws';
 import { IncomingMessage } from 'http';
 import { KarinAdapter } from '../../types/adapter.js';
-import { Scene, contact, OneBot11Api, KarinElement, OneBot11Segment, CustomNodeSegment, OneBot11ApiParamsType } from '../../types/index.js';
+import { contact, OneBot11Api, KarinElement, OneBot11Segment, CustomNodeSegment, OneBot11ApiParamsType, GroupInfo, KarinNodeElement } from '../../types/index.js';
 /**
  * @class OneBot11
  * @extends KarinAdapter
  */
 export declare class OneBot11 implements KarinAdapter {
     #private;
-    /**
-     * 机器人QQ号
-     */
-    self_id: string;
     /**
      * - 重连次数 仅正向ws使用
      */
@@ -30,6 +26,7 @@ export declare class OneBot11 implements KarinAdapter {
      * @param connect - WebSocket连接地址
      */
     client(connect: string): Promise<void>;
+    get self_id(): string;
     /**
      * 获取当前登录号信息
      */
@@ -38,121 +35,14 @@ export declare class OneBot11 implements KarinAdapter {
     get isInit(): Promise<unknown>;
     /**
      * onebot11转karin
-     * @param {Array<{type: string, data: any}>} data onebot11格式消息
      * @return karin格式消息
      * */
-    AdapterConvertKarin(data: Array<OneBot11Segment>): (import("../../types/index.js").TextElement | import("../../types/index.js").AtElement | import("../../types/index.js").FaceElement | import("../../types/index.js").ReplyElement | import("../../types/index.js").ImageElement | import("../../types/index.js").VoiceElement | import("../../types/index.js").VideoElement | import("../../types/index.js").PokeElement | import("../../types/index.js").LocationElement | import("../../types/index.js").ForwardElement | import("../../types/index.js").ContactElement | import("../../types/index.js").JsonElement | import("../../types/index.js").XmlElement)[];
+    AdapterConvertKarin(data: Array<OneBot11Segment>): Array<KarinElement>;
     /**
      * karin转onebot11
      * @param data karin格式消息
-     * @return {Array<{type: string, data: any}>} onebot11格式消息
      * */
-    KarinConvertAdapter(data: Array<KarinElement>): (import("../../types/index.js").BubbleFaceElement | import("../../types/index.js").RecordElement | import("../../types/index.js").BasketballElement | import("../../types/index.js").DiceElement | import("../../types/index.js").RpsElement | import("../../types/index.js").WeatherElement | import("../../types/index.js").LocationElement | import("../../types/index.js").ShareElement | import("../../types/index.js").GiftElement | import("../../types/index.js").MarketFaceElement | import("../../types/index.js").ContactElement | import("../../types/index.js").RowElement | import("../../types/index.js").LongMsgElement | {
-        type: string;
-        data: {
-            text: string;
-            id?: undefined;
-            qq?: undefined;
-            file?: undefined;
-            data?: undefined;
-            magic?: undefined;
-            type?: undefined;
-        };
-    } | {
-        type: string;
-        data: {
-            id: number;
-            text?: undefined;
-            qq?: undefined;
-            file?: undefined;
-            data?: undefined;
-            magic?: undefined;
-            type?: undefined;
-        };
-    } | {
-        type: string;
-        data: {
-            qq: string;
-            text?: undefined;
-            id?: undefined;
-            file?: undefined;
-            data?: undefined;
-            magic?: undefined;
-            type?: undefined;
-        };
-    } | {
-        type: string;
-        data: {
-            id: string;
-            text?: undefined;
-            qq?: undefined;
-            file?: undefined;
-            data?: undefined;
-            magic?: undefined;
-            type?: undefined;
-        };
-    } | {
-        type: "file" | "video" | "image";
-        data: {
-            file: string;
-            text?: undefined;
-            id?: undefined;
-            qq?: undefined;
-            data?: undefined;
-            magic?: undefined;
-            type?: undefined;
-        };
-    } | {
-        type: "json" | "xml";
-        data: {
-            data: string;
-            text?: undefined;
-            id?: undefined;
-            qq?: undefined;
-            file?: undefined;
-            magic?: undefined;
-            type?: undefined;
-        };
-    } | {
-        type: string;
-        data: {
-            file: string;
-            magic: boolean;
-            text?: undefined;
-            id?: undefined;
-            qq?: undefined;
-            data?: undefined;
-            type?: undefined;
-        };
-    } | {
-        type: "markdown";
-        data: {
-            content: string;
-            custom_template_id: string;
-            params: Array<{
-                key: string;
-                values: Array<string>;
-            }>;
-            text?: undefined;
-            id?: undefined;
-            qq?: undefined;
-            file?: undefined;
-            data?: undefined;
-            magic?: undefined;
-            type?: undefined;
-        };
-    } | {
-        type: string;
-        data: {
-            type: number;
-            id: number;
-            text?: undefined;
-            qq?: undefined;
-            file?: undefined;
-            data?: undefined;
-            magic?: undefined;
-        };
-    })[];
+    KarinConvertAdapter(data: Array<KarinElement>): Array<OneBot11Segment>;
     /**
      * 专属当前Bot的日志打印方法
      */
@@ -202,36 +92,30 @@ export declare class OneBot11 implements KarinAdapter {
      * @param elements - nodes
      * @returns - 资源id
      * */
-    UploadForwardMessage(contact: {
-        scene: Scene;
-        peer: string;
-    }, elements: any[]): Promise<any>;
+    UploadForwardMessage(contact: contact, elements: KarinNodeElement[]): Promise<any>;
     /**
      * 通过资源id发送转发消息
      * @param contact - 联系人信息
      * @param id - 资源id
      * */
-    SendMessageByResId(contact: {
-        scene: Scene;
-        peer: string;
-    }, id: any): Promise<{
+    SendMessageByResId(contact: contact, id: string): Promise<{
         message_id: any;
         message_time: number;
     }>;
     /**
      * 撤回消息
-     * @param {null} [_contact] - ob11无需提供contact参数
+     * @param _contact - ob11无需提供contact参数
      * @param message_id - 消息ID
      * @returns {Promise<null>}
      */
     RecallMessage(_contact: contact, message_id: string): Promise<any>;
     /**
      * 获取消息
-     * @param {null} [_contact] - ob11无需提供contact参数
+     * @param _contact - ob11无需提供contact参数
      * @param message_id - 消息ID
      * @returns {Promise<object>} - 消息内容
      */
-    GetMessage(_contact: any, message_id: any): Promise<any>;
+    GetMessage(_contact: contact, message_id: string): Promise<any>;
     /**
      * 获取msg_id获取历史消息
      * @description 此api各平台实现不同，暂时废弃
@@ -242,7 +126,7 @@ export declare class OneBot11 implements KarinAdapter {
         message_seq: any;
         contact: contact;
         sender: any;
-        elements: (import("../../types/index.js").TextElement | import("../../types/index.js").AtElement | import("../../types/index.js").FaceElement | import("../../types/index.js").ReplyElement | import("../../types/index.js").ImageElement | import("../../types/index.js").VoiceElement | import("../../types/index.js").VideoElement | import("../../types/index.js").PokeElement | import("../../types/index.js").LocationElement | import("../../types/index.js").ForwardElement | import("../../types/index.js").ContactElement | import("../../types/index.js").JsonElement | import("../../types/index.js").XmlElement)[];
+        elements: KarinElement[];
     }[]>;
     /**
      * 获取合并转发消息
@@ -340,18 +224,8 @@ export declare class OneBot11 implements KarinAdapter {
      * 获取群信息
      * @param group_id - 群号
      * @param no_cache - 是否不使用缓存
-     * @returns {Promise<IGroupInfo>} - 群信息
-     */
-    GetGroupInfo(group_id: string, no_cache?: boolean): Promise<{
-        group_id: any;
-        group_name: any;
-        group_remark: any;
-        max_member_count: any;
-        member_count: any;
-        group_uin: any;
-        admins: any;
-        owner: any;
-    }>;
+     */
+    GetGroupInfo(group_id: string, no_cache?: boolean): Promise<GroupInfo>;
     /**
      * 获取群列表
      */

package/lib/adapter/onebot/onebot11.js

@@ -12,10 +12,6 @@ export class OneBot11 {
      * 是否初始化
      */
     #init = false;
-    /**
-     * 机器人QQ号
-     */
-    self_id;
     /**
      * - 重连次数 仅正向ws使用
      */
@@ -25,7 +21,6 @@ export class OneBot11 {
     adapter;
     version;
     constructor() {
-        this.self_id = '';
         this.index = 0;
         this.account = { uid: '', uin: '', name: '' };
         this.adapter = { id: 'QQ', name: 'OneBot11', type: 'ws', sub_type: 'internal', start_time: Date.now(), connect: '' };
@@ -108,6 +103,9 @@ export class OneBot11 {
         await this.getSelf();
         this.#init = true;
     }
+    get self_id() {
+        return this.account.uid || this.account.uin;
+    }
     /**
      * 获取当前登录号信息
      */
@@ -537,7 +535,6 @@ export class OneBot11 {
     }
     /**
      * onebot11转karin
-     * @param {Array<{type: string, data: any}>} data onebot11格式消息
      * @return karin格式消息
      * */
     AdapterConvertKarin(data) {
@@ -593,12 +590,9 @@ export class OneBot11 {
     /**
      * karin转onebot11
      * @param data karin格式消息
-     * @return {Array<{type: string, data: any}>} onebot11格式消息
      * */
     KarinConvertAdapter(data) {
         const elements = [];
-        // const selfUin = this.account.uin
-        // const selfNick = this.account.name
         for (const i of data) {
             switch (i.type) {
                 case 'text':
@@ -619,37 +613,35 @@ export class OneBot11 {
                     elements.push({ type: i.type, data: { file: i.file } });
                     break;
                 }
-                case 'xml':
+                case 'xml': {
+                    elements.push({ type: 'xml', data: { data: i.data } });
+                    break;
+                }
                 case 'json': {
-                    elements.push({ type: i.type, data: { data: i.data } });
+                    elements.push({ type: 'json', data: { data: i.data } });
                     break;
                 }
-                // case 'node': {
-                //   let { type, user_id = selfUin, nickname = selfNick, content } = i
-                //   content = this.KarinConvertAdapter(content)
-                //   elements.push({ type, data: { uin: user_id, name: nickname, content } })
-                //   break
-                // }
                 case 'forward': {
                     elements.push({ type: 'forward', data: { id: i.res_id } });
                     break;
                 }
+                case 'record':
                 case 'voice': {
                     elements.push({ type: 'record', data: { file: i.file, magic: i.magic || false } });
                     break;
                 }
                 case 'music': {
-                    // if (i.platform) {
-                    //   elements.push({ type: 'music', data: { type: i.platform, id: i.id } })
-                    // } else {
-                    //   const { url, audio, title, content, image } = i
-                    //   elements.push({ type: 'music', data: { type: 'custom', url, audio, title, content, image } })
-                    // }
+                    if (i.id) {
+                        elements.push({ type: 'music', data: { type: i.platform, id: i.id } });
+                    }
+                    else {
+                        const { url, audio, title, author, pic } = i;
+                        elements.push({ type: 'music', data: { type: 'custom', url, audio, title, content: author, image: pic } });
+                    }
                     break;
                 }
                 case 'button': {
-                    // todo
-                    // elements.push({ type: 'button', data: { buttons: i.buttons } })
+                    elements.push({ type: 'button', data: i.data });
                     break;
                 }
                 case 'markdown': {
@@ -657,19 +649,51 @@ export class OneBot11 {
                     elements.push({ type, data: { ...data } });
                     break;
                 }
-                // case 'rows': {
-                //   for (const val of i.rows) {
-                //     elements.push({ type: 'button', data: { buttons: val.buttons } })
-                //   }
-                //   break
-                // }
+                case 'rows': {
+                    for (const val of i.rows) {
+                        elements.push({ type: 'button', data: val.data });
+                    }
+                    break;
+                }
                 case 'poke': {
                     elements.push({ type: 'poke', data: { type: i.poke_type, id: i.id } });
                     break;
                 }
+                case 'bubble_face': {
+                    elements.push({ type: 'bubble_face', data: { id: i.id, count: i.count } });
+                    break;
+                }
+                case 'contact': {
+                    elements.push({ type: 'contact', data: { type: i.scene, id: i.peer } });
+                    break;
+                }
+                case 'location': {
+                    elements.push({ type: 'location', data: { lat: i.lat, lon: i.lon, title: i.title, content: i.address } });
+                    break;
+                }
+                case 'long_msg':
+                case 'basketball':
+                case 'dice':
+                case 'market_face':
+                case 'rps': {
+                    elements.push({ type: i.type, data: { id: i.id } });
+                    break;
+                }
+                case 'gift': {
+                    elements.push({ type: 'gift', data: { qq: i.qq, id: i.id } });
+                    break;
+                }
+                case 'share': {
+                    elements.push({ type: 'share', data: { url: i.url, title: i.title, content: i.content, image: i.image } });
+                    break;
+                }
+                case 'weather': {
+                    elements.push({ type: 'weather', data: { city: i.city, type: i.type } });
+                    break;
+                }
                 default: {
                     elements.push(i);
-                    logger.info(i);
+                    break;
                 }
             }
         }
@@ -750,7 +774,14 @@ export class OneBot11 {
         }
         const { scene, peer } = contact;
         const message_type = scene === 'group' ? 'group_id' : 'user_id';
-        const messages = this.KarinConvertAdapter(elements);
+        const messages = [];
+        const selfUin = this.account.uin;
+        const selfNick = this.account.name;
+        for (const i of elements) {
+            const { type, user_id, nickname, content: contents } = i;
+            const content = this.KarinConvertAdapter(contents);
+            messages.push({ type, data: { uin: user_id || selfUin, name: nickname || selfNick, content } });
+        }
         const params = { [message_type]: String(peer), messages };
         return await this.SendApi('send_forward_msg', params);
     }
@@ -770,7 +801,7 @@ export class OneBot11 {
     }
     /**
      * 撤回消息
-     * @param {null} [_contact] - ob11无需提供contact参数
+     * @param _contact - ob11无需提供contact参数
      * @param message_id - 消息ID
      * @returns {Promise<null>}
      */
@@ -779,7 +810,7 @@ export class OneBot11 {
     }
     /**
      * 获取消息
-     * @param {null} [_contact] - ob11无需提供contact参数
+     * @param _contact - ob11无需提供contact参数
      * @param message_id - 消息ID
      * @returns {Promise<object>} - 消息内容
      */
@@ -991,22 +1022,8 @@ export class OneBot11 {
      * 获取群信息
      * @param group_id - 群号
      * @param no_cache - 是否不使用缓存
-     * @returns {Promise<IGroupInfo>} - 群信息
      */
     async GetGroupInfo(group_id, no_cache = false) {
-        /**
-         * @type {{
-         *   group_id: number,
-         *   group_name: string,
-         *   group_memo: string,
-         *   group_remark: string,
-         *   group_create_time: number,
-         *   group_level: number,
-         *   member_count: number,
-         *   max_member_count: number,
-         *   admins: number[]
-         * }}
-         */
         const groupInfo = await this.SendApi('get_group_info', { group_id, no_cache });
         return {
             group_id: groupInfo.group_id,

package/lib/core/index.d.ts

@@ -7,3 +7,4 @@ export * from './plugin.app.js';
 export * from './plugin.loader.js';
 export * from './process.js';
 export * from './server.js';
+import '../adapter/input/index.js';

package/lib/core/index.js

@@ -7,3 +7,4 @@ export * from './plugin.app.js'
 export * from './plugin.loader.js'
 export * from './process.js'
 export * from './server.js'
+import '../adapter/input/index.js'

package/lib/core/listener.js

@@ -2,6 +2,8 @@ import { EventEmitter } from 'events'
 import { pluginLoader } from './plugin.loader.js'
 import { common, logger, config } from '../utils/index.js'
 import { MessageHandler } from '../event/message.handler.js'
+import NoticeHandler from '../event/notice.handler.js'
+import RequestHandler from '../event/request.handler.js'
 /**
  * 监听器管理
  */
@@ -33,11 +35,13 @@ class Listeners extends EventEmitter {
       this.addAdapter(data)
     })
     this.on('bot', data => {
-      this.addBot(data)
+      if (!this.addBot(data)) { return }
       logger.info(`[机器人][注册][${data.type}] ` + logger.green(`[account:${data.bot.account.uid || data.bot.account.uin}(${data.bot.account.name})]`))
       this.emit('karin:online', data.bot.account.uid || data.bot.account.uin)
     })
     this.on('message', data => new MessageHandler(data))
+    this.on('notice', data => new NoticeHandler(data))
+    this.on('request', data => new RequestHandler(data))
   }
 
   /**
@@ -47,7 +51,7 @@ class Listeners extends EventEmitter {
     this.index++
     const index = this.index
     if (!data.bot) {
-      logger.error('[Bot管理][注册] 注册失败: Bot实例不能为空')
+      logger.error('[Bot管理][注册] 注册失败: Bot实例不能为空', JSON.stringify(data))
       return false
     }
     this.list.push({ index, type: data.type, bot: data.bot })

package/lib/core/server.js

@@ -76,6 +76,32 @@ export const server = new (class Server {
           process.exit()
         }
       })
+      /** 控制台适配器 */
+      this.app.get('/api/input', (req, res) => {
+        const name = req.query.name
+        const token = req.query.token
+        if (!name || !token) {
+          logger.error('[HTTP][input] 缺少参数', req.query)
+          return res.status(403).json({ error: '禁止访问', message: '缺少参数' })
+        }
+        // 禁止键入向上级目录
+        if (name.includes('/')) {
+          logger.error('[HTTP][input] 无效的文件名', name)
+          return res.status(403).json({ error: '禁止访问', message: '无效的文件名' })
+        }
+        const CfgToken = config.Config.AdapterInput.token
+        if (CfgToken === 'AdapterInput' || CfgToken !== token) {
+          logger.error('[HTTP][input] 无效的令牌', token)
+          return res.status(403).json({ error: '禁止访问', message: '无效的令牌' })
+        }
+        const file = process.cwd() + `/temp/input/${name}`
+        if (!fs.existsSync(file)) {
+          logger.error('[HTTP][input] 文件不存在', file)
+          return res.status(404).json({ error: '文件不存在', message: '找不到指定文件' })
+        }
+        logger.info(`${logger.yellow('[HTTP][input]')} ${logger.green(token)} file:${file}`)
+        res.sendFile(file)
+      })
       /** 监听端口 */
       const { host, port } = config.Server.http
       this.server.listen(port, host, () => {

package/lib/event/event.handler.js

@@ -120,7 +120,7 @@ export default class EventHandler {
       if (this.e.isGroup) {
         review.GroupMsgPrint(this.e) && logger.bot('info', this.e.self_id, `${logger.green(`Send Group ${this.e.group_id}: `)}${ReplyLog}`)
       } else {
-        logger.bot('info', this.e.self_id, `${logger.green(`Send private ${this.e.user_id}: `)}${ReplyLog}`)
+        this.e.self_id === 'input' && logger.bot('info', this.e.self_id, `${logger.green(`Send private ${this.e.user_id}: `)}${ReplyLog}`)
       }
       let message_id = ''
       try {

package/lib/event/event.js

@@ -101,7 +101,7 @@ export class KarinEvent {
   constructor ({ event, self_id, user_id, group_id = '', time, contact, sender, sub_event, event_id }) {
     this.self_id = self_id
     this.user_id = user_id
-    this.group_id = group_id
+    this.group_id = contact.scene === 'group' ? (contact.peer || group_id) : group_id
     this.time = time
     this.event = event
     this.event_id = event_id

package/lib/index.d.ts

@@ -29,13 +29,14 @@ export declare const Renderer: {
 export declare const Cfg: {
     dir: string;
     _path: string;
-    _pathDef: string;
+    npmCfgDir: string;
     change: Map<string, any>;
     watcher: Map<string, any>;
     review: boolean;
     logger: import("log4js").Logger;
     initCfg(): Promise<void>;
     getPlugins(): string[];
+    checkPath(path: string): void;
     dirPath(name: string, plugins: string[]): Promise<void>;
     timeout(type?: "ws" | "grpc"): number;
     readonly redis: import("./types/index.js").Redis;

package/lib/types/adapter.d.ts

@@ -50,7 +50,7 @@ export interface KarinAdapter {
         /**
          * - 适配器名称
          */
-        name: 'ICQQ' | 'OneBot11' | 'OntBot12' | 'Kritor' | string;
+        name: 'ICQQ' | 'OneBot11' | 'OntBot12' | 'Kritor' | 'input' | string;
         /**
          * - 适配器类型
          */

package/lib/types/config.d.ts

@@ -130,6 +130,27 @@ export interface Config {
      * 管理员列表
      */
     admin: string[];
+    /**
+     *
+     */
+    AdapterInput: {
+        /**
+         * - 是否开启input适配器
+         */
+        enable: boolean;
+        /**
+         * - 是否将语音、图片、视频消息转为文件 转为文件后可通过url访问
+         */
+        msgToFile: boolean;
+        /**
+         * - url访问token 如果为 AdapterInput 每次启动后会重新生成
+         */
+        token: string;
+        /**
+         * - ip地址
+         */
+        ip: string;
+    };
     /**
      * 黑名单相关
      */

package/lib/utils/common.d.ts

@@ -77,7 +77,7 @@ export declare const common: {
      * @param - 为true时，http地址会直接返回，否则会下载文件并转换为base64字符串
      * @returns 返回base64字符串
      */
-    base64(file: string | Buffer | Readable, options?: {
+    base64(file: any, options?: {
         http: boolean;
     }): Promise<string>;
     /**
@@ -88,12 +88,11 @@ export declare const common: {
     stream(stream: Readable): Promise<Buffer>;
     /**
      * 将文件转换为Buffer对象
-     * @param {string|Buffer|http|stream.Readable} file - 文件路径或Buffer对象、可读流对象、http地址、base64://字符串
-     * @param {object} options - 附加数据
-     * @param {boolean} options.http - 为true时，http地址会直接返回，否则会下载文件并转换为Buffer对象
-     * @returns {Promise<Buffer>} - 返回Buffer对象
+     * @param file - 文件路径或Buffer对象、可读流对象、http地址、base64://字符串
+     * @param options - 选项
+     * @returns - 返回Buffer对象
      */
-    buffer(file: string | Buffer | Readable, options?: {
+    buffer(file: any, options?: {
         http: boolean;
     }): Promise<Buffer | Error | string>;
     /**

package/lib/utils/common.js

@@ -233,10 +233,9 @@ export const common = new (class Common {
 
   /**
      * 将文件转换为Buffer对象
-     * @param {string|Buffer|http|stream.Readable} file - 文件路径或Buffer对象、可读流对象、http地址、base64://字符串
-     * @param {object} options - 附加数据
-     * @param {boolean} options.http - 为true时，http地址会直接返回，否则会下载文件并转换为Buffer对象
-     * @returns {Promise<Buffer>} - 返回Buffer对象
+     * @param file - 文件路径或Buffer对象、可读流对象、http地址、base64://字符串
+     * @param options - 选项
+     * @returns - 返回Buffer对象
      */
   async buffer (file, options = { http: false }) {
     if (typeof file !== 'string') {

package/lib/utils/config.d.ts

@@ -6,7 +6,7 @@ import { Redis, App, Config, Server, Package, GroupCfg } from '../types/index.js
 export declare const config: {
     dir: string;
     _path: string;
-    _pathDef: string;
+    npmCfgDir: string;
     change: Map<string, any>;
     watcher: Map<string, any>;
     review: boolean;
@@ -14,6 +14,10 @@ export declare const config: {
     /** 初始化配置 */
     initCfg(): Promise<void>;
     getPlugins(): string[];
+    /**
+     * 检查路径是否存在 不存在则创建
+     */
+    checkPath(path: string): void;
     /**
      * 为每一个插件建立对应的文件夹
      */

package/lib/utils/config.js

@@ -6,7 +6,7 @@ import { fs, yaml as Yaml, chokidar } from '../modules.js'
 export const config = new (class Cfg {
   dir
   _path
-  _pathDef
+  npmCfgDir
   change
   watcher
   review
@@ -14,7 +14,7 @@ export const config = new (class Cfg {
   constructor () {
     this.dir = karinDir
     this._path = process.cwd() + '/config'
-    this._pathDef = this.dir + '/config/defSet'
+    this.npmCfgDir = this.dir + '/config/defSet'
     /** 缓存 */
     this.change = new Map()
     /** 监听文件 */
@@ -26,18 +26,23 @@ export const config = new (class Cfg {
 
   /** 初始化配置 */
   async initCfg () {
-    if (!fs.existsSync(this._path)) { fs.mkdirSync(this._path) }
-    this._path = process.cwd() + '/config/config'
-    if (!fs.existsSync(this._path)) { fs.mkdirSync(this._path) }
-    const files = fs.readdirSync(this._pathDef).filter(file => file.endsWith('.yaml'))
-    for (const file of files) {
-      const path = `${this._path}/${file}`
-      const pathDef = `${this._pathDef}/${file}`
-      if (!fs.existsSync(path)) { fs.copyFileSync(pathDef, path) }
+    const list = [
+      this._path,
+      this._path + '/config',
+      process.cwd() + '/temp/input',
+      './plugins',
+      './plugins/karin-plugin-example',
+    ]
+    list.forEach(path => this.checkPath(path))
+    if (this.npmCfgDir !== (this._path + '/defSet').replace(/\\/g, '/')) {
+      const files = fs.readdirSync(this.npmCfgDir).filter(file => file.endsWith('.yaml'))
+      files.forEach(file => {
+        const path = `${this._path}/config/${file}`
+        const pathDef = `${this.npmCfgDir}/${file}`
+        if (!fs.existsSync(path)) { fs.copyFileSync(pathDef, path) }
+      })
     }
     // 创建插件文件夹文件夹
-    if (!fs.existsSync('./plugins')) { fs.mkdirSync('./plugins') }
-    if (!fs.existsSync('./plugins/karin-plugin-example')) { fs.mkdirSync('./plugins/karin-plugin-example') }
     const plugins = this.getPlugins()
     this.dirPath('data', plugins)
     this.dirPath('temp', plugins)
@@ -52,15 +57,22 @@ export const config = new (class Cfg {
     return files.filter(file => file.isDirectory() && (file.name.startsWith('karin-plugin-'))).map(dir => dir.name)
   }
 
+  /**
+     * 检查路径是否存在 不存在则创建
+     */
+  checkPath (path) {
+    if (!fs.existsSync(path)) { fs.mkdirSync(path) }
+  }
+
   /**
      * 为每一个插件建立对应的文件夹
      */
   async dirPath (name, plugins) {
     name = `./${name}`
-    if (!fs.existsSync(name)) { fs.mkdirSync(name) }
+    this.checkPath(name)
     for (const plugin of plugins) {
       const path = `${name}/${plugin}`
-      if (!fs.existsSync(path)) { fs.mkdirSync(path) }
+      this.checkPath(path)
     }
   }
 

package/lib/utils/yamlEditor.d.ts

@@ -14,7 +14,7 @@ export declare class YamlEditor {
      * @param path - 路径，用点号分隔，例如：'a.b.c'
      * @param value - 要设置的值
      */
-    set(path: string | string[], value: string): null | undefined;
+    set(path: string | string[], value: string | boolean): null | undefined;
     /**
      * 向指定路径添加新值
      * @param path - 路径，用点号分隔，例如：'a.b.c'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-karin",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "private": false,
   "description": "基于 Kritor 进行开发的nodejs机器人框架",
   "homepage": "https://github.com/KarinJS/Karin",
@@ -59,6 +59,7 @@
   "dependencies": {
     "@grpc/grpc-js": "1.10.10",
     "@grpc/proto-loader": "0.7.13",
+    "@inquirer/prompts": "^5.0.7",
     "art-template": "4.13.2",
     "axios": "1.7.2",
     "chalk": "5.3.0",