alemonjs 1.0.55 → 1.0.56

package/lib/api.js

@@ -1,15 +1,17 @@
 /**
- * qq客户端
+ * ***********
+ * SDK接口管理
+ * ***********
  */
-export const ClientQQ = global.ClientQQ;
+export { ClientQQ } from './qq/index.js';
 /**
  * villa客户端
  */
-export { ClientVILLA } from './villa/sdk/index.js';
+export { ClientVILLA } from './villa/index.js';
 /**
  * ntqq客户端
  */
-export { ClientNTQQ } from './ntqq/sdk/index.js';
+export { ClientNTQQ } from './ntqq/index.js';
 /**
  * server客户端
  */
@@ -17,4 +19,4 @@ export { ClientKOA } from './koa/index.js';
 /**
  * kook客户端
  */
-export { ClientKOOK } from './kook/sdk/index.js';
+export { ClientKOOK } from './kook/index.js';

package/lib/core/buffer.js

@@ -1,6 +1,9 @@
-import { existsSync, readFileSync } from 'fs';
+import { existsSync, readFileSync, createReadStream } from 'fs';
 import axios from 'axios';
 import { join } from 'path';
+import { Readable, isReadable } from 'stream';
+import { basename } from 'path';
+import { fileTypeFromBuffer, fileTypeFromStream } from 'file-type';
 /**
  * 异步请求图片
  * @param url 网络地址
@@ -37,3 +40,42 @@ export function getPathBuffer(val) {
     }
     return false;
 }
+/**
+ * 创建form
+ * @param image
+ * @param name
+ * @returns
+ */
+export async function createPicFrom(image, name = 'image.jpg') {
+    let picData;
+    // 是 string
+    if (typeof image === 'string') {
+        if (!existsSync(image)) {
+            return false;
+        }
+        if (!name) {
+            name = basename(image);
+        }
+        picData = createReadStream(image);
+        // 是 buffer
+    }
+    else if (Buffer.isBuffer(image)) {
+        if (!name) {
+            name = 'file.' + (await fileTypeFromBuffer(image)).ext;
+        }
+        picData = new Readable();
+        picData.push(image);
+        picData.push(null);
+        // 是 文件流
+    }
+    else if (isReadable(image)) {
+        if (!name) {
+            name = 'file.' + (await fileTypeFromStream(image)).ext;
+        }
+        picData = image;
+    }
+    else {
+        return false;
+    }
+    return { picData, image, name };
+}

package/lib/define/main.js

@@ -156,7 +156,7 @@ export async function defineAlemonConfig(Options) {
      * 挂起web服务
      * **********
      */
-    if (Options?.server?.state != false) {
+    if (Options?.server?.state) {
         // 创建server端
         createWeb(Options?.server);
         if (Options?.server?.clear != false) {

package/lib/index.js

@@ -4,12 +4,6 @@
  * *************
  */
 export * from './core/index.js';
-/**
- * *************
- * define
- * *************
- */
-export * from './define/index.js';
 /**
  * *************
  * config system
@@ -22,6 +16,12 @@ export * from './config/index.js';
  * *************
  */
 export * from './login.js';
+/**
+ * *************
+ * define
+ * *************
+ */
+export * from './define/index.js';
 /**
  * api
  */

package/lib/koa/img.js

@@ -62,7 +62,6 @@ export async function setLocalImg(img) {
         if (ipp)
             ip = ipp;
     }
-    console.log('测试1');
     // 生成文件名
     const filename = `${Math.floor(Math.random() * imgSize)}.${(await fileTypeFromBuffer(img))?.ext}`;
     // 文件路径

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

@@ -56,20 +56,33 @@ export const PUBLIC_GUILD_MESSAGES_KOOK = async (event) => {
     const avatar = event.extra.author.avatar;
     const e = {
         platform: 'kook',
-        bot: getBotMsgByKOOK(),
         event: 'MESSAGES',
         eventType: 'CREATE',
+        boundaries: 'private',
+        attribute: event.channel_type == 'GROUP'
+            ? 'group'
+            : 'single',
+        bot: getBotMsgByKOOK(),
+        /**
+         *
+         */
         isPrivate: true,
         isRecall: false,
         isMaster: event.msg_id == masterID ? true : false,
         isGroup: event.channel_type == 'GROUP' ? true : false,
-        boundaries: 'private',
-        attribute: event.channel_type == 'GROUP' ? 'group' : 'single',
         at,
         at_users,
         at_user,
         msg,
         msg_id: event.msg_id,
+        /**
+         * 特殊消息
+         */
+        attachments: [],
+        /**
+         * 特殊消息
+         */
+        specials: [],
         msg_txt: event.content,
         msg_create_time: event.msg_timestamp,
         guild_id: event.target_id,

package/lib/kook/alemon/segment.js

@@ -15,6 +15,9 @@ export const segmentKOOK = {
     atAll: () => {
         return `(met)all(met)`;
     },
+    /**
+     * 本地图片
+     */
     img: getPathBuffer,
     /**
      * 标注GET请求

package/lib/kook/index.js

@@ -37,3 +37,5 @@ export async function createAlemonByKOOK() {
     }
     return false;
 }
+// 客户端
+export { ClientKOOK } from './sdk/index.js';

package/lib/kook/sdk/api.js

@@ -1,11 +1,8 @@
 import axios from 'axios';
 import FormData from 'form-data';
-import { existsSync, createReadStream } from 'fs';
-import { Readable, isReadable } from 'stream';
-import { basename } from 'path';
-import { fileTypeFromBuffer, fileTypeFromStream } from 'file-type';
 import { ApiEnum } from './typings.js';
 import { getKookToken } from './config.js';
+import { createPicFrom } from '../../core/index.js';
 /**
  * KOOK服务
  * @param config
@@ -33,34 +30,11 @@ export function kookService(config) {
  * @param message {消息编号,图片,内容}
  * @returns
  */
-export async function postImage(file, name = 'image.jpg') {
-    let picData;
-    if (typeof file === 'string') {
-        if (!existsSync(file)) {
-            return false;
-        }
-        if (!name) {
-            name = basename(file);
-        }
-        picData = createReadStream(file);
-    }
-    else if (Buffer.isBuffer(file)) {
-        if (!name) {
-            name = 'file.' + (await fileTypeFromBuffer(file)).ext;
-        }
-        picData = new Readable();
-        picData.push(file);
-        picData.push(null);
-    }
-    else if (isReadable(file)) {
-        if (!name) {
-            name = 'file.' + (await fileTypeFromStream(file)).ext;
-        }
-        picData = file;
-    }
-    else {
+export async function postImage(file, Name = 'image.jpg') {
+    const from = await createPicFrom(file, Name);
+    if (!from)
         return false;
-    }
+    const { picData, name } = from;
     const formdata = new FormData();
     formdata.append('file', picData, name);
     const url = await createUrl(formdata);

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

@@ -11,120 +11,81 @@ export const C2C_MESSAGE_CREATE = async (event) => {
     const masterID = cfg.masterID;
     const e = {
         platform: 'ntqq',
-        bot: getBotMsgByNtqq(),
-        isMaster: event.author.id == masterID ? true : false,
         event: 'MESSAGES',
         eventType: 'CREATE',
-        // 是私
+        boundaries: 'publick',
+        attribute: 'single',
+        bot: getBotMsgByNtqq(),
+        isMaster: event.author.id == masterID ? true : false,
         isPrivate: false,
         isRecall: false,
         isGroup: false,
-        boundaries: 'publick',
-        // 是私聊
-        attribute: 'single'
-    };
-    /* 消息发送机制 */
-    e.reply = async (msg, select) => {
-        // isBuffer
-        if (Buffer.isBuffer(msg)) {
-            try {
-                const url = await ClientKOA.setLocalImg(msg);
-                if (!url)
-                    return false;
-                return await ClientNTQQ.postFilesByUsers(event.author.user_openid, url).catch(everyoneError);
-            }
-            catch (err) {
-                console.error(err);
-                return err;
-            }
-        }
-        /**
-         * isString arr and find buffer
-         */
-        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 dimensions = IMGS.imageSize(msg[isBuffer]);
-                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})`, event.id).catch(everyoneError);
-            }
-            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;
-        /**
-         * https
-         */
-        const match = content.match(/<http>(.*?)<\/http>/);
-        if (match) {
-            const getUrl = match[1];
-            const msg = await getUrlbuffer(getUrl);
+        attachments: [],
+        specials: [],
+        reply: async (msg, select) => {
+            // isBuffer
             if (Buffer.isBuffer(msg)) {
-                const url = await ClientKOA.setLocalImg(msg);
-                if (!url)
-                    return false;
-                return await ClientNTQQ.postFilesByUsers(event.author.user_openid, url).catch(everyoneError);
+                try {
+                    const url = await ClientKOA.setLocalImg(msg);
+                    if (!url)
+                        return false;
+                    return await ClientNTQQ.postFilesByUsers(event.author.user_openid, url).catch(everyoneError);
+                }
+                catch (err) {
+                    console.error(err);
+                    return err;
+                }
             }
-        }
-        return await ClientNTQQ.postMessageByUser(event.author.user_openid, content, event.id).catch(everyoneError);
-    };
-    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;
+            /**
+             * isString arr and find buffer
+             */
+            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 dimensions = IMGS.imageSize(msg[isBuffer]);
+                    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})`, event.id).catch(everyoneError);
                 }
-                else {
-                    return false;
+                catch (err) {
+                    console.error(err);
+                    return err;
                 }
             }
-            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;
+            /**
+             * https
+             */
+            const match = content.match(/<http>(.*?)<\/http>/);
+            if (match) {
+                const getUrl = match[1];
+                const msg = await getUrlbuffer(getUrl);
+                if (Buffer.isBuffer(msg)) {
+                    const url = await ClientKOA.setLocalImg(msg);
+                    if (!url)
+                        return false;
+                    return await ClientNTQQ.postFilesByUsers(event.author.user_openid, url).catch(everyoneError);
+                }
             }
+            return await ClientNTQQ.postMessageByUser(event.author.user_openid, content, event.id).catch(everyoneError);
         }
-        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
-     * @returns
-     */
-    e.deleteEmoji = async (mid, boj) => {
-        console.info('temporarily unavailable');
-        return false;
     };
     e.msg_txt = event.content;
     e.msg = event.content;

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

@@ -17,118 +17,84 @@ export const GROUP_AT_MESSAGE_CREATE = async (event) => {
     const masterID = cfg.masterID;
     const e = {
         platform: 'ntqq',
-        bot: getBotMsgByNtqq(),
-        isMaster: event.author.id == masterID ? true : false,
         event: 'MESSAGES',
         eventType: 'CREATE',
+        boundaries: 'publick',
+        attribute: 'group',
+        bot: getBotMsgByNtqq(),
+        isMaster: event.author.id == masterID ? true : false,
         isPrivate: false,
         isRecall: false,
         isGroup: true,
-        boundaries: 'publick',
-        attribute: 'group'
-    };
-    /**
-     * 消息发送机制
-     * @param msg 消息
-     * @param img
-     * @returns
-     */
-    e.reply = async (msg, select) => {
-        // is buffer
-        if (Buffer.isBuffer(msg)) {
-            try {
-                const url = await ClientKOA.setLocalImg(msg);
-                if (!url)
-                    return false;
-                return await ClientNTQQ.postFilesByGroup(event.group_id, url).catch(everyoneError);
-            }
-            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 dimensions = IMGS.imageSize(msg[isBuffer]);
-                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})`, event.id).catch(everyoneError);
-            }
-            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;
+        attachments: [],
+        specials: [],
         /**
-         * http
+         * 消息发送机制
+         * @param msg 消息
+         * @param img
+         * @returns
          */
-        const match = content.match(/<http>(.*?)<\/http>/);
-        if (match) {
-            const getUrl = match[1];
-            const msg = await getUrlbuffer(getUrl);
+        reply: async (msg, select) => {
+            // is buffer
             if (Buffer.isBuffer(msg)) {
-                const url = await ClientKOA.setLocalImg(msg);
-                if (!url)
-                    return false;
-                return await ClientNTQQ.postFilesByGroup(event.group_id, url).catch(everyoneError);
+                try {
+                    const url = await ClientKOA.setLocalImg(msg);
+                    if (!url)
+                        return false;
+                    return await ClientNTQQ.postFilesByGroup(event.group_id, url).catch(everyoneError);
+                }
+                catch (err) {
+                    console.error(err);
+                    return err;
+                }
             }
-        }
-        return await ClientNTQQ.postMessageByGroup(event.group_id, content, event.id).catch(everyoneError);
-    };
-    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;
+            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 dimensions = IMGS.imageSize(msg[isBuffer]);
+                    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})`, event.id).catch(everyoneError);
+                }
+                catch (err) {
+                    console.error(err);
+                    return err;
                 }
-                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)) {
+                    const url = await ClientKOA.setLocalImg(msg);
+                    if (!url)
+                        return false;
+                    return await ClientNTQQ.postFilesByGroup(event.group_id, url).catch(everyoneError);
+                }
             }
+            return await ClientNTQQ.postMessageByGroup(event.group_id, content, event.id).catch(everyoneError);
         }
-        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;
     };
     /**
      * 消息原文

package/lib/ntqq/alemon/segment.js

@@ -7,7 +7,7 @@ export const segmentNTQQ = {
      */
     at: (uid) => {
         // 暂时用户@
-        return ''; // 没有艾特了
+        return `<@${uid}>`;
     },
     /**
      * 艾特全体
@@ -16,6 +16,9 @@ export const segmentNTQQ = {
     atAll: () => {
         return '@everyone';
     },
+    /**
+     * 本地图片
+     */
     img: getPathBuffer,
     /**
      * 标注GET请求
@@ -36,3 +39,11 @@ export const segmentNTQQ = {
         return `[🔗${title}](${centent})`;
     }
 };
+// 标题
+//  加粗
+// 下划线加粗
+//  斜体
+// 星号斜体
+// 加粗斜体
+// 删除线
+// 块引用

package/lib/ntqq/index.js

@@ -50,3 +50,5 @@ export async function createAlemonByNtqq() {
     }
     return false;
 }
+// 客户端
+export { ClientNTQQ } from './sdk/index.js';