alemonjs 1.1.40 → 1.2.0-rc.0

package/README.md

@@ -167,6 +167,20 @@ npm run build
 
 该程序可放置于`plugins/your plugin name`文件夹下
 
+# Unknown file ".ts"
+
+node >= 20.0.0
+
+```ts
+npx ts-node alemon.config.ts
+```
+
+更改为
+
+```ts
+node --no-warnings=ExperimentalWarning --loader ts-node/esm alemon.config.ts
+```
+
 ### Dependencies
 
 ```json

package/lib/api/index.js

@@ -4,27 +4,18 @@
  * ***********
  */
 export { ClientQQ } from '../qq/index.js';
-/**
- * villa客户端
- */
 export { ClientVILLA } from '../villa/index.js';
-/**
- * ntqq客户端
- */
 export { ClientNTQQ } from '../ntqq/index.js';
-/**
- * server客户端
- */
 export { ClientKOA } from '../koa/index.js';
-/**
- * kook客户端
- */
 export { ClientKOOK } from '../kook/index.js';
-/**
- * discord
- */
 export { ClientDISOCRD } from '../discord/index.js';
 /**
- * Controller
+ * ************
+ * Controllers
+ * ************
  */
-export * from './controller.js';
+export { Controllers as ControllerVILLA } from '../villa/alemon/controller.js';
+export { Controllers as ControllerQQ } from '../qq/alemon/controller.js';
+export { Controllers as ControllerDISCORD } from '../discord/alemon/controller.js';
+export { Controllers as ControllerNTQQ } from '../ntqq/alemon/controller.js';
+export { Controllers as ControllerKOOK } from '../kook/alemon/controller.js';

package/lib/config/login.js

@@ -1,38 +1,38 @@
 import { DefaultConfig } from '../default/index.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';
-import { defineDISCORD as discord } from '../discord/discord.js';
+import { defineKOOK as kook } from '../kook/sdk/ws.js';
+import { defineVILLA as villa } from '../villa/sdk/wss.js';
+import { defineQQ as qq } from '../qq/sdk/wss.js';
+import { defineNtqq as ntqq } from '../ntqq/sdk/wss.js';
+import { defineDISCORD as discord } from '../discord/sdk/wss.js';
 import { Screenshot } from '../core/index.js';
-class BotConfig {
-    data = {
-        ...DefaultConfig,
-        kook,
-        villa,
-        qq,
-        ntqq,
-        puppeteer: Screenshot.launch,
-        discord
-    };
+class BaseConfig {
+    #data = null;
+    constructor(val) {
+        this.#data = val;
+    }
+    /**
+     * 设置配置
+     * @param key
+     * @param val
+     */
     set(key, val) {
         if (key == 'puppeteer') {
             // pup 不用检查 直接覆盖
             for (const item in val) {
-                this.data[key][item] = val[item];
+                this.#data[key][item] = val[item];
             }
         }
         else {
             for (const item in val) {
                 // 当前仅当同属性名的时候才会覆盖默认配置
-                if (Object.prototype.hasOwnProperty.call(this.data[key], item)) {
-                    this.data[key][item] = val[item];
+                if (Object.prototype.hasOwnProperty.call(this.#data[key], item)) {
+                    this.#data[key][item] = val[item];
                 }
                 else {
                     // 不属于默认
                     try {
-                        this.data[key] = {};
-                        this.data[key] = val[item];
+                        this.#data[key] = {};
+                        this.#data[key] = val[item];
                         console.info('KEY secess');
                     }
                     catch {
@@ -42,25 +42,24 @@ class BotConfig {
             }
         }
     }
+    /**
+     * 读取配置
+     * @param key
+     * @returns
+     */
     get(key) {
-        return this.data[key];
+        return this.#data[key];
     }
 }
 /**
  * 机器人配置
  */
-export const BOTCONFIG = new BotConfig();
-/**
- * 设置机器人基础配置
- * @param key 配置名
- * @param val 配置值
- * @deprecated 已废弃
- */
-export const setBotConfigByKey = BOTCONFIG.set;
-/**
- * g得到机器人基础配置
- * @param key 配置名
- * @returns 得到配置值
- * @deprecated 已废弃
- */
-export const getBotConfigByKey = BOTCONFIG.get;
+export const BOTCONFIG = new BaseConfig({
+    ...DefaultConfig,
+    kook,
+    villa,
+    qq,
+    ntqq,
+    puppeteer: Screenshot.launch,
+    discord
+});

package/lib/core/index.js

@@ -3,12 +3,10 @@
  * private
  * ********
  */
-export * from './plugin/index.js';
-export * from './configs.js';
-export * from './apps.js';
-export * from './cache/index.js';
-export * from './conversation/index.js';
-export * from './dealmsg.js';
-export * from './application.js';
+export * from './processor/configs.js';
 export * from './typings.js';
 export * from './utils/index.js';
+export * from './types.js';
+export * from './processor/path.js';
+export * from './processor/application.js';
+export * from './processor/log.js';

package/lib/core/main.js

@@ -3,10 +3,14 @@
  * public
  * ********
  */
-export * from './apps.js';
-export * from './configs.js';
-export * from './help.js';
-export * from './conversation/index.js';
-export * from './plugin/index.js';
+export * from './processor/configs.js';
+export * from './processor/help.js';
+export * from './index.js';
 export * from './utils/index.js';
 export * from './typings.js';
+export * from './types.js';
+export * from './processor/alemon.js';
+export * from './processor/path.js';
+export * from './processor/help.js';
+export * from './processor/plugin.js';
+export * from './processor/subscribe.js';

package/lib/core/{dev → processor}/alemon.js

@@ -1,6 +1,9 @@
 import { AppMap } from './data.js';
 import { getAppName } from './path.js';
 import { DoublyLinkedList } from './listdouble.js';
+import memory from 'memory-cache';
+import { Help } from './help.js';
+import { APPCONFIG } from './configs.js';
 /**
  * 应用结构
  */
@@ -22,8 +25,10 @@ export class Alemon {
     #regular = null;
     // 消息链表
     #list = new DoublyLinkedList();
+    #listArr = [];
     // 事件链表
     #elist = new DoublyLinkedList();
+    #elistArr = [];
     /**
      * 创建应用
      * @param name 应用名
@@ -57,11 +62,13 @@ export class Alemon {
     /**
      * list查询
      */
-    find() {
-        //
-        const list = this.#list;
-        for (let i = 0; i < list.getSize(); i++) {
-            const node = list.shift();
+    find(acount, example, func) {
+        for (const node of this.#listArr) {
+            if (node.acount == acount &&
+                node.example == example &&
+                node.func == func) {
+                return node;
+            }
         }
     }
     /**
@@ -77,6 +84,8 @@ export class Alemon {
      * @param node
      */
     async responseNode(e, node) {
+        //
+        const time = Date.now();
         /**
          * **********
          * 构造配置
@@ -94,22 +103,18 @@ export class Alemon {
             arr = await argFunc(e);
         }
         this.#data[node.acount][node.example].e = e;
-        const time = Date.now();
         // 执行
-        const res = await this.#data[node.acount][node.example][node.func](e, ...arr)
+        this.#data[node.acount][node.example][node.func](e, ...arr)
             .then(res => {
-            console.info(this.info(e, node.func, time - Date.now()));
+            if (res && typeof res != 'boolean') {
+                e.reply(res);
+            }
+            console.info(this.#infoFunc(e, node.name, node.acount, node.example, node.func), true, Date.now() - time);
             return res;
         })
             .catch(err => {
-            console.error(this.err(e, node.func, time - Date.now()), err);
+            console.error(this.#errorFunc(e, node.name, node.acount, node.example, node.func), false, Date.now() - time, err);
         });
-        // 重执行
-        if (res && typeof res != 'boolean') {
-            await e.reply(res).catch(err => {
-                console.error(this.err(e, node.func, time - Date.now()), err);
-            });
-        }
     }
     /**
      * 应用解析
@@ -117,10 +122,9 @@ export class Alemon {
      */
     async responseMessage(e) {
         // 空的
-        if (this.#list.isEmpty)
+        if (this.#list.isEmpty())
             return;
-        // 消息进来,开始走表
-        const list = this.#list;
+        const time = Date.now();
         /**
          * **********
          * 构造配置
@@ -137,39 +141,71 @@ export class Alemon {
         if (typeof argFunc == 'function') {
             arr = await argFunc(e);
         }
+        // 自动延长过期周期
+        const CacheData = memory.get(e.msg);
+        if (CacheData) {
+            for (const node of CacheData) {
+                this.#data[node.acount][node.example].e = e;
+                const time = Date.now();
+                // 执行
+                const res = await this.#data[node.acount][node.example][node.func](e, ...arr)
+                    .then(res => {
+                    if (res && typeof res != 'boolean') {
+                        e.reply(res);
+                    }
+                    console.info(this.#infoFunc(e, node.name, node.acount, node.example, node.func), true, Date.now() - time);
+                    return res;
+                })
+                    .catch(err => {
+                    console.error(this.#errorFunc(e, node.name, node.acount, node.example, node.func), false, Date.now() - time, err);
+                });
+                // 不是 false ,也就是不放行
+                if (res != false)
+                    break;
+            }
+            return;
+        }
+        // 结点缓存
+        const cache = [];
         /**
          * *******
          * 走表
          * **********
          */
-        for (let i = 0; i < list.getSize(); i++) {
-            // 不断的取出索引
-            const node = list.shift();
+        for (const node of this.#listArr) {
             // 索引匹配
             if (node.reg.test(e.msg)) {
                 this.#data[node.acount][node.example].e = e;
-                const time = Date.now();
                 // 执行
                 const res = await this.#data[node.acount][node.example][node.func](e, ...arr)
                     .then(res => {
-                    console.info(this.info(e, node.func, time - Date.now()));
+                    if (res && typeof res != 'boolean') {
+                        e.reply(res);
+                    }
+                    console.info(this.#infoFunc(e, node.name, node.acount, node.example, node.func), true, Date.now() - time);
                     return res;
                 })
                     .catch(err => {
-                    console.error(this.err(e, node.func, time - Date.now()), err);
+                    console.error(this.#errorFunc(e, node.name, node.acount, node.example, node.func), false, Date.now() - time, err);
                     // 错误了就强制中断
                 });
-                // 重执行
-                if (res && typeof res != 'boolean') {
-                    await e.reply(res).catch(err => {
-                        console.error(this.err(e, node.func, time - Date.now()), err);
-                    });
-                }
+                // 推送缓存
+                cache.push(node);
                 // 不是 false ,也就是不放行
                 if (res != false)
                     break;
             }
         }
+        /**
+         * ********
+         * 记录缓存
+         * ********
+         */
+        if (cache.length != 0) {
+            // 5分钟的缓存
+            memory.put(e.msg, cache, 5 * 60 * 1000);
+        }
+        return;
     }
     /**
      * 响应消息类型
@@ -177,9 +213,9 @@ export class Alemon {
      */
     async responseEventType(e) {
         // 空的
-        if (this.#elist.isEmpty)
+        if (this.#elist.isEmpty())
             return;
-        const list = this.#elist;
+        const time = Date.now();
         /**
          * *****
          * ******
@@ -195,35 +231,68 @@ export class Alemon {
         if (typeof argFunc == 'function') {
             arr = await argFunc(e);
         }
+        const key = `${e.event}:${e.typing}`;
+        // 自动延长过期周期
+        const CacheData = memory.get(key);
+        if (CacheData) {
+            for (const node of CacheData) {
+                this.#data[node.acount][node.example].e = e;
+                const time = Date.now();
+                const res = await this.#data[node.acount][node.example][node.func](e, ...arr)
+                    .then(res => {
+                    console.info(this.#infoFunc(e, node.name, node.acount, node.example, node.func), true, Date.now() - time);
+                    if (res && typeof res != 'boolean') {
+                        e.reply(res);
+                    }
+                    return res;
+                })
+                    .catch(err => {
+                    console.error(this.#errorFunc(e, node.name, node.acount, node.example, node.func), false, Date.now() - time, err);
+                });
+                // 不是 false ,也就是不放行
+                if (res != false)
+                    break;
+            }
+            return;
+        }
+        const cache = [];
         /**
          * ******
          * *****
          */
-        for (let i = 0; i < list.getSize(); i++) {
-            const node = list.shift();
+        for (const node of this.#elistArr) {
             // 类型不符
             if (node.event !== e.event || node.typing !== e.typing)
                 continue;
             //
             this.#data[node.acount][node.example].e = e;
-            const time = Date.now();
             const res = await this.#data[node.acount][node.example][node.func](e, ...arr)
                 .then(res => {
-                console.info(this.info(e, node.func, time - Date.now()));
+                if (res && typeof res != 'boolean') {
+                    e.reply(res);
+                }
+                console.info(this.#infoFunc(e, node.name, node.acount, node.example, node.func), true, Date.now() - time);
                 return res;
             })
                 .catch(err => {
-                console.error(this.err(e, node.func, time - Date.now()), err);
+                console.error(this.#errorFunc(e, node.name, node.acount, node.example, node.func), false, Date.now() - time, err);
             });
-            if (res && typeof res != 'boolean') {
-                await e.reply(res).catch(err => {
-                    console.error(this.err(e, node.func, time - Date.now()), err);
-                });
-            }
+            // 推送缓存
+            cache.push(node);
             // 不是 false ,也就是不放行
             if (res != false)
                 break;
         }
+        /**
+         * ********
+         * 记录缓存
+         * ********
+         */
+        if (cache.length != 0) {
+            // 15分钟的缓存
+            memory.put(key, cache, 60 * 15);
+        }
+        return;
     }
     /**
      * 扩展参数
@@ -234,6 +303,16 @@ export class Alemon {
         this.#dataMap.set('arg', fnc);
         return this;
     }
+    /**
+     *
+     * 扩展参数
+     * @param fnc
+     * @returns
+     * @deprecated 已废弃
+     */
+    setArg(fnc) {
+        return this.arg(fnc);
+    }
     /**
      * 重定义ecent
      * @param fnc
@@ -243,6 +322,15 @@ export class Alemon {
         this.#dataMap.set('event', fnc);
         return this;
     }
+    /**
+     * 重定义ecent
+     * @param fnc
+     * @returns
+     * @deprecated 已废弃
+     */
+    setMessage(fnc) {
+        return this.event(fnc);
+    }
     /**
      * 字符串切割
      * @param reg
@@ -256,6 +344,16 @@ export class Alemon {
         });
         return this;
     }
+    /**
+     * 字符串切割
+     * @param reg
+     * @param str
+     * @returns
+     * @deprecated 已废弃
+     */
+    setCharacter(val) {
+        return this.replace(/^(\/|#)/, val);
+    }
     /**
      * 集合
      * @param AplguinMap
@@ -267,9 +365,17 @@ export class Alemon {
         // 收集
         for (const example in AplguinMap) {
             const keys = new AplguinMap[example]();
-            // 标记name和层级
+            // 过滤事件
+            const event = APPCONFIG.get('event');
+            if (keys.event && event.includes(keys.event)) {
+                continue;
+            }
+            // name
             keys.name = this.#name;
+            // 层级
             keys.acount = this.#acount;
+            // 实例名
+            keys.example = example;
             // 记录
             this.#data[this.#acount][example] = keys;
             // 忽视非法key
@@ -353,38 +459,61 @@ export class Alemon {
         this.#acount++;
         return this;
     }
+    /**
+     * 加载
+     * @param AplguinMap
+     * @returns
+     * @deprecated 已废弃
+     */
+    component(AplguinMap = {}) {
+        return this.use(AplguinMap);
+    }
     /**
      * 挂载
      */
     mount() {
         // 构造大正则
         this.#regular = new RegExp(this.#mergedRegexArr.map(regex => regex.source).join('|'));
-        console.log('list', this.#list);
+        // 数组化
+        this.#elistArr = this.#elist.toArray();
+        this.#listArr = this.#list.toArray();
+        // 设置
         AppMap.set(this.#name, this);
+        // 生成json
+        new Help(this.#name).create(this.#listArr);
     }
+    #infoFunc = (e, name, acount, example, funcName) => {
+        return `[${e.event}] [${e.typing}] [${name}] [${acount}] [${example}] [${funcName}]`;
+    };
     /**
-     * 错误打印
+     * 自定义
      * @param data
      * @param funcName
      * @returns
      */
-    err(e, funcName, time) {
-        return `[${e.event}] [${false}] [${funcName}] [${time}ms]`;
+    info(func) {
+        this.#infoFunc = func;
+        return this;
     }
+    #errorFunc = (e, name, acount, example, funcName) => {
+        return `[${e.event}] [${e.typing}] [${name}] [${acount}] [${example}] [${funcName}]`;
+    };
     /**
-     * 自定义
+     * 错误打印
      * @param data
      * @param funcName
      * @returns
      */
-    info(e, funcName, time) {
-        return `[${e.event}] [${true}] [${funcName}] [${time}ms]`;
+    error(func) {
+        this.#errorFunc = func;
+        return this;
     }
     /**
      * 响应消息类型
      * @param e
      */
     async response(e, event) {
+        const time = Date.now();
         if (this.#CallData[event]) {
             const func = this.#dataMap.get('event');
             if (func)
@@ -398,14 +527,16 @@ export class Alemon {
                 arr = await argFunc(e);
             }
             const FuncName = String(this.#CallData[event]['fnc']).match(/:\s*(\w+)\]/)[1];
-            const time = Date.now();
             this.#CallData[event](e, ...arr)
                 .then(res => {
-                console.info(this.info(e, FuncName, time - Date.now()));
+                if (res && typeof res != 'boolean') {
+                    e.reply(res);
+                }
+                console.info(this.#infoFunc(e, this.#name, 0, 'on', FuncName), true, Date.now() - time);
                 return res;
             })
                 .catch(err => {
-                console.error(this.err(e, FuncName, time - Date.now()), err);
+                console.error(this.#infoFunc(e, this.#name, 0, 'on', FuncName), false, Date.now() - time, err);
             });
         }
         return false;