alemonjs 1.0.47 → 1.0.48

package/lib/core/buffer.js

@@ -1,38 +1,39 @@
-import { readFileSync } from 'fs';
-import http from 'http';
-import https from 'https';
+import { existsSync, readFileSync } from 'fs';
+import axios from 'axios';
 import { join } from 'path';
 /**
  * 异步请求图片
  * @param url 网络地址
  * @returns buffer
  */
-export function getUrlbuffer(url) {
-    return new Promise((resolve, reject) => {
-        const protocol = url.startsWith('https') ? https : http;
-        protocol
-            .get(url, response => {
-            if (response.statusCode !== 200) {
-                reject(new Error(`Failed to fetch image: ${response.statusCode}`));
-            }
-            else {
-                const chunks = [];
-                response.on('data', chunk => chunks.push(chunk));
-                response.on('end', () => resolve(Buffer.concat(chunks)));
-            }
-        })
-            .on('error', reject);
+export async function getUrlbuffer(url) {
+    return await axios
+        .get(url, {
+        responseType: 'arraybuffer'
+    })
+        .then(res => {
+        if (res.data)
+            return Buffer.from(res.data, 'binary');
+        return false;
     });
 }
 /**
  * 读取本地图片
- * @param path 本地地址 /public/img/xx.png
- * @returns buffer
+ * @param val
+ * @returns
  */
-export function getPathBuffer(path) {
-    // 读取本地图片
-    const image = readFileSync(join(process.cwd(), path));
-    // 将图片转换为 Buffer 对象
-    const BufferImage = Buffer.from(image);
-    return BufferImage;
+export function getPathBuffer(val) {
+    const add = join(process.cwd(), val);
+    try {
+        // 绝对路径
+        if (existsSync(add))
+            return Buffer.from(readFileSync(add));
+        // 相对路径
+        if (existsSync(val))
+            return Buffer.from(readFileSync(val));
+    }
+    catch (err) {
+        console.info(err);
+    }
+    return false;
 }

package/lib/core/ip.js

@@ -10,10 +10,8 @@ export async function getIP() {
     return await publicIp({
         timeout: 10000
     }).then(ip => {
-        if (/^(\d{1,3}\.){3}\d{1,3}$/.test(ip)) {
+        if (/^(\d{1,3}\.){3}\d{1,3}$/.test(ip))
             myIp = ip;
-            return myIp;
-        }
-        return false;
+        return myIp ?? false;
     });
 }

package/lib/koa/img.js

@@ -58,9 +58,8 @@ export async function setLocalImg(img) {
     const http = getServerConfig('http');
     let ip = await getIP();
     const ipp = getServerConfig('ip');
-    if (ipp != 'localhost') {
+    if (ipp != 'localhost')
         ip = ipp;
-    }
     // 生成文件名
     const filename = `${Math.floor(Math.random() * imgSize)}.${(await fileTypeFromBuffer(img))?.ext}`;
     // 文件路径

package/lib/kook/alemon/conversation.js

@@ -37,7 +37,6 @@ const ConversationMap = {
      */
     [255]: (event) => {
         console.info('system message', new Date(event.msg_timestamp));
-        // console.info('event', event)
     }
 };
 /**
@@ -49,8 +48,5 @@ export async function callBackByKOOK(event) {
     if (Object.prototype.hasOwnProperty.call(ConversationMap, event.type)) {
         return await ConversationMap[event.type](event);
     }
-    else {
-        // console.info('kook new message', event.type)
-        return false;
-    }
+    return false;
 }

package/lib/kook/alemon/message/PUBLIC_GUILD_MESSAGES.js

@@ -3,11 +3,7 @@ import { KOOKApiClient } from '../../sdk/index.js';
 import { segmentKOOK } from '../segment.js';
 import { getBotMsgByKOOK } from '../bot.js';
 import { getBotConfigByKey } from '../../../config/index.js';
-import { AlemonJSError, AlemonJSLog } from '../../../log/user.js';
-const error = err => {
-    console.error(err);
-    return err;
-};
+import { AlemonJSError, AlemonJSLog, everyoneError } from '../../../log/index.js';
 /**
  *
  * @param event
@@ -93,21 +89,21 @@ export const PUBLIC_GUILD_MESSAGES_KOOK = async (event) => {
              */
             if (Buffer.isBuffer(msg)) {
                 try {
-                    const url = await KOOKApiClient.postImage(msg);
-                    if (url) {
+                    const ret = await KOOKApiClient.postImage(msg);
+                    if (ret && ret.data) {
                         if (event.channel_type == 'GROUP') {
                             return await KOOKApiClient.createMessage({
                                 type: 2,
                                 target_id: event.target_id,
-                                content: url
-                            }).catch(error);
+                                content: ret.data.url
+                            }).catch(everyoneError);
                         }
                         return await KOOKApiClient.createDirectMessage({
                             type: 2,
                             target_id: event.target_id,
                             chat_code: event.extra.code,
-                            content: url
-                        }).catch(error);
+                            content: ret.data.url
+                        }).catch(everyoneError);
                     }
                     return false;
                 }
@@ -132,8 +128,10 @@ export const PUBLIC_GUILD_MESSAGES_KOOK = async (event) => {
                     .filter(element => typeof element === 'string')
                     .join('');
                 // 转存
-                const url = await KOOKApiClient.postImage(msg[isBuffer]);
-                if (url) {
+                const ret = await KOOKApiClient.postImage(msg[isBuffer]);
+                if (!ret)
+                    return false;
+                if (ret?.data) {
                     // 群
                     if (event.channel_type == 'GROUP') {
                         await KOOKApiClient.createMessage({
@@ -144,8 +142,8 @@ export const PUBLIC_GUILD_MESSAGES_KOOK = async (event) => {
                         return await KOOKApiClient.createMessage({
                             type: 2,
                             target_id: event.target_id,
-                            content: url
-                        }).catch(error);
+                            content: ret.data.url
+                        }).catch(everyoneError);
                     }
                 }
                 // 私聊
@@ -159,8 +157,8 @@ export const PUBLIC_GUILD_MESSAGES_KOOK = async (event) => {
                     type: 2,
                     target_id: event.target_id,
                     chat_code: event.extra.code,
-                    content: String(url)
-                }).catch(error);
+                    content: String(ret.data.url)
+                }).catch(everyoneError);
             }
             const content = Array.isArray(msg)
                 ? msg.join('')
@@ -175,21 +173,25 @@ export const PUBLIC_GUILD_MESSAGES_KOOK = async (event) => {
             if (match) {
                 const getUrl = match[1];
                 const msg = await getUrlbuffer(getUrl);
-                const url = await KOOKApiClient.postImage(msg);
-                if (msg && url) {
+                if (!msg)
+                    return false;
+                const ret = await KOOKApiClient.postImage(msg);
+                if (!ret)
+                    return false;
+                if (msg && ret) {
                     if (event.channel_type == 'GROUP') {
                         return await KOOKApiClient.createMessage({
                             type: 2,
                             target_id: event.target_id,
-                            content: url
-                        }).catch(error);
+                            content: ret.data.url
+                        }).catch(everyoneError);
                     }
                     return await KOOKApiClient.createDirectMessage({
                         type: 2,
                         target_id: event.target_id,
                         chat_code: event.extra.code,
-                        content: url
-                    }).catch(error);
+                        content: ret.data.url
+                    }).catch(everyoneError);
                 }
             }
             if (event.channel_type == 'GROUP') {
@@ -198,7 +200,7 @@ export const PUBLIC_GUILD_MESSAGES_KOOK = async (event) => {
                         type: 9,
                         target_id: event.target_id,
                         content
-                    }).catch(error);
+                    }).catch(everyoneError);
                 }
                 catch (err) {
                     console.error(err);
@@ -211,7 +213,7 @@ export const PUBLIC_GUILD_MESSAGES_KOOK = async (event) => {
                     target_id: event.target_id,
                     chat_code: event.extra.code,
                     content
-                }).catch(error);
+                }).catch(everyoneError);
             }
             catch (err) {
                 console.error(err);

package/lib/kook/index.js

@@ -23,14 +23,14 @@ export async function createAlemonByKOOK() {
          * 创建连接
          */
         await createClient(cfg.token, callBackByKOOK).then(async (res) => {
-            const data = await KOOKApiClient.getBotInformation();
-            if (data) {
+            const ret = await KOOKApiClient.getBotInformation();
+            if (ret?.data) {
                 setBotMsgByKOOK({
-                    id: data.id,
-                    name: data.username,
-                    avatar: data.avatar
+                    id: ret.data.id,
+                    name: ret.data.username,
+                    avatar: ret.data.avatar
                 });
-                console.info('KOOK Welcome back', data.username);
+                console.info('KOOK Welcome back', ret.data.username);
             }
         });
         return true;

package/lib/kook/sdk/api.js

@@ -74,24 +74,12 @@ export async function postImage(file, name = 'image.jpg') {
  * @returns
  */
 export async function createUrl(formdata) {
-    const ret = await kookService({
+    return await kookService({
         method: 'post',
         url: ApiEnum.AssetCreate,
         data: formdata,
         headers: formdata.getHeaders()
-    })
-        .then(res => {
-        const re = res.data;
-        return re.data;
-    })
-        .catch(err => {
-        console.error(err);
-        return false;
-    });
-    if (!ret) {
-        return false;
-    }
-    return ret.url;
+    }).then(res => res.data);
 }
 /**
  * *********
@@ -99,19 +87,10 @@ export async function createUrl(formdata) {
  * **********
  */
 export async function getBotInformation() {
-    const ret = await kookService({
+    return await kookService({
         method: 'post',
         url: ApiEnum.UserMe
-    })
-        .then(res => {
-        const re = res.data;
-        return re.data;
-    })
-        .catch(err => {
-        console.error(err);
-        return false;
-    });
-    return ret;
+    }).then(res => res.data);
 }
 /**
  * *********
@@ -124,20 +103,11 @@ export async function getBotInformation() {
  * @returns
  */
 export async function createMessage(data) {
-    const ret = await kookService({
+    return await kookService({
         method: 'post',
         url: ApiEnum.MessageCreate,
         data
-    })
-        .then(res => {
-        const re = res.data;
-        return re.data;
-    })
-        .catch(err => {
-        console.error(err);
-        return false;
-    });
-    return ret;
+    }).then(res => res.data);
 }
 /**
  * 创建私聊消息
@@ -148,18 +118,9 @@ export async function createMessage(data) {
  * @returns
  */
 export async function createDirectMessage(data) {
-    const ret = await kookService({
+    return kookService({
         method: 'post',
         url: ApiEnum.DirectMessageCreate,
         data
-    })
-        .then(res => {
-        const re = res.data;
-        return re.data;
-    })
-        .catch(err => {
-        console.error(err);
-        return false;
-    });
-    return ret;
+    }).then(res => res.data);
 }

package/lib/log/index.js

@@ -1,2 +1,6 @@
 export * from './user.js';
 export * from './event.js';
+export const everyoneError = (err) => {
+    console.error(err);
+    return err;
+};

package/lib/logs.js

@@ -0,0 +1,23 @@
+/**
+ * 重定义log
+ * @param fun 中间值
+ * @param prefix 前缀
+ */
+export function setLog(fun, prefix = '[AlemonJS]') {
+    const log = console.log;
+    global.console.log = (...argv) => {
+        log(prefix, `[${fun()}]`, ...argv);
+    };
+    const info = console.info;
+    global.console.info = (...argv) => {
+        info(prefix, `[${fun()}]`, ...argv);
+    };
+    const error = console.error;
+    global.console.error = (...argv) => {
+        error(prefix, `[${fun()}]`, ...argv);
+    };
+    const debug = console.debug;
+    global.console.debug = (...argv) => {
+        debug(prefix, `[${fun()}]`, ...argv);
+    };
+}

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

@@ -4,17 +4,8 @@ import { segmentQQ } from '../segment.js';
 import { getBotMsgByNtqq } from '../bot.js';
 import IMGS from 'image-size';
 import { ClientKOA } from '../../../koa/index.js';
-import { AlemonJSError, AlemonJSLog } from '../../../log/user.js';
+import { AlemonJSError, AlemonJSLog, everyoneError } from '../../../log/index.js';
 import { getBotConfigByKey } from '../../../config/index.js';
-/**
- * 错误打印
- * @param err
- * @returns
- */
-const error = err => {
-    console.error(err);
-    return err;
-};
 export const C2C_MESSAGE_CREATE = async (event) => {
     const cfg = getBotConfigByKey('ntqq');
     const masterID = cfg.masterID;
@@ -40,7 +31,7 @@ export const C2C_MESSAGE_CREATE = async (event) => {
                 const url = await ClientKOA.setLocalImg(msg);
                 if (!url)
                     return false;
-                return await Client.postFilesByUsers(event.author.user_openid, url).catch(error);
+                return await Client.postFilesByUsers(event.author.user_openid, url).catch(everyoneError);
             }
             catch (err) {
                 console.error(err);
@@ -65,7 +56,7 @@ export const C2C_MESSAGE_CREATE = async (event) => {
                 const url = await ClientKOA.setLocalImg(msg[isBuffer]);
                 if (!url)
                     return false;
-                return await Client.postMessageByUser(event.author.user_openid, `${cont}  ![text #${dimensions.width}px #${dimensions.height}px](${url})`, select?.quote).catch(error);
+                return await Client.postMessageByUser(event.author.user_openid, `${cont}  ![text #${dimensions.width}px #${dimensions.height}px](${url})`, select?.quote).catch(everyoneError);
             }
             catch (err) {
                 console.error(err);
@@ -92,10 +83,10 @@ export const C2C_MESSAGE_CREATE = async (event) => {
                 const url = await ClientKOA.setLocalImg(msg);
                 if (!url)
                     return false;
-                return await Client.postFilesByUsers(event.author.user_openid, url).catch(error);
+                return await Client.postFilesByUsers(event.author.user_openid, url).catch(everyoneError);
             }
         }
-        return await Client.postMessageByUser(event.author.user_openid, content, select?.quote).catch(error);
+        return await Client.postMessageByUser(event.author.user_openid, content, select?.quote).catch(everyoneError);
     };
     e.replyCard = async (arr) => {
         for (const item of arr) {

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

@@ -5,16 +5,7 @@ import { getBotMsgByNtqq } from '../bot.js';
 import { getBotConfigByKey } from '../../../config/index.js';
 import { ClientKOA } from '../../../koa/index.js';
 import IMGS from 'image-size';
-import { AlemonJSError, AlemonJSLog } from '../../../log/user.js';
-/**
- * 错误打印
- * @param err
- * @returns
- */
-const error = err => {
-    console.error(err);
-    return err;
-};
+import { AlemonJSError, AlemonJSLog, everyoneError } from '../../../log/index.js';
 /**
  * 公私域合并
  * @param e
@@ -49,7 +40,7 @@ export const GROUP_AT_MESSAGE_CREATE = async (event) => {
                 const url = await ClientKOA.setLocalImg(msg);
                 if (!url)
                     return false;
-                return await Client.postFilesByGroup(event.group_id, url).catch(error);
+                return await Client.postFilesByGroup(event.group_id, url).catch(everyoneError);
             }
             catch (err) {
                 console.error(err);
@@ -71,7 +62,7 @@ export const GROUP_AT_MESSAGE_CREATE = async (event) => {
                 const url = await ClientKOA.setLocalImg(msg[isBuffer]);
                 if (!url)
                     return false;
-                return await Client.postMessageByGroup(event.group_id, `${cont} ![text #${dimensions.width}px #${dimensions.height}px](${url})`, select?.quote).catch(error);
+                return await Client.postMessageByGroup(event.group_id, `${cont} ![text #${dimensions.width}px #${dimensions.height}px](${url})`, select?.quote).catch(everyoneError);
             }
             catch (err) {
                 console.error(err);
@@ -98,10 +89,10 @@ export const GROUP_AT_MESSAGE_CREATE = async (event) => {
                 const url = await ClientKOA.setLocalImg(msg);
                 if (!url)
                     return false;
-                return await Client.postFilesByGroup(event.group_id, url).catch(error);
+                return await Client.postFilesByGroup(event.group_id, url).catch(everyoneError);
             }
         }
-        return await Client.postMessageByGroup(event.group_id, content, select?.quote).catch(error);
+        return await Client.postMessageByGroup(event.group_id, content, select?.quote).catch(everyoneError);
     };
     e.replyCard = async (arr) => {
         for (const item of arr) {

package/lib/qq/alemon/apidoc.js

@@ -3,15 +3,6 @@
  * 频道api
  * ************
  */
-/**
- * 错误打印
- * @param err
- * @returns
- */
-const error = err => {
-    console.error(err);
-    return err;
-};
 /**
  * 获取当前用户下的所有频道列表
  * @returns

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

@@ -2,18 +2,8 @@ import { typeMessage, InstructionMatching, getUrlbuffer } from '../../../core/in
 import { ClientAPIByQQ as Client } from '../../sdk/index.js';
 import { segmentQQ } from '../segment.js';
 import { getBotMsgByQQ } from '../bot.js';
-import { AlemonJSError, AlemonJSLog } from '../../../log/user.js';
-import { AlemonJSEventError, AlemonJSEventLog } from '../../../log/event.js';
+import { AlemonJSError, AlemonJSLog, AlemonJSEventError, AlemonJSEventLog, everyoneError } from '../../../log/index.js';
 import { getBotConfigByKey } from '../../../config/index.js';
-/**
- * 错误打印
- * @param err
- * @returns
- */
-const error = err => {
-    console.error(err);
-    return err;
-};
 /**
  * *
  * 私信
@@ -56,7 +46,7 @@ export const DIRECT_MESSAGE = async (event) => {
     /**
      * 优化接口
      */
-    await directMessage(e, event).catch(error);
+    await directMessage(e, event).catch(everyoneError);
     console.info(`\n[${event.msg.author.username}][${event.msg.author.id}][${e.isGroup}] ${event.msg.content ? event.msg.content : ''}`);
 };
 async function directMessage(e, event) {
@@ -68,7 +58,7 @@ async function directMessage(e, event) {
                     id: event.msg.guild_id,
                     msg_id: event.msg.id,
                     image: msg //buffer
-                }).catch(error);
+                }).catch(everyoneError);
             }
             catch (err) {
                 console.error(err);
@@ -92,7 +82,7 @@ async function directMessage(e, event) {
                     msg_id: event.msg.id,
                     image: msg[isBuffer],
                     content: cont
-                }).catch(error);
+                }).catch(everyoneError);
             }
             catch (err) {
                 console.error(err);
@@ -120,7 +110,7 @@ async function directMessage(e, event) {
                     id: event.msg.channel_id,
                     msg_id: event.msg.id,
                     image: msg //buffer
-                }).catch(error);
+                }).catch(everyoneError);
             }
         }
         return await clientApiByQQ.directMessageApi
@@ -128,7 +118,7 @@ async function directMessage(e, event) {
             msg_id: event.msg.id,
             content
         })
-            .catch(error);
+            .catch(everyoneError);
     };
     e.replyCard = async (arr) => {
         for (const item of arr) {
@@ -139,7 +129,7 @@ async function directMessage(e, event) {
                         msg_id: event.msg.id,
                         ...item.card
                     })
-                        .catch(error);
+                        .catch(everyoneError);
                 }
                 else {
                     return false;

package/lib/qq/alemon/message/GUILD_MEMBERS.js

@@ -2,16 +2,7 @@ import { typeMessage, getUrlbuffer } from '../../../core/index.js';
 import { getBotMsgByQQ } from '../bot.js';
 // 非依赖引用
 import { ClientAPIByQQ as Client } from '../../sdk/index.js';
-import { AlemonJSEventError, AlemonJSEventLog } from '../../../log/event.js';
-/**
- * 错误打印
- * @param err
- * @returns
- */
-const error = err => {
-    console.error(err);
-    return err;
-};
+import { AlemonJSEventError, AlemonJSEventLog, everyoneError } from '../../../log/index.js';
 /**
 GUILD_MEMBERS (1 << 1)
   - GUILD_MEMBER_ADD       // 当成员加入时
@@ -39,7 +30,7 @@ export const GUILD_MEMBERS = async (event) => {
         const { data } = res;
         return data;
     })
-        .catch(error);
+        .catch(everyoneError);
     if (typeof ChannelsData == 'boolean') {
         console.info(`[${Eevent}] [${eventType}] ${false}`);
         return false;
@@ -73,7 +64,7 @@ export const GUILD_MEMBERS = async (event) => {
                         id: ChannelData.id,
                         msg_id: event.msg.id,
                         image: msg //buffer
-                    }).catch(error);
+                    }).catch(everyoneError);
                 }
                 catch (err) {
                     console.error(err);
@@ -97,7 +88,7 @@ export const GUILD_MEMBERS = async (event) => {
                         msg_id: event.msg.id,
                         image: msg[isBuffer],
                         content: cont
-                    }).catch(error);
+                    }).catch(everyoneError);
                 }
                 catch (err) {
                     console.error(err);
@@ -125,7 +116,7 @@ export const GUILD_MEMBERS = async (event) => {
                         id: event.msg.channel_id,
                         msg_id: event.msg.id,
                         image: msg //buffer
-                    }).catch(error);
+                    }).catch(everyoneError);
                 }
             }
             /**
@@ -135,7 +126,7 @@ export const GUILD_MEMBERS = async (event) => {
                 .postMessage(ChannelData.id, {
                 content
             })
-                .catch(error);
+                .catch(everyoneError);
         },
         replyCard: async (arr) => {
             for (const item of arr) {
@@ -146,7 +137,7 @@ export const GUILD_MEMBERS = async (event) => {
                             msg_id: event.msg.id,
                             ...item.card
                         })
-                            .catch(error);
+                            .catch(everyoneError);
                     }
                     else {
                         return false;

package/lib/qq/alemon/message/GUILD_MESSAGES.js

@@ -1,19 +1,10 @@
 import { typeMessage } from '../../../core/index.js';
 import { mergeMessages } from './MESSAGE.js';
 import { getBotMsgByQQ } from '../bot.js';
-import { AlemonJSEventError, AlemonJSEventLog } from '../../../log/event.js';
+import { everyoneError, AlemonJSEventError, AlemonJSEventLog } from '../../../log/index.js';
 /**
  * *私域*
  */
-/**
- * 错误打印
- * @param err
- * @returns
- */
-const error = err => {
-    console.error(err);
-    return err;
-};
 /**
 GUILD_MESSAGES (1 << 9)    // 消息事件，仅 *私域* 机器人能够设置此 intents。
   - MESSAGE_CREATE
@@ -52,5 +43,5 @@ export const GUILD_MESSAGES = async (event) => {
     /**
      * 消息方法
      */
-    mergeMessages(e, event).catch(error);
+    mergeMessages(e, event).catch(everyoneError);
 };