alemonjs 1.0.51 → 1.0.53

package/lib/client/types.js

@@ -0,0 +1 @@
+export {};

package/lib/client/typing.js

@@ -0,0 +1 @@
+export {};

package/lib/config/login.js

@@ -6,6 +6,7 @@ import { defineKOOK as kook } from '../kook/kook.js';
 import { defineVILLA as villa } from '../villa/villa.js';
 import { defineQQ as qq } from '../qq/qq.js';
 import { defineNtqq as ntqq } from '../ntqq/ntqq.js';
+import { defineOne as one } from '../one/one.js';
 /**
  * *************
  * defset-config
@@ -19,7 +20,8 @@ const config = {
     qq,
     ntqq,
     server,
-    puppeteer
+    puppeteer,
+    one
 };
 /**
  * 设置机器人基础配置

package/lib/core/ip.js

@@ -4,11 +4,12 @@ let myIp;
  * 得到本机IP地址
  * @returns
  */
-export async function getIP() {
+export async function getIP(options = {}) {
     if (myIp)
         return myIp;
     return await publicIp({
-        timeout: 10000
+        onlyHttps: true,
+        ...options
     }).then(ip => {
         if (/^(\d{1,3}\.){3}\d{1,3}$/.test(ip))
             myIp = ip;

package/lib/core/typings.js

@@ -9,7 +9,8 @@ export const PlatformEnum = [
     'wechat',
     'telegram',
     'dodo',
-    'discord'
+    'discord',
+    'one'
 ];
 /**
  * 消息枚举

package/lib/define/main.js

@@ -4,7 +4,7 @@ import { nodeScripts } from './child_process.js';
 import { AvailableIntentsEventsEnum } from 'qq-guild-bot';
 import { ClientNTQQ } from '../ntqq/sdk/index.js';
 import { command } from './command.js';
-import { createApp, setLanchConfig, loadInit, appsInit, setAppProCoinfg, startChrom } from '../core/index.js';
+import { createApp, setLanchConfig, loadInit, appsInit, setAppProCoinfg, startChrom, getIP } from '../core/index.js';
 import { getPupPath, setBotConfigByKey, getBotConfigByKey } from '../config/index.js';
 import { createWeb } from '../koa/index.js';
 import { autoClearImages } from '../koa/img.js';
@@ -130,6 +130,10 @@ export async function defineAlemonConfig(Options) {
             // 自定义覆盖
             setBotConfigByKey('villa', Options.login.villa);
         }
+        if (Options.login?.one) {
+            // 自定义覆盖
+            setBotConfigByKey('one', Options.login.one);
+        }
         for (const item in Options.login) {
             if (arr.indexOf(item) != -1)
                 continue;
@@ -155,8 +159,12 @@ export async function defineAlemonConfig(Options) {
     if (Options?.server?.state != false) {
         // 创建server端
         createWeb(Options?.server);
-        // 定时清除
-        autoClearImages();
+        if (Options?.server?.clear != false) {
+            // 定时清除
+            autoClearImages();
+        }
+        // 缓存ip
+        getIP();
     }
     /**
      * ***********

package/lib/define/map.js

@@ -8,7 +8,7 @@ export const rebotMap = {
         const { createAlemonByQQ: qq } = await import('../qq/index.js');
         return qq().catch(err => {
             console.error(err);
-            console.error('QQ bot open err');
+            console.error('QQ BOT open err');
             return false;
         });
     },
@@ -16,7 +16,7 @@ export const rebotMap = {
         const { createAlemonByVilla: villa } = await import('../villa/index.js');
         return villa().catch(err => {
             console.error(err);
-            console.error('VILLA bot open err');
+            console.error('VILLA BOT open err');
             return false;
         });
     },
@@ -24,7 +24,7 @@ export const rebotMap = {
         const { createAlemonByKOOK: kook } = await import('../kook/index.js');
         return kook().catch(err => {
             console.error(err);
-            console.error('KOOK bot open err');
+            console.error('KOOK BOT open err');
             return false;
         });
     },
@@ -32,7 +32,15 @@ export const rebotMap = {
         const { createAlemonByNtqq: ntqq } = await import('../ntqq/index.js');
         return ntqq().catch(err => {
             console.error(err);
-            console.error('NTQQ bot open err');
+            console.error('NTQQ BOT open err');
+            return false;
+        });
+    },
+    one: async () => {
+        const { createAlemonByONE: one } = await import('../one/index.js');
+        return one().catch(err => {
+            console.error(err);
+            console.error('ONE BOT open err');
             return false;
         });
     }

package/lib/koa/img.js

@@ -56,10 +56,13 @@ export async function setLocalImg(img) {
     const imgSize = getServerConfig('imgSize');
     const port = getServerConfig('port');
     const http = getServerConfig('http');
-    let ip = await getIP();
-    const ipp = getServerConfig('ip');
-    if (ipp != 'localhost')
-        ip = ipp;
+    let ip = getServerConfig('ip');
+    if (ip == 'localhost') {
+        const ipp = await getIP();
+        if (ipp)
+            ip = ipp;
+    }
+    console.log('测试1');
     // 生成文件名
     const filename = `${Math.floor(Math.random() * imgSize)}.${(await fileTypeFromBuffer(img))?.ext}`;
     // 文件路径

package/lib/kook/alemon/segment.js

@@ -1,3 +1,4 @@
+import { getPathBuffer } from '../../core/buffer.js';
 export const segmentKOOK = {
     /**
      * 艾特某人
@@ -14,6 +15,7 @@ export const segmentKOOK = {
     atAll: () => {
         return `(met)all(met)`;
     },
+    img: getPathBuffer,
     /**
      * 标注GET请求
      * @returns

package/lib/ntqq/alemon/message/C2C_MESSAGE_CREATE.js

@@ -1,6 +1,6 @@
 import { InstructionMatching, getUrlbuffer } from '../../../core/index.js';
 import { ClientNTQQ } from '../../sdk/index.js';
-import { segmentQQ } from '../segment.js';
+import { segmentNTQQ } from '../segment.js';
 import { getBotMsgByNtqq } from '../bot.js';
 import IMGS from 'image-size';
 import { ClientKOA } from '../../../koa/index.js';
@@ -56,7 +56,7 @@ export const C2C_MESSAGE_CREATE = async (event) => {
                 const url = await ClientKOA.setLocalImg(msg[isBuffer]);
                 if (!url)
                     return false;
-                return await ClientNTQQ.postMessageByUser(event.author.user_openid, `${cont}  ![text #${dimensions.width}px #${dimensions.height}px](${url})`, select?.quote).catch(everyoneError);
+                return await ClientNTQQ.postMessageByUser(event.author.user_openid, `${cont}  ![text #${dimensions.width}px #${dimensions.height}px](${url})`, event.id).catch(everyoneError);
             }
             catch (err) {
                 console.error(err);
@@ -86,7 +86,7 @@ export const C2C_MESSAGE_CREATE = async (event) => {
                 return await ClientNTQQ.postFilesByUsers(event.author.user_openid, url).catch(everyoneError);
             }
         }
-        return await ClientNTQQ.postMessageByUser(event.author.user_openid, content, select?.quote).catch(everyoneError);
+        return await ClientNTQQ.postMessageByUser(event.author.user_openid, content, event.id).catch(everyoneError);
     };
     e.replyCard = async (arr) => {
         for (const item of arr) {
@@ -137,7 +137,7 @@ export const C2C_MESSAGE_CREATE = async (event) => {
     e.user_name = '柠檬冲水';
     e.channel_id = event.author.user_openid; // 私聊重置为用户open编号
     e.guild_id = event.author.user_openid;
-    e.segment = segmentQQ;
+    e.segment = segmentNTQQ;
     e.at_users = [];
     e.at_user = {
         id: '0',

package/lib/ntqq/alemon/message/GROUP_AT_MESSAGE_CREATE.js

@@ -1,6 +1,6 @@
 import { InstructionMatching, getUrlbuffer } from '../../../core/index.js';
 import { ClientNTQQ } from '../../sdk/index.js';
-import { segmentQQ } from '../segment.js';
+import { segmentNTQQ } from '../segment.js';
 import { getBotMsgByNtqq } from '../bot.js';
 import { getBotConfigByKey } from '../../../config/index.js';
 import { ClientKOA } from '../../../koa/index.js';
@@ -62,7 +62,7 @@ export const GROUP_AT_MESSAGE_CREATE = async (event) => {
                 const url = await ClientKOA.setLocalImg(msg[isBuffer]);
                 if (!url)
                     return false;
-                return await ClientNTQQ.postMessageByGroup(event.group_id, `${cont} ![text #${dimensions.width}px #${dimensions.height}px](${url})`, select?.quote).catch(everyoneError);
+                return await ClientNTQQ.postMessageByGroup(event.group_id, `${cont} ![text #${dimensions.width}px #${dimensions.height}px](${url})`, event.id).catch(everyoneError);
             }
             catch (err) {
                 console.error(err);
@@ -92,7 +92,7 @@ export const GROUP_AT_MESSAGE_CREATE = async (event) => {
                 return await ClientNTQQ.postFilesByGroup(event.group_id, url).catch(everyoneError);
             }
         }
-        return await ClientNTQQ.postMessageByGroup(event.group_id, content, select?.quote).catch(everyoneError);
+        return await ClientNTQQ.postMessageByGroup(event.group_id, content, event.id).catch(everyoneError);
     };
     e.replyCard = async (arr) => {
         for (const item of arr) {
@@ -165,7 +165,7 @@ export const GROUP_AT_MESSAGE_CREATE = async (event) => {
     /**
      * 模块
      */
-    e.segment = segmentQQ;
+    e.segment = segmentNTQQ;
     /**
      * 被艾特的用户
      */

package/lib/ntqq/alemon/segment.js

@@ -1,4 +1,5 @@
-export const segmentQQ = {
+import { getPathBuffer } from '../../core/buffer.js';
+export const segmentNTQQ = {
     /**
      * 艾特某人
      * @param uid
@@ -15,6 +16,7 @@ export const segmentQQ = {
     atAll: () => {
         return '@everyone';
     },
+    img: getPathBuffer,
     /**
      * 标注GET请求
      * @returns

package/lib/one/alemon/bot.js

@@ -0,0 +1,11 @@
+let bot = {
+    id: '',
+    name: '',
+    avatar: 'string'
+};
+export function setBotMsgByONE(val) {
+    bot = val;
+}
+export function getBotMsgByONE() {
+    return bot;
+}

package/lib/one/alemon/conversation.js

@@ -0,0 +1,26 @@
+import { setBotMsgByONE } from './bot.js';
+import { DIRECT_MESSAGE } from './message/DIRECT_MESSAGE.js';
+import { MESSAGES } from './message/MESSAGES.js';
+/**
+ * 会话控制
+ */
+export const conversation = {
+    meta: async (socket, event) => {
+        if (event.status && event.status.bots) {
+            const bot = event.status.bots[0];
+            setBotMsgByONE({
+                id: bot.self.user_id,
+                name: bot.self.nickname,
+                avatar: 'string' // 头像是什么
+            });
+        }
+    },
+    message: async (socket, event) => {
+        if (event.detail_type == 'private') {
+            DIRECT_MESSAGE(socket, event);
+        }
+        else {
+            MESSAGES(socket, event);
+        }
+    }
+};

package/lib/one/alemon/message/DIRECT_MESSAGE.js

@@ -0,0 +1,296 @@
+import { getBotConfigByKey } from '../../../config/index.js';
+import { InstructionMatching, getUrlbuffer } from '../../../core/index.js';
+import { getBotMsgByONE } from '../bot.js';
+import { segmentONE } from '../segment.js';
+import { AlemonJSError, AlemonJSLog } from '../../../log/index.js';
+/**
+ * 公信事件
+ * @param socket
+ * @param event
+ * @returns
+ */
+export async function DIRECT_MESSAGE(socket, event) {
+    const cfg = getBotConfigByKey('one');
+    const masterID = cfg.masterID;
+    const e = {
+        platform: 'one',
+        bot: getBotMsgByONE(),
+        isMaster: event.user_id == masterID ? true : false,
+        event: 'MESSAGES',
+        eventType: 'CREATE',
+        // 撤回
+        isRecall: false,
+        boundaries: 'publick',
+        isGroup: event.detail_type == 'private' ? true : false,
+        // 是私
+        isPrivate: event.detail_type == 'private' ? true : false,
+        // 是私聊
+        attribute: event.detail_type == 'private' ? 'single' : 'group'
+    };
+    /**
+     * 消息发送机制
+     * @param msg 消息
+     * @param img
+     * @returns
+     */
+    e.reply = async (msg, select) => {
+        // is buffer
+        if (Buffer.isBuffer(msg)) {
+            try {
+                socket.send(JSON.stringify({
+                    // 行为 发送消息
+                    action: 'send_message',
+                    params: {
+                        // 私聊回复
+                        detail_type: event.detail_type,
+                        // 用户
+                        user_id: event.user_id,
+                        // 消息体
+                        message: [
+                            {
+                                type: 'image',
+                                data: {
+                                    file_id: `base64://${msg.toString('base64')}`
+                                }
+                            }
+                        ]
+                    },
+                    echo: '1234'
+                }));
+                return false;
+            }
+            catch (err) {
+                console.error(err);
+                return err;
+            }
+        }
+        if (Array.isArray(msg) && msg.find(item => Buffer.isBuffer(item))) {
+            const isBuffer = msg.findIndex(item => Buffer.isBuffer(item));
+            const cont = msg
+                .map(item => {
+                if (typeof item === 'number')
+                    return String(item);
+                return item;
+            })
+                .filter(element => typeof element === 'string')
+                .join('');
+            try {
+                const buff = msg[isBuffer];
+                socket.send(JSON.stringify({
+                    // 行为 发送消息
+                    action: 'send_message',
+                    params: {
+                        // 私聊回复
+                        detail_type: event.detail_type,
+                        // 用户
+                        user_id: event.user_id,
+                        // 消息体
+                        message: [
+                            {
+                                type: 'text',
+                                data: {
+                                    text: cont
+                                }
+                            },
+                            {
+                                type: 'image',
+                                data: {
+                                    file_id: `base64://${buff.toString('base64')}`
+                                }
+                            }
+                        ]
+                    },
+                    echo: '1234'
+                }));
+                return false;
+            }
+            catch (err) {
+                console.error(err);
+                return err;
+            }
+        }
+        const content = Array.isArray(msg)
+            ? msg.join('')
+            : typeof msg === 'string'
+                ? msg
+                : typeof msg === 'number'
+                    ? `${msg}`
+                    : '';
+        if (content == '')
+            return false;
+        /**
+         * http
+         */
+        const match = content.match(/<http>(.*?)<\/http>/);
+        if (match) {
+            const getUrl = match[1];
+            const msg = await getUrlbuffer(getUrl);
+            if (Buffer.isBuffer(msg)) {
+                if (event.detail_type == 'private') {
+                    socket.send(JSON.stringify({
+                        // 行为 发送消息  send_group_msg
+                        action: 'send_message',
+                        params: {
+                            // 私聊回复
+                            detail_type: event.detail_type,
+                            // 用户
+                            user_id: event.user_id,
+                            // 消息体
+                            message: [
+                                {
+                                    type: 'image',
+                                    data: {
+                                        file_id: `base64://${msg.toString('base64')}`
+                                    }
+                                }
+                            ]
+                        },
+                        echo: '1234'
+                    }));
+                }
+                else {
+                    // 群聊
+                    socket.send(JSON.stringify({
+                        action: 'send_group_msg',
+                        params: {
+                            group_id: '',
+                            // 消息体
+                            message: [
+                                {
+                                    type: 'image',
+                                    data: {
+                                        file_id: `base64://${msg.toString('base64')}`
+                                    }
+                                }
+                            ]
+                        },
+                        echo: '1234'
+                    }));
+                }
+            }
+        }
+        /**
+         * 需要增加解析器
+         * <@xxxx>  <@everyone>
+         */
+        socket.send(JSON.stringify({
+            // 行为 发送消息
+            action: 'send_message',
+            params: {
+                // 私聊回复
+                detail_type: event.detail_type,
+                // 用户
+                user_id: event.user_id,
+                // 消息体
+                message: [
+                    {
+                        type: 'text',
+                        data: {
+                            text: content
+                        }
+                    }
+                ]
+            },
+            echo: '1234'
+        }));
+        return true;
+    };
+    e.replyCard = async (arr) => {
+        for (const item of arr) {
+            try {
+                if (item.type == 'qq_ark' || item.type == 'qq_embed') {
+                    console.info('temporarily unavailable');
+                    return false;
+                }
+                return false;
+            }
+            catch (err) {
+                console.error(err);
+                return err;
+            }
+        }
+        return true;
+    };
+    /**
+     * 发送表情表态
+     * @param mid
+     * @param boj { emoji_type: number; emoji_id: string }
+     * @returns
+     */
+    e.replyEmoji = async (mid, boj) => {
+        console.info('temporarily unavailable');
+        return false;
+    };
+    /**
+     * 删除表情表态
+     * @param mid
+     * @param boj { emoji_type: number; emoji_id: string }
+     * @returns
+     */
+    e.deleteEmoji = async (mid, boj) => {
+        console.info('temporarily unavailable');
+        return false;
+    };
+    /**
+     * 消息原文
+     */
+    e.msg_txt = event.raw_message;
+    /**
+     * 消息
+     */
+    e.msg = event.raw_message.trim();
+    /**
+     * 消息编号
+     */
+    e.msg_id = event.message_id;
+    /**
+     * 用户编号
+     */
+    e.user_id = event.user_id;
+    /**
+     * 用户头像
+     */
+    e.user_avatar =
+        event.platform == 'qq'
+            ? `https://q1.qlogo.cn/g?b=qq&s=0&nk=${event.user_id}`
+            : 'https://q1.qlogo.cn/g?b=qq&s=0&nk=1715713638';
+    /**
+     * 用户名
+     */
+    e.user_name = event.sender.nickname;
+    /**
+     * 子频道编号
+     */
+    e.channel_id = '';
+    /**
+     * 频道编号
+     */
+    e.guild_id = '';
+    /**
+     * 模块
+     */
+    e.segment = segmentONE;
+    /**
+     * 被艾特的用户
+     */
+    e.at_users = [];
+    /**
+     * 艾特消息处理
+     */
+    e.at = false;
+    /**
+     * 存在at
+     */
+    if (e.at) {
+        /**
+         * 得到第一个艾特
+         */
+        e.at_user = e.at_users.find(item => item.bot != true);
+    }
+    /**
+     * 业务处理
+     */
+    return await InstructionMatching(e)
+        .then(() => AlemonJSLog(e.channel_id, e.user_name, e.msg_txt))
+        .catch(err => AlemonJSError(err, e.channel_id, e.user_name, e.msg_txt));
+}