alemonjs 1.1.11 → 1.1.13

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

@@ -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/core/index.js

@@ -17,3 +17,4 @@ export * from './screenshot.js';
 export * from './typings.js';
 export * from './buffer.js';
 export * from './ip.js';
+export * from './utils.js';

package/lib/core/utils.js

@@ -0,0 +1,11 @@
+/**
+ * 字符串数组转正则
+ * [''] => /^$/
+ * ['abc'] => /^abc$/
+ * ['a','b','c'] => /^(a|b|c)$/
+ * @param APP
+ * @returns
+ */
+export function arrayToRule(APP) {
+    return APP.length == 0 ? /^$/ : new RegExp(APP.join('|'));
+}

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

@@ -89,16 +89,16 @@ export async function defineAlemonConfig(Options) {
                 setBotConfigByKey('qq', {
                     intents: [
                         // 基础事件
-                        AvailableIntentsEventsEnum.GUILDS,
-                        AvailableIntentsEventsEnum.GUILD_MEMBERS,
-                        AvailableIntentsEventsEnum.DIRECT_MESSAGE,
+                        AvailableIntentsEventsEnum.GUILDS, //频道进出
+                        AvailableIntentsEventsEnum.GUILD_MEMBERS, //成员资料
+                        AvailableIntentsEventsEnum.DIRECT_MESSAGE, //私信
                         // 需申请的
-                        AvailableIntentsEventsEnum.AUDIO_ACTION,
-                        AvailableIntentsEventsEnum.MESSAGE_AUDIT,
-                        AvailableIntentsEventsEnum.INTERACTION,
-                        AvailableIntentsEventsEnum.GUILD_MESSAGE_REACTIONS,
+                        AvailableIntentsEventsEnum.AUDIO_ACTION, //音频
+                        AvailableIntentsEventsEnum.MESSAGE_AUDIT, //消息审核
+                        AvailableIntentsEventsEnum.INTERACTION, //互动事件
+                        AvailableIntentsEventsEnum.GUILD_MESSAGE_REACTIONS, //表情表态
                         // 私域特有
-                        AvailableIntentsEventsEnum.GUILD_MESSAGES,
+                        AvailableIntentsEventsEnum.GUILD_MESSAGES, //私域事件
                         AvailableIntentsEventsEnum.FORUMS_EVENT //私域论坛
                     ],
                     ...Options.login.qq
@@ -108,9 +108,9 @@ export async function defineAlemonConfig(Options) {
                 setBotConfigByKey('qq', {
                     intents: [
                         // 基础事件
-                        AvailableIntentsEventsEnum.GUILDS,
-                        AvailableIntentsEventsEnum.GUILD_MEMBERS,
-                        AvailableIntentsEventsEnum.DIRECT_MESSAGE,
+                        AvailableIntentsEventsEnum.GUILDS, //频道进出
+                        AvailableIntentsEventsEnum.GUILD_MEMBERS, //成员资料
+                        AvailableIntentsEventsEnum.DIRECT_MESSAGE, //私信
                         // 公域特有
                         AvailableIntentsEventsEnum.PUBLIC_GUILD_MESSAGES //公域事件
                     ],

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/discord.js

@@ -5,7 +5,7 @@ import { IntentsEnum } from './sdk/index.js';
 export const defineDISCORD = {
     token: '',
     intent: [
-        IntentsEnum.MESSAGE_CONTENT,
+        IntentsEnum.MESSAGE_CONTENT, // 内容是基础
         //
         IntentsEnum.DIRECT_MESSAGES,
         IntentsEnum.DIRECT_MESSAGE_TYPING,

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/discord/sdk/types.js

@@ -19,4 +19,4 @@ export var IntentsEnum;
     IntentsEnum[IntentsEnum["GUILD_SCHEDULED_EVENTS"] = 65536] = "GUILD_SCHEDULED_EVENTS";
     IntentsEnum[IntentsEnum["AUTO_MODERATION_CONFIGURATION"] = 1048576] = "AUTO_MODERATION_CONFIGURATION";
     IntentsEnum[IntentsEnum["AUTO_MODERATION_EXECUTION"] = 2097152] = "AUTO_MODERATION_EXECUTION";
-})(IntentsEnum = IntentsEnum || (IntentsEnum = {}));
+})(IntentsEnum || (IntentsEnum = {}));

package/lib/discord/sdk/wss.js

@@ -19,7 +19,7 @@ export async function createClient(conversation, shard = [0, 1]) {
     });
     const call = async () => {
         wsConn.send(JSON.stringify({
-            op: 1,
+            op: 1, //  op = 1
             d: null // 如果是第一次连接，传null
         }));
         setTimeout(call, heartbeat_interval);

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,14 +12,14 @@ 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;
     const avatar = event.extra.author.avatar;
     // 私聊中 控制器并非私聊接口
     const Message = ClientDirectController({
-        channel_id: event.target_id,
+        channel_id: event.target_id, // 频道号
         open_id: open_id
     });
     const Member = ClientControllerOnMember();
@@ -33,11 +33,11 @@ export const DIRECT_MESSAGE = async (event) => {
             : 'single',
         bot: getBotMsgByKOOK(),
         isMaster: event.extra.author.id == masterID,
-        guild_id: '',
+        guild_id: '', // 频道号
         guild_name: '',
         guild_avatar: '',
         channel_name: event.extra.channel_name,
-        channel_id: event.target_id,
+        channel_id: event.target_id, // 子频道
         attachments: [],
         specials: [],
         //

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

@@ -15,16 +15,16 @@ 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({
-        channel_id: event.target_id,
+        channel_id: event.target_id, // 子频道
         msg_id: event.msg_id,
         user_id: body.user_id
     });
     const Member = ClientControllerOnMember({
-        guild_id: event.target_id,
+        guild_id: event.target_id, // 频道
         user_id: body.user_id
     });
     const data = await ClientKOOK.userChatCreate(body.user_id).then(res => res?.data);
@@ -38,11 +38,11 @@ export const GUILD_MESSAGE_REACTIONS = async (event) => {
             : 'single',
         bot: getBotMsgByKOOK(),
         isMaster: body.user_id == masterID ? true : false,
-        guild_id: event.target_id,
+        guild_id: event.target_id, // 频道
         guild_name: '',
         guild_avatar: '',
         channel_name: '',
-        channel_id: event.target_id,
+        channel_id: event.target_id, // 子频道
         attachments: [],
         specials: [],
         //
@@ -52,7 +52,7 @@ export const GUILD_MESSAGE_REACTIONS = async (event) => {
         msg: '',
         msg_txt: event.content,
         msg_id: event.msg_id,
-        open_id: data?.code ?? '',
+        open_id: data?.code ?? '', // 私聊标记 空的 需要创建私聊 每次请求都自动创建
         //
         user_id: body.user_id,
         user_name: '',

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;
@@ -59,12 +59,12 @@ export const PUBLIC_GUILD_MESSAGES_KOOK = async (event) => {
     const masterID = cfg.masterID;
     const avatar = event.extra.author.avatar;
     const Message = ClientController({
-        channel_id: event.target_id,
+        channel_id: event.target_id, // 子频道
         msg_id: event.msg_id,
         user_id: event.extra.author.id
     });
     const Member = ClientControllerOnMember({
-        guild_id: event.target_id,
+        guild_id: event.target_id, // 频道
         user_id: event.extra.author.id
     });
     const data = await ClientKOOK.userChatCreate(event.extra.author.id).then(res => res?.data);
@@ -78,11 +78,11 @@ export const PUBLIC_GUILD_MESSAGES_KOOK = async (event) => {
             : 'single',
         bot: getBotMsgByKOOK(),
         isMaster: event.extra.author.id == masterID ? true : false,
-        guild_id: event.extra.guild_id,
+        guild_id: event.extra.guild_id, // 频道
         guild_name: '',
         guild_avatar: '',
         channel_name: '',
-        channel_id: event.target_id,
+        channel_id: event.target_id, // 子频道
         attachments: [],
         specials: [],
         //
@@ -92,7 +92,7 @@ export const PUBLIC_GUILD_MESSAGES_KOOK = async (event) => {
         msg,
         msg_txt: event.content,
         msg_id: event.msg_id,
-        open_id: data?.code ?? '',
+        open_id: data?.code ?? '', // 私聊标记 空的 需要创建私聊 每次请求都自动创建
         //
         user_id: event.extra.author.id,
         user_name: event.extra.author.username,

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/kook/sdk/typings.js

@@ -163,7 +163,7 @@ export var ApiEnum;
      * *******
      */
     ApiEnum["GatewayIndex"] = "/api/v3/gateway/index";
-})(ApiEnum = ApiEnum || (ApiEnum = {}));
+})(ApiEnum || (ApiEnum = {}));
 /**
  * 系统数据可枚举
  */