alemonjs 1.1.13 → 1.1.15

package/lib/qq/alemon/reply.js

@@ -12,17 +12,11 @@ export async function replyController(msg, channel_id, msg_id, select) {
     // isBuffer
     // if withdraw == 0 ， false 不撤回
     if (Buffer.isBuffer(msg)) {
-        try {
-            return await Client.postImage({
-                id: channel_id,
-                msg_id: msg_id, //消息id, 必须,不然就是主动消息了
-                image: msg //buffer
-            }).catch(everyoneError);
-        }
-        catch (err) {
-            console.error(err);
-            return err;
-        }
+        return await Client.postImage({
+            id: channel_id,
+            msg_id: msg_id, //消息id, 必须,不然就是主动消息了
+            image: msg //buffer
+        }).catch(everyoneError);
     }
     // arr & find buffer
     if (Array.isArray(msg) && msg.find(item => Buffer.isBuffer(item))) {
@@ -35,18 +29,12 @@ export async function replyController(msg, channel_id, msg_id, select) {
         })
             .filter(element => typeof element === 'string')
             .join('');
-        try {
-            return await Client.postImage({
-                id: channel_id,
-                msg_id: msg_id, //消息id, 必须
-                image: msg[isBuffer], //buffer
-                content: cont
-            }).catch(everyoneError);
-        }
-        catch (err) {
-            console.error(err);
-            return err;
-        }
+        return await Client.postImage({
+            id: channel_id,
+            msg_id: msg_id, //消息id, 必须
+            image: msg[isBuffer], //buffer
+            content: cont
+        }).catch(everyoneError);
     }
     const content = Array.isArray(msg)
         ? msg.join('')

package/lib/villa/alemon/controller.js

@@ -1,6 +1,7 @@
 import { ClientVILLA } from '../sdk/index.js';
 import { replyController } from './reply.js';
 import { getBotConfigByKey } from '../../config/index.js';
+import { everyoneError } from '../../log/index.js';
 export const Controller = {
     Member: ({ guild_id, user_id }) => {
         return {
@@ -10,7 +11,9 @@ export const Controller = {
              */
             information: async () => {
                 // 对进行进行过滤,并以固定格式返回
-                const data = await ClientVILLA.getMember(guild_id, user_id).then(res => res.data);
+                const data = await ClientVILLA.getMember(guild_id, user_id)
+                    .then(res => res.data)
+                    .catch(everyoneError);
                 if (!data)
                     return false;
                 const cfg = getBotConfigByKey('villa');
@@ -36,7 +39,7 @@ export const Controller = {
              * 踢出
              */
             remove: async () => {
-                return await ClientVILLA.deleteVillaMember(guild_id, user_id);
+                return await ClientVILLA.deleteVillaMember(guild_id, user_id).catch(everyoneError);
             },
             /**
              * 身分组
@@ -49,7 +52,7 @@ export const Controller = {
                     role_id,
                     uid: user_id,
                     is_add: add
-                });
+                }).catch(everyoneError);
             }
         };
     },
@@ -66,7 +69,7 @@ export const Controller = {
                     console.error('VILLA 无私信');
                     return false;
                 }
-                return await replyController(guild_id, channel_id, content);
+                return await replyController(guild_id, channel_id, content).catch(everyoneError);
             },
             /**
              * 引用
@@ -80,7 +83,7 @@ export const Controller = {
                 }
                 return await replyController(guild_id, channel_id, content, {
                     quote: msg_id
-                });
+                }).catch(everyoneError);
             },
             /**
              * 更新信息
@@ -98,7 +101,7 @@ export const Controller = {
                 return await ClientVILLA.recallMessage(guild_id, {
                     room_id: channel_id,
                     msg_uid: msg_id
-                });
+                }).catch(everyoneError);
             },
             /**
              *  钉选
@@ -110,7 +113,7 @@ export const Controller = {
                     room_id: channel_id,
                     is_cancel: cancel,
                     msg_uid: msg_id
-                });
+                }).catch(everyoneError);
             },
             /**
              *  喇叭
@@ -161,7 +164,7 @@ export const Controller = {
             card: async (msg) => {
                 const arr = [];
                 for (const item of msg) {
-                    arr.push(await ClientVILLA.sendComponentTemplate(guild_id, channel_id, item));
+                    arr.push(await ClientVILLA.sendCard(guild_id, channel_id, item));
                 }
                 return arr;
             },

package/lib/villa/alemon/reply.js

@@ -10,28 +10,35 @@ import { getUrlbuffer } from '../../core/index.js';
  * @returns
  */
 export async function replyController(villa_id, room_id, msg, select) {
-    /**
-     * isBuffer
-     */
+    // isBuffer
     if (Buffer.isBuffer(msg)) {
-        /**
-         * 上传图片
-         */
+        // 上传图片
         const url = await ClientVILLA.uploadImage(villa_id, msg).then(res => res?.data?.url);
         if (!url)
             return false;
         const dimensions = IMGS.imageSize(msg);
-        return await ClientVILLA.sendMessageImage(villa_id, room_id, url, {
-            width: dimensions.width,
-            height: dimensions.height
+        return await ClientVILLA.replyMessage(villa_id, room_id, {
+            images: [
+                {
+                    url,
+                    width: dimensions.width,
+                    height: dimensions.height
+                }
+            ]
         }, select?.quote).catch(everyoneError);
     }
-    /**
-     * isString arr and find buffer
-     */
+    // isString arr and find buffer
     if (Array.isArray(msg) && msg.find(item => Buffer.isBuffer(item))) {
-        // 找到其中一个buffer
-        const isBuffer = msg.findIndex(item => Buffer.isBuffer(item));
+        const buffers = msg.filter(item => Buffer.isBuffer(item));
+        const images = [];
+        for (const item of buffers) {
+            const ISize = IMGS.imageSize(item);
+            images.push({
+                url: await ClientVILLA.uploadImage(villa_id, item).then(res => res?.data?.url),
+                width: ISize.width,
+                height: ISize.height
+            });
+        }
         // 删除所有buffer
         const cont = msg
             .map(item => {
@@ -41,28 +48,10 @@ export async function replyController(villa_id, room_id, msg, select) {
         })
             .filter(element => typeof element === 'string')
             .join('');
-        // 字符解析器
-        const { entities, content } = await ClientVILLA.stringParsing(cont, villa_id);
-        /**
-         * 上传图片
-         */
-        const url = await ClientVILLA.uploadImage(villa_id, msg[isBuffer]).then(res => res?.data?.url);
-        if (!url)
-            return false;
-        // 识别大小
-        const dimensions = IMGS.imageSize(msg[isBuffer]);
-        if (entities.length == 0) {
-            return await ClientVILLA.sendMessageTextUrl(villa_id, room_id, content, url, {
-                width: dimensions.width,
-                height: dimensions.height
-            }, select?.quote).catch(everyoneError);
-        }
-        else {
-            return await ClientVILLA.sendMessageTextEntitiesUrl(villa_id, room_id, content, entities, url, {
-                width: dimensions.width,
-                height: dimensions.height
-            }, select?.quote).catch(everyoneError);
-        }
+        return await ClientVILLA.replyMessage(villa_id, room_id, {
+            msg: cont,
+            images: images
+        }, select?.quote).catch(everyoneError);
     }
     // string and string[]
     const cont = Array.isArray(msg)
@@ -80,28 +69,28 @@ export async function replyController(villa_id, room_id, msg, select) {
     const match = cont.match(/<http>(.*?)<\/http>/);
     if (match) {
         const getUrl = match[1];
-        // url 形式的直接转存
-        const url = await ClientVILLA.transferImage(villa_id, getUrl).then(res => res?.data?.new_url);
-        if (!url)
-            return false;
+        // 先请求确保图片正常
         const msg = await getUrlbuffer(getUrl);
         if (!msg)
             return false;
-        // 如果是直接的url,应该直接使用转存
         const dimensions = IMGS.imageSize(msg);
-        return await ClientVILLA.sendMessageImage(villa_id, room_id, url, {
-            width: dimensions.width,
-            height: dimensions.height
+        // url 形式的直接转存
+        const url = await ClientVILLA.transferImage(villa_id, getUrl).then(res => res?.data?.new_url);
+        // 如果是直接的url,应该直接使用转存
+        const images = [
+            {
+                url,
+                width: dimensions.width,
+                height: dimensions.height
+            }
+        ];
+        const contreplace = cont.replace(/<http>(.*?)<\/http>/, '');
+        return await ClientVILLA.replyMessage(villa_id, room_id, {
+            msg: contreplace == '' ? undefined : contreplace,
+            images: images
         }, select?.quote).catch(everyoneError);
     }
-    /**
-     * reply
-     */
-    const { entities, content } = await ClientVILLA.stringParsing(cont, villa_id);
-    if (entities.length == 0 && content != '') {
-        return await ClientVILLA.sendMessageText(villa_id, room_id, content, select?.quote).catch(everyoneError);
-    }
-    else if (entities.length != 0 && content != '') {
-        return await ClientVILLA.sendMessageTextEntities(villa_id, room_id, content, entities, select?.quote).catch(everyoneError);
-    }
+    return await ClientVILLA.replyMessage(villa_id, room_id, {
+        msg: cont
+    }, select?.quote).catch(everyoneError);
 }

package/lib/villa/sdk/api.js

@@ -242,7 +242,7 @@ export async function sendMessage(villa_id, data) {
  * @param panel  消息组件面板json序列化后得到的字符串
  * @returns
  */
-export async function sendComponentTemplate(villa_id, room_id, content) {
+export async function sendCard(villa_id, room_id, content) {
     return await sendMessage(villa_id, {
         room_id,
         object_name: 'MHY:Text',

package/lib/villa/sdk/reply.js

@@ -1,237 +1,62 @@
 import { sendMessage } from './api.js';
+import { stringParsing } from './mechanism.js';
 /**
- * 图片发送
- * @param villa_id 别野
- * @param room_id 房间
- * @param url 图片地址
- * @param size 图片配置
- * @returns
- */
-export async function sendMessageImage(villa_id, room_id, url, size, msg_id) {
-    let data = {
-        /**
-         * 消息文本   支持  [爱心] 来转换成表情
-         */
-        content: {
-            url,
-            size
-        }
-    };
-    if (msg_id) {
-        const [id, at] = String(msg_id).split('.');
-        data = {
-            ...data,
-            ...{
-                quote: {
-                    original_message_id: id,
-                    original_message_send_time: Number(at),
-                    quoted_message_id: id,
-                    quoted_message_send_time: Number(at)
-                }
-            }
-        };
-    }
-    return await sendMessage(villa_id, {
-        /**
-         * 房间号
-         */
-        room_id,
-        /**
-         * 消息类型 */
-        object_name: 'MHY:Image',
-        /**
-         *
-         */
-        msg_content: JSON.stringify(data)
-    });
-}
-/**
- * 消息发送
- * @param villa_id 别野
- * @param room_id 房间
- * @param text 文本
- * @returns
- */
-export async function sendMessageText(villa_id, room_id, text, msg_id) {
-    let data = {
-        content: {
-            text
-        }
-    };
-    if (msg_id) {
-        const [id, at] = String(msg_id).split('.');
-        data = {
-            ...data,
-            ...{
-                quote: {
-                    original_message_id: id,
-                    original_message_send_time: Number(at),
-                    quoted_message_id: id,
-                    quoted_message_send_time: Number(at)
-                }
-            }
-        };
-    }
-    return await sendMessage(villa_id, {
-        /**
-         *  房间号
-         */
-        room_id,
-        object_name: 'MHY:Text',
-        msg_content: JSON.stringify(data)
-    });
-}
-/**
- * 消息发送
- * @param villa_id 别野
- * @param room_id 房间
- * @param text 文本
- * @param entities 渲染
+ * 数据序列化
+ * @param data
  * @returns
  */
-export async function sendMessageTextEntities(villa_id, room_id, text, entities, msg_id) {
-    let data = {
-        content: {
-            text,
-            entities
-        }
-    };
-    if (msg_id) {
-        const [id, at] = String(msg_id).split('.');
-        data = {
-            ...data,
-            ...{
-                quote: {
-                    original_message_id: id,
-                    original_message_send_time: Number(at),
-                    quoted_message_id: id,
-                    quoted_message_send_time: Number(at)
-                }
-            }
-        };
-    }
-    return await sendMessage(villa_id, {
-        room_id,
-        object_name: 'MHY:Text',
-        msg_content: JSON.stringify(data)
-    });
+export function stringify(data) {
+    return JSON.stringify(data);
 }
 /**
  * 消息发送
  * @param villa_id 别野
  * @param room_id 房间
- * @param text 文本
- * @param url 图片
- * @param size 图片配置
+ * @param m {msg:文本 images:{ url size }}
+ * @param msg_id 消息编号
  * @returns
  */
-export async function sendMessageTextUrl(villa_id, room_id, text, url, size, msg_id) {
-    let data = {
-        content: {
-            text,
-            images: [
-                {
-                    url,
-                    ...size
-                }
-            ]
-        }
+export async function replyMessage(villa_id, room_id, m, msg_id) {
+    const data = {
+        content: undefined,
+        panel: m?.panel,
+        quote: undefined
     };
-    if (msg_id) {
-        const [id, at] = String(msg_id).split('.');
-        data = {
-            ...data,
-            ...{
-                quote: {
-                    original_message_id: id,
-                    original_message_send_time: Number(at),
-                    quoted_message_id: id,
-                    quoted_message_send_time: Number(at)
-                }
-            }
+    let object_name = 'MHY:Text';
+    if (m?.msg || m?.images?.length > 1) {
+        // 文字模式
+        const { entities, content } = await stringParsing(m.msg, villa_id);
+        data.content = {
+            text: content,
+            entities,
+            images: m?.images ?? []
         };
     }
-    return await sendMessage(villa_id, {
-        room_id,
-        object_name: 'MHY:Text',
-        msg_content: JSON.stringify(data)
-    });
-}
-/**
- * 消息发送
- * @param villa_id 别野
- * @param room_id 房间
- * @param text 文本
- * @param images 图片集
- * @returns
- */
-export async function sendMessageTextImages(villa_id, room_id, text, images, msg_id) {
-    let data = {
-        content: {
-            text,
-            images
-        }
-    };
-    if (msg_id) {
-        const [id, at] = String(msg_id).split('.');
-        data = {
-            ...data,
-            ...{
-                quote: {
-                    original_message_id: id,
-                    original_message_send_time: Number(at),
-                    quoted_message_id: id,
-                    quoted_message_send_time: Number(at)
-                }
-            }
+    else {
+        // 图片模式
+        data.content = {
+            url: m.images[0].url,
+            size: m.images[0]?.width && m.images[0]?.height
+                ? {
+                    width: m.images[0]?.width,
+                    height: m.images[0]?.height
+                }
+                : undefined
         };
+        object_name = 'MHY:Image';
     }
-    return await sendMessage(villa_id, {
-        room_id,
-        object_name: 'MHY:Text',
-        msg_content: JSON.stringify(data)
-    });
-}
-/**
- * 消息发送
- * @param villa_id 别野
- * @param room_id 房间
- * @param text 文本
- * @param entities 渲染
- * @param url 图片
- * @param size 图片配置
- * @returns
- */
-export async function sendMessageTextEntitiesUrl(villa_id, room_id, text, entities, url, size, msg_id) {
-    let data = {
-        content: {
-            text,
-            entities,
-            images: [
-                {
-                    url,
-                    ...size
-                }
-            ]
-        }
-    };
     if (msg_id) {
         const [id, at] = String(msg_id).split('.');
-        data = {
-            ...data,
-            ...{
-                quote: {
-                    original_message_id: id,
-                    original_message_send_time: Number(at),
-                    quoted_message_id: id,
-                    quoted_message_send_time: Number(at)
-                }
-            }
+        data.quote = {
+            original_message_id: id,
+            original_message_send_time: Number(at),
+            quoted_message_id: id,
+            quoted_message_send_time: Number(at)
         };
     }
     return await sendMessage(villa_id, {
         room_id,
-        object_name: 'MHY:Text',
-        msg_content: JSON.stringify(data)
+        object_name: object_name,
+        msg_content: stringify(data)
     });
 }

package/lib/villa/sdk/wss.js

@@ -55,7 +55,7 @@ export async function createClientWS(callBackByVilla) {
                 meta: null
             })
         }));
-        // 6s 心跳
+        // 20s 心跳
         setInterval(() => {
             ws.send(createMessage({
                 ID: counter.getNextID(),
@@ -77,19 +77,24 @@ export async function createClientWS(callBackByVilla) {
                 if (obj.bizType == 7) {
                     // 登录
                     const reply = ProtoCommand('PLoginReply').decode(obj.BodyData);
+                    if (process.env?.VILLA_WS == 'dev')
+                        console.log('PLoginReply:', LongToNumber(reply));
                     if (reply.code)
                         console.log('登录失败');
                 }
                 else if (obj.bizType == 6) {
                     // 心跳
                     const reply = ProtoCommand('PHeartBeatReply').decode(obj.BodyData);
+                    if (process.env?.VILLA_WS == 'dev')
+                        console.log('PHeartBeatReply:', LongToNumber(reply));
                     if (reply.code)
                         console.log('心跳错误');
                 }
                 else if (obj.bizType == 8) {
                     // 退出登录
                     const reply = ProtoCommand('PLogoutReply').decode(obj.BodyData);
-                    console.log('PLogoutReply:', LongToNumber(reply));
+                    if (process.env?.VILLA_WS == 'dev')
+                        console.log('PLogoutReply:', LongToNumber(reply));
                 }
                 else if (obj.bizType == 53) {
                     // 强制下线
@@ -101,19 +106,23 @@ export async function createClientWS(callBackByVilla) {
                     // 回调数据包
                     const reply = ProtoModel('RobotEvent').decode(obj.BodyData);
                     const data = LongToNumber(reply);
-                    console.log('data', data);
+                    if (process.env?.VILLA_WS == 'dev')
+                        console.log('data', data);
                     callBackByVilla(data);
                 }
                 else {
-                    console.log('未知数据');
+                    if (process.env?.VILLA_WS == 'dev')
+                        console.log('未知数据');
                 }
             }
             catch {
-                console.log('代码错误');
+                if (process.env?.VILLA_WS == 'dev')
+                    console.log('代码错误');
             }
         }
         else {
-            console.log('未知数据');
+            if (process.env?.VILLA_WS == 'dev')
+                console.log('未知数据');
         }
     });
     ws.on('error', error => {

package/lib/villa/villa.js

@@ -3,7 +3,5 @@ export const defineVILLA = {
     secret: '',
     pub_key: '',
     masterID: '',
-    url: '/api/mys/callback',
-    port: 8080,
     villa_id: 0
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alemonjs",
-  "version": "1.1.13",
+  "version": "1.1.15",
   "description": "DOCS https://alemonjs.com/",
   "scripts": {
     "dev": "ts-node alemon.config.ts",
@@ -20,6 +20,7 @@
     "koa2-cors": "^2.0.6",
     "lodash": "^4.17.21",
     "mime-types": "^2.1.35",
+    "protobufjs": "^7.2.5",
     "public-ip": "^6.0.1",
     "puppeteer": "^20.7.1",
     "qq-guild-bot": "^2.9.5",
@@ -44,9 +45,8 @@
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-prettier": "^4.2.1",
     "prettier": "^2.8.8",
-    "protobufjs": "^7.2.5",
-    "protoc": "^1.1.3",
     "ts-node": "^10.9.1",
+    "typedoc": "^0.25.4",
     "typescript": "^5.0.4"
   },
   "author": "ningmengchongshui",

package/types/config/login.d.ts

@@ -1,4 +1,4 @@
-import { ConfigType } from './types.js';
+import { type ConfigType } from './types.js';
 /**
  * 设置机器人基础配置
  * @param key 配置名

package/types/core/dealmsg.d.ts

@@ -1,4 +1,4 @@
-import { AMessage } from './typings.js';
+import { type AMessage } from './typings.js';
 /**
  * 插件初始化
  */

package/types/discord/alemon/controller.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" resolution-mode="require"/>
-import { ControllerOption, UserInformationType } from '../../core/index.js';
+import { type ControllerOption, type UserInformationType } from '../../core/index.js';
 export declare const Controller: {
     Member: ({ guild_id, user_id, channel_id }: {
         guild_id: any;