alemonjs 1.0.39 → 1.0.40

package/lib/config/login.js

@@ -2,10 +2,10 @@ import redis from '../default/redis.js';
 import mysql from '../default/mysql.js';
 import server from '../default/server.js';
 import puppeteer from '../default/pup.js';
-import kook from '../kook/kook.js';
-import villa from '../villa/villa.js';
-import qq from '../qq/qq.js';
-import ntqq from '../ntqq/ntqq.js';
+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';
 /**
  * *************
  * defset-config
@@ -43,10 +43,10 @@ export function setBotConfigByKey(key, val) {
                 try {
                     config[key] = {};
                     config[key] = val[item];
-                    console.info('[AlemonJS]', '[新增KEY成功]');
+                    console.info('KEY secess');
                 }
                 catch {
-                    console.info('[AlemonJS]', '[新增KEY失败]');
+                    console.info('KEY err');
                 }
             }
         }

package/lib/core/apps.js

@@ -50,7 +50,7 @@ export function createApp(AppName) {
                 return true;
             }
             catch (err) {
-                console.error('[AlemonJS]', '扩展参设置成功', err);
+                console.error('APP setArg', err);
                 return false;
             }
         },
@@ -65,7 +65,7 @@ export function createApp(AppName) {
                 return true;
             }
             catch (err) {
-                console.error('[AlemonJS]', '重定义消息', err);
+                console.error('APP setMessage', err);
                 return false;
             }
         },
@@ -113,7 +113,7 @@ export function createApp(AppName) {
                 return true;
             }
             catch (err) {
-                console.error('[AlemonJS]', '插件解析', err);
+                console.error('APP component', err);
                 return false;
             }
         },
@@ -125,7 +125,7 @@ export function createApp(AppName) {
                 setApp(AppName, apps);
             }
             catch (err) {
-                console.error('[AlemonJS]', '应用挂起', err);
+                console.error('APP mount', err);
             }
         }
     };

package/lib/core/dealmsg.js

@@ -205,8 +205,8 @@ async function loadPlugins(dir) {
         for await (const appname of apps) {
             if (existsSync(`${dir}/${appname}${main}.${type}`)) {
                 await import(`file://${dir}/${appname}${main}.${type}`).catch(err => {
-                    console.error('[AlemonJS]', `file://${dir}/${appname}${main}.${type}`);
-                    console.error('[AlemonJS]', '加载出错', err);
+                    console.error(`file://${dir}/${appname}${main}.${type}`);
+                    console.error('APP load', err);
                     process.exit();
                 });
             }
@@ -268,7 +268,7 @@ export async function appsInit() {
     // 生成指令json
     createPluginHelp();
     // 打印
-    console.info('[AlemonJS]', '[LOAD]', `APPS*${Object.keys(plugins).length} `);
+    console.info('[APP INIT]', `APPS*${Object.keys(plugins).length} `);
 }
 /**
  * 得到指令大正则
@@ -348,7 +348,7 @@ export async function InstructionMatching(e) {
             APPCACHE[item] = app;
         }
         catch (err) {
-            console.info('[AlemonJS]', '上下文出错', err);
+            console.error('APP ERR', err);
             return;
         }
     }
@@ -373,7 +373,7 @@ export async function InstructionMatching(e) {
                 .catch(logErr(data));
             if (typeof res != 'boolean') {
                 e.reply(res).catch(err => {
-                    console.error('[AlemonJS]', '重发错误', err);
+                    console.error('APP REPLY', err);
                 });
             }
             if (res != false)
@@ -411,7 +411,7 @@ export async function typeMessage(e) {
             APPCACHE[item] = app;
         }
         catch (err) {
-            console.error('[AlemonJS]', '上下文出错', err);
+            console.error('APP', err);
             return;
         }
     }
@@ -424,7 +424,7 @@ export async function typeMessage(e) {
             const res = await app[data.fncName](...[e, ...(ARGCACHE[data.APP] ?? [])]);
             if (typeof res != 'boolean') {
                 e.reply(res).catch(err => {
-                    console.error('[AlemonJS]', '重发错误', err);
+                    console.error('APP REPLY', err);
                 });
             }
             if (res != false)
@@ -439,13 +439,13 @@ export async function typeMessage(e) {
 }
 function logErr(data) {
     return (err) => {
-        console.error(`[${data.event}][${data.fncName}][${false}]\n[${err}]`);
+        console.error(`[${data.event}]`, `[${data.fncName}]`, `[${false}]\n`, `[${err}]`);
         return false;
     };
 }
 function info(data) {
     return (res) => {
-        console.info(`[${data.event}][${data.fncName}][${true}]`);
+        console.info(`[${data.event}]`, `[${data.fncName}]`, `[${true}]`);
         return res;
     };
 }

package/lib/core/puppeteer.js

@@ -59,12 +59,12 @@ export async function pupStartCheck() {
          * 重置次数
          */
         pic = 0;
-        console.info('[AlemonJS]', '[puppeteer] close');
+        console.info('puppeteer close');
         isBrowser = false;
         browser.close().catch(err => {
-            console.error('[AlemonJS]pup关闭错误', err);
+            console.error('puppeteer close', err);
         });
-        console.info('[AlemonJS]', '[puppeteer] reopen');
+        console.info('puppeteer reopen');
         if (!(await startChrom()))
             return false;
         pic++;
@@ -90,24 +90,24 @@ export async function screenshotByFile(htmlPath, Options) {
         const page = await browser.newPage();
         await page.goto(`file://${htmlPath}`, { timeout });
         const body = await page.$(tab);
-        console.info('[AlemonJS]', '[puppeteer] success');
+        console.info('puppeteer success');
         const buff = await body
             .screenshot(SOptions)
             .catch(err => {
-            console.error('[AlemonJS]', '[puppeteer]', '截图错误', err);
+            console.error('puppeteer', 'screenshot', err);
             return false;
         });
         await page.close().catch((err) => {
-            console.error('[AlemonJS]', '[puppeteer]', 'page关闭错误', err);
+            console.error('puppeteer', 'page close', err);
         });
         if (!buff) {
-            console.error('[AlemonJS]', '[puppeteer]', htmlPath);
+            console.error('puppeteer', htmlPath);
             return false;
         }
         return buff;
     }
     catch (err) {
-        console.error('[AlemonJS]', 'page实例化错误', err);
+        console.error('puppeteer newPage', err);
         return false;
     }
 }
@@ -132,11 +132,11 @@ export async function screenshotByUrl(val) {
             timeout: timeout ?? 120000,
             waitUntil
         });
-        console.info(`open ${isurl}`);
+        console.info(`screenshot open ${isurl}`);
         const body = await page.$(tab);
         if (!body) {
             await page.close();
-            console.error('[AlemonJS]', 'tab 获取失败');
+            console.error('screenshot tab err');
             return false;
         }
         await new Promise(resolve => setTimeout(resolve, time ?? 1000));
@@ -147,18 +147,18 @@ export async function screenshotByUrl(val) {
             path: ''
         })
             .catch(err => {
-            console.error('[AlemonJS]', 'page截图错误', err);
+            console.error('screenshot page body', err);
             return false;
         });
         await page.close();
         if (!buff) {
-            console.error('[AlemonJS]', 'buff截图错误', url);
+            console.error('screenshot buffer err', url);
             return false;
         }
         return buff;
     }
     catch (err) {
-        console.error('[AlemonJS]', 'page实例化错误', err);
+        console.error('screenshot newPage', err);
         return false;
     }
 }
@@ -170,12 +170,12 @@ export async function startChrom() {
     try {
         browser = await puppeteer.launch(LaunchCfg);
         isBrowser = true;
-        console.info('[AlemonJS]', '[puppeteer] open success');
+        console.info('puppeteer open success');
         return true;
     }
     catch (err) {
         isBrowser = false;
-        console.error('[AlemonJS]', '[puppeteer] 打开错误', err);
+        console.error('puppeteer err', err);
         return false;
     }
 }

package/lib/core/qrcode.js

@@ -45,7 +45,7 @@ export const getBuffer = (localpath) => {
                 reject(err);
             }
             else {
-                console.info('[AlemonJS]', '[BUFFER][READ]', localpath);
+                console.info('buffer read', localpath);
                 resolve(bufferData);
             }
         });
@@ -60,7 +60,7 @@ export const setBuffer = (localpath, bufferData) => {
     writeFile(localpath, bufferData, (err) => {
         if (err)
             throw err;
-        console.info('[AlemonJS]', '[BUFFER][SET]', localpath);
+        console.info('buffer set', localpath);
     });
     return;
 };

package/lib/core/screenshot.js

@@ -37,7 +37,7 @@ function watchCT(tplFile) {
          * 模板改变,删除模板
          */
         delete html[tplFile];
-        console.info('[AlemonJS]', '[HTML][UPDATA]', tplFile);
+        console.info('html update', tplFile);
     })
         .on('close', () => {
         /**
@@ -110,7 +110,7 @@ export function createHtml(AppName, tplFile) {
         /**
          * 打印反馈生成后的地址
          */
-        console.info('[AlemonJS]', '[HTML][CREATE]', AdressHtml);
+        console.info('html create', AdressHtml);
     }
     return {
         // 模板地址
@@ -194,7 +194,7 @@ export function createStr(Options) {
         /**
          * 打印反馈生成后的地址
          */
-        console.info('[AlemonJS]', '[HTML][CREATE]', AdressHtml);
+        console.info('html create', AdressHtml);
     }
     return {
         control,

package/lib/default/types.js

@@ -1,16 +1 @@
-/**
- * *****
- * ntqq订阅
- * ****
- */
-export var NtQQEventsEnum;
-(function (NtQQEventsEnum) {
-    /**
-     * 群聊消息
-     */
-    NtQQEventsEnum["GROUP_AT_MESSAGE_CREATE"] = "GROUP_AT_MESSAGE_CREATE";
-    /**
-     * 单聊消息
-     */
-    NtQQEventsEnum["C2C_MESSAGE_CREATE"] = "C2C_MESSAGE_CREATE";
-})(NtQQEventsEnum = NtQQEventsEnum || (NtQQEventsEnum = {}));
+export {};

package/lib/define/command.js

@@ -18,7 +18,7 @@ export async function command(cess, cmd) {
     try {
         // 切换目录
         process.chdir(dirPath);
-        console.info('[AlemonJS]', `[command] ${cmd}`);
+        console.info(`command ${cmd}`);
         if (cess == 'execSync') {
             execSync(cmd, { stdio: 'inherit' });
         }

package/lib/define/main.js

@@ -145,7 +145,7 @@ export async function defineAlemonConfig(Options) {
      * ********
      */
     if (!Options?.login || Object.keys(Options?.login ?? {}).length == 0) {
-        console.info('[AlemonJS]', '[LOGIN] 无登录配置');
+        console.info('login no bot');
     }
     /**
      * ***********
@@ -224,6 +224,9 @@ export async function defineAlemonConfig(Options) {
      * ************
      */
     if (Options?.mount !== false) {
+        if (Options?.regex) {
+            setAppProCoinfg('regex', Options?.regex);
+        }
         await appsInit();
     }
     /**

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('[AlemonJS]', 'QQ机器人启动失败~');
+            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('[AlemonJS]', 'Villa机器人启动失败~');
+            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('[AlemonJS]', 'KOOK机器人启动失败~');
+            console.error('KOOK bot open err');
             return false;
         });
     },
@@ -32,7 +32,7 @@ export const rebotMap = {
         const { createAlemonByNtqq: ntqq } = await import('../ntqq/index.js');
         return ntqq().catch(err => {
             console.error(err);
-            console.error('[AlemonJS]', 'Ntqq机器人启动失败~');
+            console.error('NTQQ bot open err');
             return false;
         });
     }

package/lib/koa/client.js

@@ -42,17 +42,17 @@ export function createWeb(val, logFnc) {
      */
     function handlePortConflict(err) {
         if (err.code === 'EADDRINUSE') {
-            console.error('[AlemonJS]', `端口 ${currentPort} 被占用，尝试启动新的端口...`);
+            console.error(`port ${currentPort} occupied, attempting to start a new port...`);
             currentPort++;
             size++;
             if (size >= 10) {
-                console.error('[AlemonJS]', '寻端失败~');
+                console.error('find port err');
                 return;
             }
             createApp(currentPort);
         }
         else {
-            console.error('[AlemonJS]', '启动应用程序时发生错误：', err);
+            console.error('An error occurred while starting the application', err);
         }
     }
     /**
@@ -67,7 +67,7 @@ export function createWeb(val, logFnc) {
             .listen(port, async () => {
             if (logFnc)
                 await logFnc(port);
-            console.info('[AlemonJS]', 'KOA', `http://[::]:${port}`);
+            console.info('server', `http://[::]:${port}`);
         })
             .on('error', handlePortConflict);
     }

package/lib/koa/img.js

@@ -61,10 +61,10 @@ export async function setLocalImg(img) {
     const filename = `${Math.floor(Math.random() * imgSize)}.${(await fileTypeFromBuffer(img))?.ext}`;
     // 文件路径
     const imagePath = join(process.cwd(), imgDir, filename);
-    console.log('[AlemonJS]', '[KOA CREATE]', imagePath);
+    console.info('server create', imagePath);
     // 将图片保存到文件系统中
     writeFileSync(imagePath, img);
     const url = `${http}://${ip}:${port}${imgRouter}/${filename}`;
-    console.info('[AlemonJS]', '[KOA URL]', url);
+    console.info('server url', url);
     return url;
 }

package/lib/kook/alemon/conversation.js

@@ -36,7 +36,7 @@ const ConversationMap = {
      * @param event
      */
     [255]: (event) => {
-        console.info('[AlemonJS]', '系统消息', new Date(event.msg_timestamp));
+        console.info('system message', new Date(event.msg_timestamp));
         // console.info('event', event)
     }
 };
@@ -50,7 +50,7 @@ export async function callBackByKOOK(event) {
         return await ConversationMap[event.type](event);
     }
     else {
-        // console.info('[KOOK] 新事件', event.type)
+        // console.info('kook new message', event.type)
         return false;
     }
 }

package/lib/kook/index.js

@@ -30,7 +30,7 @@ export async function createAlemonByKOOK() {
                     name: data.username,
                     avatar: data.avatar
                 });
-                console.info('[AlemonJS]', '[KOOK] 欢迎回来', data.username);
+                console.info('KOOK Welcome back', data.username);
             }
         });
         return true;

package/lib/kook/kook.js

@@ -1,4 +1,4 @@
-export default {
+export const defineKOOK = {
     token: '',
     masterID: '',
     password: ''

package/lib/kook/login.js

@@ -14,7 +14,7 @@ export async function checkRobotByKOOK() {
         setBotConfigByKey('kook', config);
         return true;
     }
-    console.error('[AlemonJS]', '[LOGIN]', '-----------------------');
-    console.error('[AlemonJS]', '[LOGIN]', 'KOOK配置加载失败~');
+    console.error('login', '-----------------------');
+    console.error('login', 'KOOK config err');
     return false;
 }

package/lib/kook/sdk/ws.js

@@ -26,11 +26,11 @@ export async function getGatewayUrl(token, url = 'https://www.kookapp.cn/api/v3/
             return response.data.data.url;
         }
         else {
-            console.error('[AlemonJS]', '[http] err:', response.data.message);
+            console.error('http err', response.data.message);
         }
     }
     catch (error) {
-        console.error('[AlemonJS]', '[token] err:', error.message);
+        console.error('token err', error.message);
     }
 }
 /**
@@ -50,7 +50,7 @@ export async function createClient(token, callBack) {
     if (gatewayUrl) {
         const ws = new WebSocket(gatewayUrl);
         ws.on('open', () => {
-            console.info('[AlemonJS]', '[token] ok');
+            console.info('token ok');
         });
         /**
          * 标记是否已连接
@@ -115,12 +115,12 @@ export async function createClient(token, callBack) {
                  */
                 case 1: {
                     if (data && data.code === 0) {
-                        console.info('[AlemonJS]', '[ws] ok');
+                        console.info('ws ok');
                         sessionID = data.session_id;
                         isConnected = true;
                     }
                     else {
-                        console.info('[AlemonJS]', '[ws] err');
+                        console.info('ws err');
                     }
                     break;
                 }
@@ -128,7 +128,7 @@ export async function createClient(token, callBack) {
                  * 心跳，ping
                  */
                 case 2: {
-                    console.info('[AlemonJS]', '[ws] ping');
+                    console.info('ws ping');
                     ws.send(JSON.stringify({
                         s: 3
                     }));
@@ -138,21 +138,21 @@ export async function createClient(token, callBack) {
                  * 心跳，pong
                  */
                 case 3: {
-                    console.info('[AlemonJS]', '[ws] pong');
+                    console.info('ws pong');
                     break;
                 }
                 /**
                  * resume, 恢复会话
                  */
                 case 4: {
-                    console.info('[AlemonJS]', '[ws] resume');
+                    console.info('ws resume');
                     break;
                 }
                 /**
                  * reconnect, 要求客户端断开当前连接重新连接
                  */
                 case 5: {
-                    console.info('[AlemonJS]', '[ws] Connection failed, reconnect');
+                    console.info('ws Connection failed, reconnect');
                     /**
                      * 处理 RECONNECT 信令
                      * 断开当前连接并进行重新连接
@@ -171,11 +171,11 @@ export async function createClient(token, callBack) {
                  * resume ack
                  */
                 case 6: {
-                    console.info('[AlemonJS]', '[ws] resume ack');
+                    console.info('ws resume ack');
                     break;
                 }
                 default: {
-                    console.info('[AlemonJS]', '[ws] 默认');
+                    console.info('ws define');
                     break;
                 }
             }
@@ -192,7 +192,7 @@ export async function createClient(token, callBack) {
             }
         }, 30000);
         ws.on('close', () => {
-            console.error('[AlemonJS]', '[ws] close');
+            console.error('ws close');
         });
     }
 }

package/lib/log/event.js

@@ -5,7 +5,7 @@
  * @param text
  */
 export function AlemonJSEventLog(event, eventType) {
-    console.info('[AlemonJS]', `[${event}] [${eventType}] [${true}]`);
+    console.info(`[${event}] [${eventType}] [${true}]`);
 }
 /**
  * 打印用户错误信息
@@ -15,6 +15,6 @@ export function AlemonJSEventLog(event, eventType) {
  * @param text
  */
 export function AlemonJSEventError(err, event, eventType) {
-    console.info('[AlemonJS]', `[${event}] [${eventType}] [${false}]`);
+    console.info(`[${event}] [${eventType}] [${false}]`);
     console.error(err);
 }

package/lib/log/user.js

@@ -5,7 +5,7 @@
  * @param text
  */
 export function AlemonJSLog(channel_id, user_name, text) {
-    console.info('[AlemonJS]', `[${channel_id}] [${user_name}] [${true}] ${text}`);
+    console.info(`[${channel_id}] [${user_name}] [${true}] ${text}`);
 }
 /**
  * 打印用户错误信息
@@ -15,6 +15,6 @@ export function AlemonJSLog(channel_id, user_name, text) {
  * @param text
  */
 export function AlemonJSError(err, channel_id, user_name, text) {
-    console.info('[AlemonJS]', `[${channel_id}] [${user_name}] [${false}] ${text}`);
+    console.info(`[${channel_id}] [${user_name}] [${false}] ${text}`);
     console.error(err);
 }

package/lib/login.js

@@ -33,6 +33,6 @@ export function analysis(val) {
             delete val[ket][item];
         }
     }
-    console.info('[AlemonJS]', '[LOAD BOT]', ket);
+    console.info('LOAD BOT', ket);
     return val[ket];
 }

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

@@ -88,7 +88,7 @@ export const C2C_MESSAGE_CREATE = async (event) => {
         for (const item of arr) {
             try {
                 if (item.type == 'qq_ark' || item.type == 'qq_embed') {
-                    console.info('[AlemonJS]', '暂不可用');
+                    console.info('temporarily unavailable');
                     return false;
                 }
                 else {
@@ -109,7 +109,7 @@ export const C2C_MESSAGE_CREATE = async (event) => {
      * @returns
      */
     e.replyEmoji = async (mid, boj) => {
-        console.info('[AlemonJS]', '不可用');
+        console.info('temporarily unavailable');
         return false;
     };
     /**
@@ -119,7 +119,7 @@ export const C2C_MESSAGE_CREATE = async (event) => {
      * @returns
      */
     e.deleteEmoji = async (mid, boj) => {
-        console.info('[AlemonJS]', '不可用');
+        console.info('temporarily unavailable');
         return false;
     };
     e.msg_txt = event.content;

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

@@ -116,7 +116,7 @@ export const GROUP_AT_MESSAGE_CREATE = async (event) => {
         for (const item of arr) {
             try {
                 if (item.type == 'qq_ark' || item.type == 'qq_embed') {
-                    console.info('[AlemonJS]', '暂不可用');
+                    console.info('temporarily unavailable');
                     return false;
                 }
                 return false;
@@ -135,7 +135,7 @@ export const GROUP_AT_MESSAGE_CREATE = async (event) => {
      * @returns
      */
     e.replyEmoji = async (mid, boj) => {
-        console.info('[AlemonJS]', '暂不可用');
+        console.info('temporarily unavailable');
         return false;
     };
     /**
@@ -145,7 +145,7 @@ export const GROUP_AT_MESSAGE_CREATE = async (event) => {
      * @returns
      */
     e.deleteEmoji = async (mid, boj) => {
-        console.info('[AlemonJS]', '暂不可用');
+        console.info('temporarily unavailable');
         return false;
     };
     /**

package/lib/ntqq/index.js

@@ -38,7 +38,7 @@ export async function createAlemonByNtqq() {
              * 设置配置
              */
             setBotNTQQConfig(g);
-            console.info('[AlemonJS]', '刷新时间:', data.expires_in, '秒');
+            console.info('refresh', data.expires_in, 's');
             setTimeout(bal, data.expires_in * 1000);
         };
         setTimeout(bal, data.expires_in * 1000);