alemonjs 1.0.48 → 1.0.50

package/lib/api.js

@@ -1,24 +1,20 @@
-import { ClientAPIByQQ as ClientByNTQQ } from './ntqq/sdk/index.js';
-import { Client as ClientByVILLA } from './villa/sdk/index.js';
-import { KOOKApiClient as ClientByKOOK } from './kook/sdk/index.js';
-import { ClientKOA as ClientByKOA } from './koa/index.js';
 /**
  * qq客户端
  */
-export const ClientQQ = global.ClientAPIByQQ;
+export const ClientQQ = global.ClientQQ;
 /**
- * kook客户端
+ * villa客户端
  */
-export const ClientKOOK = ClientByKOOK;
+export { ClientVILLA } from './villa/sdk/index.js';
 /**
  * ntqq客户端
  */
-export const ClientNTQQ = ClientByNTQQ;
+export { ClientNTQQ } from './ntqq/sdk/index.js';
 /**
- * villa客户端
+ * server客户端
  */
-export const ClientVILLA = ClientByVILLA;
+export { ClientKOA } from './koa/index.js';
 /**
- * server客户端
+ * kook客户端
  */
-export const ClientKOA = ClientByKOA;
+export { ClientKOOK } from './kook/sdk/index.js';

package/lib/core/apps.js

@@ -1,6 +1,6 @@
 import { dirname, basename } from 'path';
 import { fileURLToPath } from 'url';
-import { setMessage, setAppArg } from './message.js';
+import { setAppMessage, setAppArg, setAppCharacter, setAppEvent, setAppPriority } from './cache.js';
 import { setApp } from './app.js';
 /**
  * 得到执行路径
@@ -40,7 +40,57 @@ export function createApp(AppName) {
      * 重名控制器
      */
     let acount = 0;
+    /**
+     * 设置默认指令规则
+     */
+    setAppCharacter(AppName, '/');
     return {
+        /**
+         * 设置正则最低优先级
+         * 当设置了500，而所有优先级为5000时
+         * 则全部默认为500,但有优先级为300的子应用
+         * 则仅限当前子应用优先级为300
+         * @param val
+         * @returns
+         */
+        setPriority: (val) => {
+            try {
+                setAppPriority(AppName, val);
+                return true;
+            }
+            catch (err) {
+                console.error('APP setEvent', err);
+                return false;
+            }
+        },
+        /**
+         * 设置正则默认消息
+         * @param val
+         * @returns
+         */
+        setEvent: (val) => {
+            try {
+                setAppEvent(AppName, val);
+                return true;
+            }
+            catch (err) {
+                console.error('APP setEvent', err);
+                return false;
+            }
+        },
+        /**
+         * 设置指令规则
+         */
+        setCharacter: (val) => {
+            try {
+                setAppCharacter(AppName, val);
+                return true;
+            }
+            catch (err) {
+                console.error('APP setCharacter', err);
+                return false;
+            }
+        },
         /**
          * 设置扩展参
          */
@@ -61,7 +111,7 @@ export function createApp(AppName) {
          */
         setMessage: (fnc) => {
             try {
-                setMessage(AppName, fnc);
+                setAppMessage(AppName, fnc);
                 return true;
             }
             catch (err) {

package/lib/core/cache.js

@@ -0,0 +1,122 @@
+// 消息控制
+const MSG = {};
+/**
+ * 得到消息
+ * @param key 插件名
+ * @returns 重定义回调函数
+ */
+export function getAppMessage(key) {
+    return MSG[key];
+}
+/**
+ * 设置消息
+ * @param key 插件名
+ * @param fnc 方法
+ */
+export function setAppMessage(key, fnc) {
+    MSG[key] = fnc;
+}
+/**
+ * 删除消息
+ * @param key 插件名
+ */
+export function delAppMessage(key) {
+    delete MSG[key];
+}
+// 扩展控制
+const ARG = {};
+/**
+ * 得到扩展参数
+ * @param key 插件名
+ * @returns
+ */
+export function getAppArg(key) {
+    return ARG[key];
+}
+/**
+ * 设置扩展参数
+ * @param key 插件名
+ * @param fnc 方法
+ */
+export function setAppArg(key, fnc) {
+    ARG[key] = fnc;
+}
+/**
+ * 删除消息
+ * @param key 插件名
+ */
+export function delAppArg(key) {
+    delete ARG[key];
+}
+const CAT = {};
+/**
+ * 得到指令规则
+ * @param key 插件名
+ * @returns
+ */
+export function getAppCharacter(key) {
+    return CAT[key];
+}
+/**
+ * 设置令规则
+ * @param key 插件名
+ * @param val 字符
+ */
+export function setAppCharacter(key, val) {
+    CAT[key] = val;
+}
+/**
+ * 删除令规则
+ * @param key 插件名
+ */
+export function delAppCharacter(key) {
+    delete CAT[key];
+}
+const EVENT = {};
+/**
+ * 得到正则默认事件
+ * @param key 插件名
+ * @returns
+ */
+export function getAppEvent(key) {
+    return EVENT[key];
+}
+/**
+ * 设置正则默认事件
+ * @param key 插件名
+ * @param val 事件名
+ */
+export function setAppEvent(key, val) {
+    EVENT[key] = val;
+}
+/**
+ * 删除正则默认事件
+ * @param key 插件名
+ */
+export function delAppEvent(key) {
+    delete EVENT[key];
+}
+const PRIORITY = {};
+/**
+ * 得到插件默认正则
+ * @param key 插件名
+ * @returns
+ */
+export function getAppPriority(key) {
+    return PRIORITY[key];
+}
+/**
+ * 设置插件默认正则
+ * @param key 插件名
+ * @param val 事件名
+ */
+export function setAppPriority(key, val) {
+    PRIORITY[key] = val;
+}
+/**
+ * 删除插件默认正则
+ * @param key 插件名
+ */
+export function delAppPriority(key) {
+    delete PRIORITY[key];
+}

package/lib/core/dealmsg.js

@@ -2,7 +2,7 @@ import { join } from 'path';
 import { writeFile } from 'fs/promises';
 import { existsSync, mkdirSync, readdirSync, readFileSync } from 'fs';
 import lodash from 'lodash';
-import { getAppArg, getMessage } from './message.js';
+import { getAppArg, getAppEvent, getAppCharacter, getAppMessage, getAppPriority } from './cache.js';
 import { getApp, delApp, getAppKey } from './app.js';
 import { EventEnum } from './typings.js';
 import { conversationHandlers, getConversationState } from './dialogue.js';
@@ -64,16 +64,15 @@ function createPluginHelp() {
 }
 /**
  * 应用挂载
+ * @param AppName 插件名
  * @param AppsObj 插件集成对象
- * @param appname 插件名
  */
-async function synthesis(AppsObj, appname) {
+async function synthesis(AppName, AppsObj) {
     // 没有记载
-    if (!plugins[appname]) {
-        plugins[appname] = [];
+    if (!plugins[AppName]) {
+        plugins[AppName] = [];
     }
     const shield = getAppProCoinfg('event');
-    const defaultCharacter = getAppProCoinfg('defaultCharacter');
     for (const item in AppsObj) {
         const keys = new AppsObj[item]();
         if (shield.find(item => item == keys['event']))
@@ -102,8 +101,7 @@ async function synthesis(AppsObj, appname) {
             x++;
         }
         CommandApp[itemX] = {
-            name: appname,
-            character: keys?.startCharacter ?? defaultCharacter,
+            name: AppName,
             APP: AppsObj[item]
         };
         for await (const key of keys['rule']) {
@@ -119,22 +117,26 @@ async function synthesis(AppsObj, appname) {
             const fncName = key['fnc'];
             const doc = key['doc'] ?? '';
             const dsc = key['dsc'] ?? '';
+            /**
+             * 对比优先级,比设置的低
+             */
+            const AppPriority = getAppPriority(AppName);
             // 如果类型正确
             if (typeof key['reg'] === 'string' || key['reg'] instanceof RegExp) {
                 // 存在正则就必须是MESSAGES
-                const event = 'MESSAGES';
+                const event = getAppEvent(AppName) ?? 'MESSAGES';
                 // 得到解析
                 const reg = key['reg'];
                 if (!reg)
                     continue;
                 // 推送
-                plugins[appname].push({
+                plugins[AppName].push({
                     event: event,
                     eventType: eventType,
                     reg: String(reg),
                     dsc,
                     doc,
-                    priority
+                    priority: AppPriority && AppPriority < priority ? AppPriority : priority
                 });
                 // 保存
                 Command[event].push({
@@ -150,7 +152,7 @@ async function synthesis(AppsObj, appname) {
                 // 控制消息 -- 类型必须要存在的
                 const event = keys['event'];
                 // 推送
-                plugins[appname].push({
+                plugins[AppName].push({
                     event: event,
                     eventType: eventType,
                     dsc,
@@ -161,7 +163,7 @@ async function synthesis(AppsObj, appname) {
                 CommandNotMessage[event].push({
                     event: event,
                     eventType: eventType,
-                    priority,
+                    priority: AppPriority && AppPriority < priority ? AppPriority : priority,
                     reg: /./,
                     fncName,
                     APP: itemX
@@ -242,13 +244,13 @@ export async function appsInit() {
     // 得到所有插件名
     const APPARR = getAppKey();
     // 导出所有插件名
-    for await (const item of APPARR) {
+    for await (const AppName of APPARR) {
         // 获取插件集
-        const apps = getApp(item);
+        const apps = getApp(AppName);
         // 分析插件集
-        await synthesis(apps, item);
+        await synthesis(AppName, apps);
         // 删除指集
-        delApp(item);
+        delApp(AppName);
     }
     // 排序
     for (const val in Command) {
@@ -306,12 +308,14 @@ export async function InstructionMatching(e) {
      * 上下文
      */
     for (const item in CommandApp) {
-        const { name, APP, character } = CommandApp[item];
-        const AppFnc = getMessage(name);
+        const { name, APP } = CommandApp[item];
+        const AppFnc = getAppMessage(name);
         const AppArg = getAppArg(name);
         const _character = getAppProCoinfg('character');
         if (_character.test(e.msg)) {
-            e.msg = e.msg.replace(_character, character);
+            const character = getAppCharacter(name);
+            const __character = getAppProCoinfg('defaultCharacter');
+            e.msg = e.msg.replace(_character, character ?? __character);
         }
         try {
             if (typeof AppFnc == 'function')
@@ -405,7 +409,7 @@ export async function typeMessage(e) {
     const ARGCACHE = {};
     for (const item in CommandApp) {
         const { name, APP } = CommandApp[item];
-        const AppFnc = getMessage(name);
+        const AppFnc = getAppMessage(name);
         const AppArg = getAppArg(name);
         try {
             if (typeof AppFnc == 'function')

package/lib/core/index.js

@@ -8,7 +8,7 @@
 export * from './plugin.js';
 export * from './configs.js';
 export * from './apps.js';
-export * from './message.js';
+export * from './cache.js';
 export * from './dialogue.js';
 export * from './qrcode.js';
 export * from './dealmsg.js';

package/lib/core/plugin.js

@@ -2,6 +2,10 @@
  * 状态缓存
  */
 const stateCache = {};
+/**
+ * 定时器记录
+ */
+const timeoutCache = {};
 /**
  * 插件基础类
  * @class
@@ -36,9 +40,160 @@ export class plugin {
      */
     rule;
     /**
-     * 起始符特性
+     * @deprecated 已废弃,建议使用原生模块 node-schedule
+     */
+    task;
+    /**
+     * @param name 类名标记        default app-name
+     * @param event 事件类型       default MESSAGES
+     * @param eventType 消息类型   default CREATE
+     * @param priority 优先级      越小优越高 default 9000
+     * @param rule.reg 命令正则    RegExp | string
+     * @param rule.fnc 命令函数    function
+     * @param rule.dsc 指令示范    sdc
+     * @param rule.doc 指令文档    doc
+     * @param rule.priority 优先级    数字越小优先级越高
+     */
+    constructor({ name = 'app-name', event = 'message', eventType = 'CREATE', priority = 9000, rule = [], task }) {
+        this.name = name;
+        this.event = event;
+        this.eventType = eventType;
+        this.priority = priority;
+        this.rule = rule;
+        this.task = {
+            name: task?.name ?? '',
+            fnc: task?.fnc ?? '',
+            cron: task?.cron ?? '',
+            log: task?.log ?? false
+        };
+    }
+    /**
+     * @param content 内容
+     * @param img  图片buffer | 指定图片名
+     * @param name 指定图片名
+     * @returns 是否处理完成
+     */
+    async reply(content, select) {
+        if (!this.e.reply || !content || content == '')
+            return false;
+        return await this.e.reply(content, select);
+    }
+    /**
+     * 得到缓存的key
+     * @param isGroup
+     * @returns key
+     */
+    conKey(isGroup = false) {
+        if (isGroup) {
+            // 应用名 频道号
+            return `${JSON.stringify(this.rule)}:${this.name}:${this.e.guild_id}`;
+        }
+        else {
+            // 应用名 用户编号
+            return `${JSON.stringify(this.rule)}:${this.name}:${this.e.user_id}`;
+        }
+    }
+    /**
+     * 设置上下文
+     * @param type 执行方法
+     * @param isGroup 是否群聊
+     * @param time 操作时间，默认120秒
+     */
+    setContext(type, isGroup = false, time = 120) {
+        // 得到缓存key
+        const key = this.conKey(isGroup);
+        // 不存在
+        if (!stateCache[key])
+            stateCache[key] = {};
+        stateCache[key][type] = this.e;
+        // 定时
+        if (!(time && typeof time == 'number'))
+            return;
+        //
+        if (!timeoutCache[key])
+            timeoutCache[key] = {};
+        //
+        timeoutCache[key][type] = setTimeout(() => {
+            this.finish(type, isGroup);
+            this.e.reply('操作超时已取消');
+        }, time * 1000);
+    }
+    /**
+     *
+     * 得到用户缓存消息对象
+     * @returns message
+     */
+    getContext() {
+        return stateCache[this.conKey()];
+    }
+    /**
+     * 得到频道缓存消息对象
+     * @returns message
+     */
+    getContextGroup() {
+        return stateCache[this.conKey(true)];
+    }
+    /**
+     * 完成上下文
+     * @param type 执行方法
+     * @param isGroup 是否公信
+     */
+    finish(type, isGroup = false) {
+        if (!this.conKey(isGroup))
+            return;
+        if (
+        // 检擦key
+        stateCache[this.conKey(isGroup)] &&
+            // 检查方法
+            stateCache[this.conKey(isGroup)][type]) {
+            // 删除方法
+            delete stateCache[this.conKey(isGroup)][type];
+        }
+        if (
+        // 检擦key
+        timeoutCache[this.conKey(isGroup)] &&
+            // 检查方法
+            timeoutCache[this.conKey(isGroup)][type]) {
+            /**
+             * 删除定时任务
+             */
+            clearTimeout(timeoutCache[this.conKey(isGroup)][type]);
+        }
+    }
+}
+/**
+ * 插件基础类
+ * @class
+ */
+export class APlugin {
+    /**
+     * this.e 方法
+     */
+    e;
+    /**
+     * 模块名
+     */
+    name;
+    /**
+     * 模块说明
      */
-    startCharacter;
+    dsc;
+    /**
+     * 事件枚举
+     */
+    event;
+    /**
+     * 事件类型
+     */
+    eventType;
+    /**
+     * 匹配优先级
+     */
+    priority;
+    /**
+     * 匹配集
+     */
+    rule;
     /**
      * @deprecated 已废弃,建议使用原生模块 node-schedule
      */
@@ -54,13 +209,12 @@ export class plugin {
      * @param rule.doc 指令文档    doc
      * @param rule.priority 优先级    数字越小优先级越高
      */
-    constructor({ name = 'app-name', event = 'MESSAGES', eventType = 'CREATE', priority = 9000, startCharacter = '/', rule = [], task }) {
+    constructor({ name = 'app-name', event = 'MESSAGES', eventType = 'CREATE', priority = 9000, rule = [], task }) {
         this.name = name;
         this.event = event;
         this.eventType = eventType;
         this.priority = priority;
         this.rule = rule;
-        this.startCharacter = startCharacter;
         this.task = {
             name: task?.name ?? '',
             fnc: task?.fnc ?? '',
@@ -104,17 +258,20 @@ export class plugin {
         // 得到缓存key
         const key = this.conKey(isGroup);
         // 不存在
-        if (!stateCache[key]) {
+        if (!stateCache[key])
             stateCache[key] = {};
-        }
         stateCache[key][type] = this.e;
         // 定时
-        if (time && typeof time == 'number') {
-            setTimeout(() => {
-                this.finish(type, isGroup);
-                this.e.reply('操作超时已取消');
-            }, time * 1000);
-        }
+        if (!(time && typeof time == 'number'))
+            return;
+        //
+        if (!timeoutCache[key])
+            timeoutCache[key] = {};
+        //
+        timeoutCache[key][type] = setTimeout(() => {
+            this.finish(type, isGroup);
+            this.e.reply('操作超时已取消');
+        }, time * 1000);
     }
     /**
      *
@@ -137,6 +294,8 @@ export class plugin {
      * @param isGroup 是否公信
      */
     finish(type, isGroup = false) {
+        if (!this.conKey(isGroup))
+            return;
         if (
         // 检擦key
         stateCache[this.conKey(isGroup)] &&
@@ -145,5 +304,15 @@ export class plugin {
             // 删除方法
             delete stateCache[this.conKey(isGroup)][type];
         }
+        if (
+        // 检擦key
+        timeoutCache[this.conKey(isGroup)] &&
+            // 检查方法
+            timeoutCache[this.conKey(isGroup)][type]) {
+            /**
+             * 删除定时任务
+             */
+            clearTimeout(timeoutCache[this.conKey(isGroup)][type]);
+        }
     }
 }

package/lib/define/main.js

@@ -2,14 +2,14 @@ import PupOptions from '../default/pup.js';
 import { rebotMap } from './map.js';
 import { nodeScripts } from './child_process.js';
 import { AvailableIntentsEventsEnum } from 'qq-guild-bot';
-import { ClientAPIByQQ as ClientByNTQQ } from '../ntqq/sdk/index.js';
+import { ClientNTQQ } from '../ntqq/sdk/index.js';
 import { command } from './command.js';
 import { createApp, setLanchConfig, loadInit, appsInit, setAppProCoinfg, startChrom } from '../core/index.js';
 import { getPupPath, setBotConfigByKey, getBotConfigByKey } from '../config/index.js';
 import { createWeb } from '../koa/index.js';
 import { autoClearImages } from '../koa/img.js';
 // 设置ntqq独立鉴权路径
-export const setAuthenticationByNtqq = ClientByNTQQ.setAuthentication;
+export const setAuthenticationByNtqq = ClientNTQQ.setAuthentication;
 let OptionsCache;
 /**
  * 得到初始化配置