alemonjs 1.1.10 → 1.1.12

package/lib/core/apps.js

@@ -2,6 +2,19 @@ import { dirname, basename } from 'path';
 import { fileURLToPath } from 'url';
 import { setAppMessage, setAppArg, setAppCharacter, setAppEvent, setAppPriority } from './cache.js';
 import { setApp } from './app.js';
+/**
+ * 引用路径
+ * @param url
+ * @returns
+ */
+export function importPath(url) {
+    const DirPath = getAppPath(url);
+    const AppName = basename(DirPath);
+    return {
+        cwd: () => DirPath,
+        name: AppName
+    };
+}
 /**
  * 得到执行路径
  * @param url  import.meta.url

package/lib/core/dealmsg.js

@@ -200,7 +200,7 @@ async function loadPlugins(dir) {
                     if (match && match[1]) {
                         const packageName = match[1];
                         console.error(`[APP] [${appname}] 缺失 ${packageName} 包`);
-                        // 发生消息
+                        // 发送消息
                         process.send?.({
                             type: 'lack-of-package',
                             message: {
@@ -298,8 +298,8 @@ export async function loadInit() {
  * @returns 是否处理完成
  */
 export async function InstructionMatching(e) {
-    if (process.env?.ALEMONJS_EVENT == 'dev')
-        console.log(e);
+    if (process.env?.ALEMONJS_MESSAGE == 'dev')
+        console.info('e', e);
     /**
      * 对话机
      */
@@ -410,8 +410,8 @@ export async function InstructionMatching(e) {
  * @returns 是否处理完成
  */
 export async function typeMessage(e) {
-    if (process.env?.ALEMONJS_EVENT == 'dev')
-        console.log(e);
+    if (process.env?.ALEMONJS_MESSAGE == 'dev')
+        console.info('e', e);
     if (!CommandNotMessage[e.event])
         return true;
     const APPCACHE = {};

package/lib/default/mysql.js

@@ -1,7 +1,7 @@
 export default {
-    host: 'localhost',
-    port: 3306,
-    user: 'root',
-    password: '',
-    database: 'alemonjs'
+    host: process.env?.ALEMONJS_SQL_HOST ?? 'localhost',
+    port: Number(process.env?.ALEMONJS_SQL_PORT ?? 3306),
+    user: process.env?.ALEMONJS_SQL_USER ?? 'root',
+    password: process.env?.ALEMONJS_SQL_PASSWORD ?? '',
+    database: process.env?.ALEMONJS_SQL_DATABASE ?? 'alemonjs'
 };

package/lib/default/pup.js

@@ -1,6 +1,6 @@
 export default {
-    headless: 'new',
-    timeout: 30000,
+    headless: process.env?.ALEMONJS_PUPPERTEER_HEADLESS ?? 'new',
+    timeout: Number(process.env?.ALEMONJS_PUPPERTEER_TIMEOUT ?? 30000),
     args: [
         '--disable-gpu',
         '--disable-dev-shm-usage',

package/lib/default/redis.js

@@ -1,6 +1,6 @@
 export default {
-    host: '127.0.0.1',
-    port: 6379,
-    password: '',
-    db: 1
+    host: process.env?.ALEMONJS_REDIS_HOST ?? '127.0.0.1',
+    port: Number(process.env?.ALEMONJS_REDIS_PORT ?? 6379),
+    password: process.env?.ALEMONJS_REDIS_PASSWORD ?? '',
+    db: Number(process.env?.ALEMONJS_REDIS_DB ?? 1)
 };

package/lib/default/server.js

@@ -1,4 +1,4 @@
 export default {
-    host: 'localhost',
-    port: 5000
+    host: process.env?.ALEMONJS_SERVER_HOST ?? 'localhost',
+    port: Number(process.env?.ALEMONJS_SERVER_PORT) ?? 5000
 };

package/lib/define/main.js

@@ -2,11 +2,13 @@ import PupOptions from '../default/pup.js';
 import { rebotMap } from './map.js';
 import { nodeScripts } from './child_process.js';
 import { command } from './command.js';
-import { createApp, setLanchConfig, loadInit, appsInit, setAppProCoinfg, startChrom, getPublicIP } from '../core/index.js';
+import { AppNameError } from '../log/index.js';
+import { setLanchConfig, loadInit, appsInit, setAppProCoinfg, startChrom, getPublicIP } from '../core/index.js';
 import { getPupPath, setBotConfigByKey, getBotConfigByKey } from '../config/index.js';
 import { createWeb } from '../koa/index.js';
 import { autoClearFiles } from '../koa/file.js';
 import { AvailableIntentsEventsEnum } from 'qq-guild-bot';
+import { join } from 'path';
 let OptionsCache;
 /**
  * 得到初始化配置
@@ -229,19 +231,19 @@ export async function defineAlemonConfig(Options) {
      * ************
      */
     if (Options?.login && Options?.app?.init !== false) {
-        const app = createApp(Options?.app?.name ?? 'bot');
-        if (Options?.app?.regJSon?.create === false) {
-            setAppProCoinfg('regex', Options?.app?.regJSon?.create);
+        if (Options?.app?.regJSON?.create === false) {
+            setAppProCoinfg('regex', Options?.app?.regJSON?.create);
         }
-        if (Options?.app?.regJSon?.address) {
-            setAppProCoinfg('route', Options?.app?.regJSon?.address);
+        if (Options?.app?.regJSON?.address) {
+            setAppProCoinfg('route', Options?.app?.regJSON?.address);
         }
-        if (Options?.app?.component) {
-            for await (const item of Options.app.component) {
-                app.component(item);
-            }
+        if (Options?.app?.scripts && typeof Options?.app?.scripts == 'string') {
+            const dir = join(process.cwd(), Options?.app?.scripts);
+            await import(`file://${dir}`).catch(err => {
+                console.error(`file://${dir}`);
+                AppNameError('local dev', err);
+            });
         }
-        app.mount();
     }
     /**
      * ************
@@ -300,9 +302,6 @@ export async function defineAlemonConfig(Options) {
      * ************
      */
     if (Options?.mount !== false) {
-        if (Options?.regex) {
-            setAppProCoinfg('regex', Options?.regex);
-        }
         await appsInit();
     }
     /**

package/lib/discord/alemon/message/CHANNEL_TOPIC_UPDATE.js

@@ -3,7 +3,6 @@
  * @param event
  */
 export async function CHANNEL_TOPIC_UPDATE(event) {
-    //
     if (process.env?.ALEMONJS_EVENT == 'dev')
-        console.log('CHANNEL_TOPIC_UPDATE', event);
+        console.info('event', event);
 }

package/lib/discord/alemon/message/CHANNEL_UPDATE.js

@@ -3,7 +3,6 @@
  * @param event
  */
 export async function CHANNEL_UPDATE(event) {
-    //
     if (process.env?.ALEMONJS_EVENT == 'dev')
-        console.log('CHANNEL_UPDATE', event);
+        console.info('event', event);
 }

package/lib/discord/alemon/message/GUILD_MEMBER_ADD.js

@@ -3,7 +3,6 @@
  * @param event
  */
 export async function GUILD_MEMBER_ADD(event) {
-    //
     if (process.env?.ALEMONJS_EVENT == 'dev')
-        console.log('GUILD_MEMBER_ADD_TYPE', event);
+        console.info('event', event);
 }

package/lib/discord/alemon/message/GUILD_MEMBER_REMOVE.js

@@ -3,7 +3,6 @@
  * @param event
  */
 export async function GUILD_MEMBER_REMOVE(event) {
-    //
     if (process.env?.ALEMONJS_EVENT == 'dev')
-        console.log('GUILD_MEMBER_REMOVE', event);
+        console.info('event', event);
 }

package/lib/discord/alemon/message/GUILD_MEMBER_UPDATE.js

@@ -3,7 +3,6 @@
  * @param event
  */
 export async function GUILD_MEMBER_UPDATE(event) {
-    //
     if (process.env?.ALEMONJS_EVENT == 'dev')
-        console.log('GUILD_MEMBER_UPDATE', event);
+        console.info('event', event);
 }

package/lib/discord/alemon/message/MESSAGE_CREATE.js

@@ -14,7 +14,7 @@ export async function MESSAGE_CREATE(event) {
     if (event.author?.bot)
         return;
     if (process.env?.ALEMONJS_EVENT == 'dev')
-        console.log('MESSAGES_TYPE', event);
+        console.info('event', event);
     const Message = ClientController({
         guild_id: event.guild_id,
         channel_id: event.channel_id,

package/lib/discord/alemon/message/MESSAGE_DELETE.js

@@ -4,5 +4,5 @@
  */
 export async function MESSAGE_DELETE(event) {
     if (process.env?.ALEMONJS_EVENT == 'dev')
-        console.log('MESSAGE_DELETE', event);
+        console.info('event', event);
 }

package/lib/discord/alemon/message/MESSAGE_REACTION_ADD.js

@@ -4,5 +4,5 @@
  */
 export async function MESSAGE_REACTION_ADD(event) {
     if (process.env?.ALEMONJS_EVENT == 'dev')
-        console.log('MESSAGE_REACTION_ADD', event);
+        console.info('event', event);
 }

package/lib/discord/alemon/message/MESSAGE_UPDATE.js

@@ -4,5 +4,5 @@
  */
 export async function MESSAGE_UPDATE(event) {
     if (process.env?.ALEMONJS_EVENT == 'dev')
-        console.log('MESSAGE_UPDATE_TYPE', event);
+        console.info('event', event);
 }

package/lib/discord/alemon/message/PRESENCE_UPDATE.js

@@ -3,7 +3,6 @@
  * @param event
  */
 export async function PRESENCE_UPDATE(event) {
-    //
     if (process.env?.ALEMONJS_EVENT == 'dev')
-        console.log('MESSAGE_CREATE_TYPE', event);
+        console.info('event', event);
 }

package/lib/discord/alemon/message/TYPING_START.js

@@ -4,5 +4,5 @@
  */
 export async function TYPING_START(event) {
     if (process.env?.ALEMONJS_EVENT == 'dev')
-        console.log('TYPING_START_TYPE', event);
+        console.info('event', event);
 }

package/lib/discord/alemon/message/VOICE_CHANNEL_STATUS_UPDATE.js

@@ -3,7 +3,6 @@
  * @param event
  */
 export async function VOICE_CHANNEL_STATUS_UPDATE(event) {
-    //
     if (process.env?.ALEMONJS_EVENT == 'dev')
-        console.log('VOICE_CHANNEL_STATUS_UPDATE', event);
+        console.info('event', event);
 }

package/lib/discord/alemon/message/VOICE_STATE_UPDATE.js

@@ -4,5 +4,5 @@
  */
 export async function VOICE_STATE_UPDATE(event) {
     if (process.env?.ALEMONJS_EVENT == 'dev')
-        console.log('VOICE_STATE_UPDATE', event);
+        console.info('event', event);
 }

package/lib/discord/sdk/api.js

@@ -1,6 +1,7 @@
 import { Service } from './base.js';
 import FormData from 'form-data';
 import { createPicFrom } from '../../core/index.js';
+import { ApiLog } from './log.js';
 export * from './cdn.js';
 export * from './base.js';
 /**
@@ -11,7 +12,7 @@ export function applicationsMe() {
     return Service({
         method: 'get',
         url: '/applications/@me'
-    }).then(res => res.data);
+    }).then(ApiLog);
 }
 /**
  *
@@ -25,7 +26,7 @@ export function channelsMessages(channel_id, data, headers) {
         method: 'post',
         headers: headers,
         data
-    }).then(res => res.data);
+    }).then(ApiLog);
 }
 /**
  *

package/lib/discord/sdk/base.js

@@ -1,5 +1,6 @@
 import axios from 'axios';
 import { getDISCORD } from './config.js';
+import { ApiLog } from './log.js';
 /**
  * KOOK服务
  * @param config
@@ -25,5 +26,5 @@ export function gateway() {
     return Service({
         method: 'get',
         url: '/gateway'
-    }).then(res => res.data);
+    }).then(ApiLog);
 }

package/lib/discord/sdk/cdn.js

@@ -1,5 +1,6 @@
 import axios from 'axios';
 import { getDISCORD } from './config.js';
+import { ApiLog } from './log.js';
 const BaseUrl = 'https://cdn.discordapp.com';
 export function ServiceApp(config) {
     const { token } = getDISCORD();
@@ -33,5 +34,5 @@ export function getUserUrl(user_id, avatar_hash) {
     return ServiceApp({
         url: url,
         method: 'get'
-    }).then(res => res.data);
+    }).then(ApiLog);
 }

package/lib/discord/sdk/log.js

@@ -0,0 +1,11 @@
+export function ApiLog(res) {
+    if (process.env?.DISCORD_API_REQUEST == 'dev')
+        console.log('api-config', res?.request);
+    if (process.env?.DISCORD_API_HEADERS == 'dev')
+        console.log('api-config', res?.headers);
+    if (process.env?.DISCORD_API_CONFIG == 'dev')
+        console.log('api-config', res?.config);
+    if (process.env?.DISCORD_API_DATA == 'dev')
+        console.log('api-data', res?.data);
+    return res?.data;
+}

package/lib/index.js

@@ -26,10 +26,6 @@ export * from './define/index.js';
  * api
  */
 export * from './api.js';
-/**
- * 平台特殊函数
- */
-export * from './utils.js';
 /**
  * *************
  * exit

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

@@ -12,7 +12,7 @@ export const DIRECT_MESSAGE = async (event) => {
     if (event.extra?.author?.bot)
         return false;
     if (process.env?.ALEMONJS_EVENT == 'dev')
-        console.info(event);
+        console.info('event', event);
     const open_id = event.extra.code;
     const cfg = getBotConfigByKey('kook');
     const masterID = cfg.masterID;

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

@@ -15,7 +15,7 @@ import { directController } from '../direct.js';
 export const GUILD_MESSAGE_REACTIONS = async (event) => {
     const body = event.extra.body;
     if (process.env?.ALEMONJS_EVENT == 'dev')
-        console.info(event);
+        console.info('event', event);
     const cfg = getBotConfigByKey('kook');
     const masterID = cfg.masterID;
     const Message = ClientController({

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

@@ -16,7 +16,7 @@ export const PUBLIC_GUILD_MESSAGES_KOOK = async (event) => {
     if (event.extra?.author?.bot)
         return false;
     if (process.env?.ALEMONJS_EVENT == 'dev')
-        console.info(event);
+        console.info('event', event);
     let at = false;
     const at_users = [];
     let msg = event.content;

package/lib/kook/sdk/api.js

@@ -3,6 +3,17 @@ import FormData from 'form-data';
 import { ApiEnum } from './typings.js';
 import { getKookToken } from './config.js';
 import { createPicFrom } from '../../core/index.js';
+export function ApiLog(res) {
+    if (process.env?.KOOK_API_REQUEST == 'dev')
+        console.log('api-config', res?.request);
+    if (process.env?.KOOK_API_HEADERS == 'dev')
+        console.log('api-config', res?.headers);
+    if (process.env?.KOOK_API_CONFIG == 'dev')
+        console.log('api-config', res?.config);
+    if (process.env?.KOOK_API_DATA == 'dev')
+        console.log('api-data', res?.data);
+    return res?.data;
+}
 /**
  * KOOK服务
  * @param config
@@ -67,7 +78,7 @@ export async function createUrl(formdata) {
         url: ApiEnum.AssetCreate,
         data: formdata,
         headers: formdata.getHeaders()
-    }).then(res => res.data);
+    }).then(ApiLog);
 }
 /**
  * *********
@@ -84,7 +95,7 @@ export async function createMessage(data) {
         method: 'post',
         url: ApiEnum.MessageCreate,
         data
-    }).then(res => res.data);
+    }).then(ApiLog);
 }
 /**
  * 创建私聊消息
@@ -101,7 +112,7 @@ export async function userChatCreate(target_id) {
         data: {
             target_id
         }
-    }).then(res => res.data);
+    }).then(ApiLog);
 }
 /**
  * 创建消息
@@ -113,7 +124,7 @@ export async function createDirectMessage(data) {
         method: 'post',
         url: ApiEnum.DirectMessageCreate,
         data
-    }).then(res => res.data);
+    }).then(ApiLog);
 }
 /**
  * 删除指定消息
@@ -127,7 +138,7 @@ export async function messageDelete(msg_id) {
         data: {
             msg_id
         }
-    }).then(res => res.data);
+    }).then(ApiLog);
 }
 /**
  * 重编辑指定消息
@@ -139,7 +150,7 @@ export async function messageUpdate(data) {
         method: 'post',
         url: ApiEnum.MessageUpdate,
         data
-    }).then(res => res.data);
+    }).then(ApiLog);
 }
 /**
  * 删回应
@@ -151,7 +162,7 @@ export async function messageDeleteReaction(data) {
         method: 'post',
         url: ApiEnum.MessageDeleteReaction,
         data
-    }).then(res => res.data);
+    }).then(ApiLog);
 }
 /**
  * 发回应
@@ -163,7 +174,7 @@ export async function messageAddReaction(data) {
         method: 'post',
         url: ApiEnum.MessageAddReaction,
         data
-    }).then(res => res.data);
+    }).then(ApiLog);
 }
 /**
  * 某个回应的所有用户
@@ -175,7 +186,7 @@ export async function messageReactionList(params) {
         method: 'get',
         url: ApiEnum.MessageReactionList,
         params
-    }).then(res => res.data);
+    }).then(ApiLog);
 }
 /**
  * **********
@@ -192,7 +203,7 @@ export async function userMe() {
     return kookService({
         method: 'get',
         url: ApiEnum.UserMe
-    }).then(res => res.data);
+    }).then(ApiLog);
 }
 /**
  * 得到用户信息
@@ -208,7 +219,7 @@ export async function userView(guild_id, user_id) {
             guild_id,
             user_id
         }
-    }).then(res => res.data);
+    }).then(ApiLog);
 }
 /**
  * 踢出
@@ -224,7 +235,7 @@ export async function guildKickout(guild_id, user_id) {
             guild_id,
             target_id: user_id
         }
-    }).then(res => res.data);
+    }).then(ApiLog);
 }
 /**
  * 创建角色
@@ -242,5 +253,5 @@ export async function channelRoleCreate(channel_id, type, value) {
             type,
             value
         }
-    }).then(res => res.data);
+    }).then(ApiLog);
 }

package/lib/log/index.js

@@ -4,3 +4,33 @@ export const everyoneError = (err) => {
     console.error(err);
     return err;
 };
+/**
+ * 捕捉插件错误
+ * @param appname
+ * @param err
+ * @returns
+ */
+export const AppNameError = (appname, err) => {
+    // 属于依赖缺失
+    const match = /Cannot find package '(.+)' imported from/.exec(err.message);
+    if (match && match[1]) {
+        const packageName = match[1];
+        console.error(`[APP] [${appname}] 缺失 ${packageName} 包`);
+        // 发送消息
+        process.send?.({
+            type: 'lack-of-package',
+            message: {
+                packageName
+            }
+        });
+        return;
+    }
+    else {
+        // 其他错误
+        console.error(`[APP] [${appname}]`, err);
+        process.send?.({
+            type: 'error',
+            message: err
+        });
+    }
+};

package/lib/login.js

@@ -4,7 +4,8 @@
  * @returns 返回校验所得login配置
  */
 export function analysis(val) {
-    const ars = process.argv.slice(2);
+    const argv = [...process.argv];
+    const ars = argv.slice(2);
     // 缓存key
     let ket = '';
     for (const item in val) {

package/lib/ntqq/alemon/group/controller.js

@@ -52,7 +52,8 @@ export const Controller = {
                             }).then(res => res.file_info)
                         },
                         msg_id,
-                        msg_type: 7
+                        msg_type: 7,
+                        msg_seq: ClientNTQQ.getMsgSeq(msg_id)
                     });
                 }
                 return false;
@@ -69,7 +70,8 @@ export const Controller = {
                             }).then(res => res.file_info)
                         },
                         msg_id,
-                        msg_type: 7
+                        msg_type: 7,
+                        msg_seq: ClientNTQQ.getMsgSeq(msg_id)
                     });
                 }
                 return false;
@@ -82,7 +84,8 @@ export const Controller = {
                 for (const item of msg) {
                     arr.push(ClientNTQQ.groupOpenMessages(guild_id, {
                         msg_id,
-                        ...item
+                        ...item,
+                        msg_seq: ClientNTQQ.getMsgSeq(msg_id)
                     }));
                 }
                 return arr;

package/lib/ntqq/alemon/group/direct.js

@@ -84,7 +84,8 @@ const Controller = {
                             }).then(res => res.file_info)
                         },
                         msg_id,
-                        msg_type: 7
+                        msg_type: 7,
+                        msg_seq: ClientNTQQ.getMsgSeq(msg_id)
                     }).catch(everyoneError);
                 }
                 return false;
@@ -106,7 +107,8 @@ const Controller = {
                             }).then(res => res.file_info)
                         },
                         msg_id,
-                        msg_type: 7
+                        msg_type: 7,
+                        msg_seq: ClientNTQQ.getMsgSeq(msg_id)
                     }).catch(everyoneError);
                 }
                 return;
@@ -116,6 +118,7 @@ const Controller = {
                 for (const item of msg) {
                     arr.push(ClientNTQQ.usersOpenMessages(open_id, {
                         msg_id,
+                        msg_seq: ClientNTQQ.getMsgSeq(msg_id),
                         ...item
                     }));
                 }
@@ -179,7 +182,8 @@ export async function directController(msg, open_id, msg_id) {
                     }).then(res => res.file_info)
                 },
                 msg_id,
-                msg_type: 7
+                msg_type: 7,
+                msg_seq: ClientNTQQ.getMsgSeq(msg_id)
             }).catch(everyoneError);
         }
         catch (err) {
@@ -214,7 +218,8 @@ export async function directController(msg, open_id, msg_id) {
                     }).then(res => res.file_info)
                 },
                 msg_id,
-                msg_type: 7
+                msg_type: 7,
+                msg_seq: ClientNTQQ.getMsgSeq(msg_id)
             }).catch(everyoneError);
         }
         catch (err) {
@@ -252,13 +257,15 @@ export async function directController(msg, open_id, msg_id) {
                     }).then(res => res.file_info)
                 },
                 msg_id,
-                msg_type: 7
+                msg_type: 7,
+                msg_seq: ClientNTQQ.getMsgSeq(msg_id)
             }).catch(everyoneError);
         }
     }
     return await ClientNTQQ.usersOpenMessages(open_id, {
         content,
         msg_id,
-        msg_type: 0
+        msg_type: 0,
+        msg_seq: ClientNTQQ.getMsgSeq(msg_id)
     }).catch(everyoneError);
 }