alemonjs 2.0.14 → 2.0.15

package/lib/app/define-bot.js

@@ -1,4 +1,4 @@
-import { ResultCode } from '../code.js';
+import { ResultCode } from '../core/code.js';
 
 /**
  * 定义机器人

package/lib/app/define-chidren.js

@@ -1,4 +1,4 @@
-import { ResultCode } from '../code.js';
+import { ResultCode } from '../core/code.js';
 
 /**
  * 定义子事件

package/lib/app/event-middleware.js

@@ -1,4 +1,4 @@
-import { ResultCode } from '../code.js';
+import { ResultCode } from '../core/code.js';
 
 /**
  * 中间件

package/lib/app/event-processor-cycle.js

@@ -1,8 +1,8 @@
-import { ResultCode } from '../code.js';
+import { ResultCode } from '../core/code.js';
 import { expendEvent } from './event-processor-event.js';
 import { expendMiddleware } from './event-processor-middleware.js';
 import { expendSubscribeCreate, expendSubscribeMount, expendSubscribeUnmount } from './event-processor-subscribe.js';
-import { getConfigValue } from '../config.js';
+import { getConfigValue } from '../core/config.js';
 
 /**
  * 打印日志

package/lib/app/event-processor-event.js

@@ -3,7 +3,7 @@ import { useState } from './hook-use-state.js';
 import { showErrorModule } from './utils.js';
 import { Response } from './store.js';
 import { useSend } from './hook-use-api.js';
-import { EventMessageText } from './config.js';
+import { EventMessageText } from '../core/variable.js';
 
 /**
  * @fileoverview 消息处理快
@@ -93,7 +93,9 @@ const expendEvent = async (valueEvent, select, next) => {
                     }
                 }
             }
-            const currents = Array.isArray(app.default.current) ? app.default.current : [app.default.current];
+            const currents = Array.isArray(app.default.current)
+                ? app.default.current
+                : [app.default.current];
             let index = 0;
             let isClose = false;
             let isNext = false;

package/lib/app/event-processor-middleware.js

@@ -3,7 +3,7 @@ import { useState } from './hook-use-state.js';
 import { showErrorModule } from './utils.js';
 import { Middleware } from './store.js';
 import { useSend } from './hook-use-api.js';
-import { EventMessageText } from './config.js';
+import { EventMessageText } from '../core/variable.js';
 
 /**
  * @fileoverview 消息处理快
@@ -91,7 +91,9 @@ const expendMiddleware = async (valueEvent, select, next) => {
                 nextMiddleware();
                 return;
             }
-            const currents = Array.isArray(app.default.current) ? app.default.current : [app.default.current];
+            const currents = Array.isArray(app.default.current)
+                ? app.default.current
+                : [app.default.current];
             let index = 0;
             let isClose = false;
             let isNext = false;

package/lib/app/event-processor.js

@@ -1,12 +1,9 @@
-import { getConfigValue } from '../config.js';
+import { getConfigValue } from '../core/config.js';
+import { processor_repeated_clear_time_min, processor_repeated_clear_time_max, processor_repeated_event_time, processor_repeated_user_time, processor_repeated_clear_size } from '../core/variable.js';
 import { expendCycle } from './event-processor-cycle.js';
+import { ProcessorEventAutoClearMap, ProcessorEventUserAudoClearMap } from './store.js';
 import { createHash } from './utils.js';
 
-const MIN_TIME = 3000;
-const MAX_TIME = 10000;
-const CONTROL_SIZE = 37;
-const eventStore = new Map();
-const userStore = new Map();
 /**
  * 过滤掉重复消息
  * @param param0
@@ -42,21 +39,21 @@ const cleanupStore = ({ Now, store, INTERVAL }) => {
 const cleanupStoreAll = () => {
     const Now = Date.now();
     const value = getConfigValue();
-    const EVENT_INTERVAL = value?.ALEMONJS_EVENT_INTERVAL ?? 1000 * 60;
-    const USER_INTERVAL = value?.ALEMONJS_USER_INTERVAL ?? 1000 * 1;
-    cleanupStore({ Now, INTERVAL: EVENT_INTERVAL, store: eventStore });
-    cleanupStore({ Now, INTERVAL: USER_INTERVAL, store: userStore });
+    const EVENT_INTERVAL = value?.processor?.repeated_event_time ?? processor_repeated_event_time;
+    const USER_INTERVAL = value?.processor?.repeated_user_time ?? processor_repeated_user_time;
+    cleanupStore({ Now, INTERVAL: EVENT_INTERVAL, store: ProcessorEventAutoClearMap });
+    cleanupStore({ Now, INTERVAL: USER_INTERVAL, store: ProcessorEventUserAudoClearMap });
 };
 // 清理消息
 const callback = () => {
     cleanupStoreAll();
     // 下一次清理的时间，应该随着长度的增加而减少
-    const length = eventStore.size + userStore.size;
+    const length = ProcessorEventAutoClearMap.size + ProcessorEventUserAudoClearMap.size;
     // 长度控制在37个以内
-    const time = length > CONTROL_SIZE ? MIN_TIME : MAX_TIME;
+    const time = length > processor_repeated_clear_size ? processor_repeated_clear_time_min : processor_repeated_clear_time_max;
     setTimeout(callback, time);
 };
-setTimeout(callback, MIN_TIME);
+setTimeout(callback, processor_repeated_clear_time_min);
 /**
  * 消息处理器
  * @param name
@@ -67,13 +64,13 @@ setTimeout(callback, MIN_TIME);
 const onProcessor = (name, event, data) => {
     const Now = Date.now();
     const value = getConfigValue();
-    const EVENT_INTERVAL = value?.processor?.repeated_event_time ?? 1000 * 60;
-    const USER_INTERVAL = value?.processor?.repeated_user_time ?? 1000 * 1;
+    const EVENT_INTERVAL = value?.processor?.repeated_event_time ?? processor_repeated_event_time;
+    const USER_INTERVAL = value?.processor?.repeated_user_time ?? processor_repeated_user_time;
     if (event['MessageId']) {
         // 消息过长，要减少消息的长度
         const MessageId = createHash(event['MessageId']);
         // 重复消息
-        if (filter({ Now, INTERVAL: EVENT_INTERVAL, store: eventStore }, MessageId)) {
+        if (filter({ Now, INTERVAL: EVENT_INTERVAL, store: ProcessorEventAutoClearMap }, MessageId)) {
             return;
         }
     }
@@ -81,7 +78,7 @@ const onProcessor = (name, event, data) => {
         // 编号过长，要减少编号的长度
         const UserId = createHash(event['UserId']);
         // 频繁操作
-        if (filter({ Now, INTERVAL: USER_INTERVAL, store: userStore }, UserId)) {
+        if (filter({ Now, INTERVAL: USER_INTERVAL, store: ProcessorEventUserAudoClearMap }, UserId)) {
             return;
         }
     }

package/lib/app/event-response.js

@@ -1,4 +1,4 @@
-import { ResultCode } from '../code.js';
+import { ResultCode } from '../core/code.js';
 
 /**
  * 处理响应事件

package/lib/app/hook-use-api.js

@@ -1,4 +1,4 @@
-import { ResultCode } from '../code.js';
+import { ResultCode } from '../core/code.js';
 import { ChildrenApp } from './store.js';
 import { createResult } from './utils.js';
 

package/lib/app/hook-use-state.js

@@ -1,5 +1,5 @@
-import { getConfig } from '../config.js';
-import { ResultCode } from '../code.js';
+import { getConfig } from '../core/config.js';
+import { ResultCode } from '../core/code.js';
 import { State, StateSubscribe } from './store.js';
 
 /**

package/lib/app/hook-use-subscribe.js

@@ -1,4 +1,4 @@
-import { ResultCode } from '../code.js';
+import { ResultCode } from '../core/code.js';
 import { SubscribeList } from './store.js';
 
 /**

package/lib/app/load.js

@@ -3,10 +3,10 @@ import { existsSync } from 'fs';
 import { showErrorModule, getRecursiveDirFiles, createEventName } from './utils.js';
 import { createRequire } from 'module';
 import { ChildrenApp } from './store.js';
-import { ResultCode } from '../code.js';
+import { ResultCode } from '../core/code.js';
+import { file_suffix_middleware } from '../core/variable.js';
 
 const require = createRequire(import.meta.url);
-const mwReg = /^mw(\.|\..*\.)(js|ts|jsx|tsx)$/;
 /**
  * 加载子模块
  * @param mainPath
@@ -103,7 +103,7 @@ const loadChildren = async (mainPath, appName) => {
              * load middleware files
              */
             const mwDir = join(mainDir, 'middleware');
-            const mwFiles = getRecursiveDirFiles(mwDir, item => mwReg.test(item.name));
+            const mwFiles = getRecursiveDirFiles(mwDir, item => file_suffix_middleware.test(item.name));
             const mwData = [];
             for (const file of mwFiles) {
                 // 切掉 mainDir

package/lib/app/message-api.js

@@ -1,4 +1,4 @@
-import { ResultCode } from '../code.js';
+import { ResultCode } from '../core/code.js';
 
 /**
  * 创建数据格式。

package/lib/app/store.d.ts

@@ -86,5 +86,7 @@ declare class ChildrenApp {
      */
     get value(): StoreChildrenApp;
 }
+declare const ProcessorEventAutoClearMap: Map<any, any>;
+declare const ProcessorEventUserAudoClearMap: Map<any, any>;
 
-export { ChildrenApp, Core, Logger, Middleware, Response, State, StateSubscribe, SubscribeList };
+export { ChildrenApp, Core, Logger, Middleware, ProcessorEventAutoClearMap, ProcessorEventUserAudoClearMap, Response, State, StateSubscribe, SubscribeList };

package/lib/app/store.js

@@ -267,5 +267,7 @@ class ChildrenApp {
         return alemonjsCore.storeChildrenApp[this.#name];
     }
 }
+const ProcessorEventAutoClearMap = new Map();
+const ProcessorEventUserAudoClearMap = new Map();
 
-export { ChildrenApp, Core, Logger, Middleware, Response, State, StateSubscribe, SubscribeList };
+export { ChildrenApp, Core, Logger, Middleware, ProcessorEventAutoClearMap, ProcessorEventUserAudoClearMap, Response, State, StateSubscribe, SubscribeList };

package/lib/app/utils.d.ts

@@ -1,5 +1,5 @@
 import { Dirent } from 'fs';
-import { ResultCode } from '../code.js';
+import { ResultCode } from '../core/code.js';
 
 /**
  * 将字符串转为定长字符串

package/lib/app/utils.js

@@ -2,7 +2,8 @@ import crypto from 'crypto';
 import fs, { existsSync, readdirSync } from 'fs';
 import path, { join } from 'path';
 import { createRequire } from 'module';
-import { ResultCode } from '../code.js';
+import { ResultCode } from '../core/code.js';
+import { file_suffix_response } from '../core/variable.js';
 
 const require = createRequire(import.meta.url);
 /**
@@ -61,14 +62,13 @@ const stringToNumber = (str, size = 33) => {
      *通过执行无符号位移，将带符号的int转换为无符号*/
     return hash >>> 0;
 };
-const resReg = /^res(\.|\..*\.)(js|ts|jsx|tsx)$/;
 /**
  * 递归获取所有文件
  * @param dir
  * @param condition
  * @returns
  */
-const getRecursiveDirFiles = (dir, condition = item => resReg.test(item.name)) => {
+const getRecursiveDirFiles = (dir, condition = item => file_suffix_response.test(item.name)) => {
     //
     let results = [];
     if (!existsSync(dir))

package/lib/{code.d.ts → core/code.d.ts}

@@ -1,6 +1,3 @@
-/**
- * 结果反馈码
- */
 /**
  * 结果反馈码
  * @description

package/lib/core/code.js

@@ -0,0 +1,17 @@
+import { FailParams, Warn, FailInternal, FailAuth, Fail, Ok } from './variable.js';
+
+/**
+ * 结果反馈码
+ * @description
+ * - 2000: 成功
+ */
+const ResultCode = {
+    Ok,
+    Fail,
+    FailParams,
+    Warn,
+    FailAuth,
+    FailInternal
+};
+
+export { ResultCode };

package/lib/{config.d.ts → core/config.d.ts}

@@ -1,5 +1,5 @@
-import './global.js';
-import { Package } from './typing/package/index.js';
+import '../global.js';
+import { Package } from '../typing/package/index.js';
 
 /**
  * 配置类

package/lib/{config.js → core/config.js}

@@ -1,4 +1,4 @@
-import './typing/event/actions.js';
+import '../typing/event/actions.js';
 import { existsSync, readFileSync, watch, mkdirSync, writeFileSync } from 'fs';
 import { join, dirname } from 'path';
 import YAML from 'yaml';

package/lib/core/variable.js

@@ -0,0 +1,37 @@
+const processor_repeated_event_time = 1000 * 60;
+const processor_repeated_user_time = 1000 * 1;
+const processor_repeated_clear_time_min = 1000 * 3;
+const processor_repeated_clear_time_max = 1000 * 10;
+const processor_repeated_clear_size = 37;
+// 中间件文件后缀正则
+const file_suffix_middleware = /^mw(\.|\..*\.)(js|ts|jsx|tsx)$/;
+// 相应文件后缀正则
+const file_suffix_response = /^res(\.|\..*\.)(js|ts|jsx|tsx)$/;
+// 框架前缀正则
+const file_prefix_framework = /^alemonjs-/;
+// 通用框架前缀正则
+const file_prefix_common = /^(@alemonjs\/|alemonjs-)/;
+// 默认登录
+const default_login = 'gui';
+const default_platform_prefix = 'alemonjs-';
+const default_platform_common_prefix = '@alemonjs/';
+/**
+ * 结果反馈码
+ */
+// 成功码
+const Ok = 2000; // 成功
+// 警惕码
+const Warn = 2100; // 任意警告
+// 失败码
+const Fail = 4000; // 未知错误
+const FailParams = 4001; // 参数错误
+const FailAuth = 4002; // 权限不足
+const FailInternal = 5000; // 内部错误
+const EventMessageText = [
+    'message.create',
+    'private.message.create',
+    'interaction.create',
+    'private.interaction.create'
+];
+
+export { EventMessageText, Fail, FailAuth, FailInternal, FailParams, Ok, Warn, default_login, default_platform_common_prefix, default_platform_prefix, file_prefix_common, file_prefix_framework, file_suffix_middleware, file_suffix_response, processor_repeated_clear_size, processor_repeated_clear_time_max, processor_repeated_clear_time_min, processor_repeated_event_time, processor_repeated_user_time };

package/lib/index.d.ts

@@ -18,7 +18,7 @@ export { DataEnums, MessageDataFormat } from './typing/message/index.js';
 export { StoreChildrenApp, StoreMiddleware, StoreMiddlewareItem, StoreResponse, StoreResponseItem } from './typing/store/res.js';
 export { StateSubscribeMap, SubscribeKeysMap, SubscribeMap, SubscribeValue } from './typing/subscribe/index.js';
 export { core, logger } from './global.js';
-export { ConfigCore, getConfig, getConfigValue } from './config.js';
+export { ConfigCore, getConfig, getConfigValue } from './core/config.js';
 export { defineBot, definePlatform } from './app/define-bot.js';
 export { defineChildren } from './app/define-chidren.js';
 export { OnMiddleware, onMiddleware } from './app/event-middleware.js';
@@ -30,10 +30,10 @@ export { useObserver, useSubscribe } from './app/hook-use-subscribe.js';
 export { loadChildren, loadChildrenFile, loadModule, moduleChildrenFiles } from './app/load.js';
 export { createSendDataFormat, sendToChannel, sendToUser } from './app/message-api.js';
 export { Ark, BT, Image, ImageFile, ImageURL, Link, MD, Mention, Text } from './app/message-format.js';
-export { ChildrenApp, Core, Logger, Middleware, Response, State, StateSubscribe, SubscribeList } from './app/store.js';
+export { ChildrenApp, Core, Logger, Middleware, ProcessorEventAutoClearMap, ProcessorEventUserAudoClearMap, Response, State, StateSubscribe, SubscribeList } from './app/store.js';
 export { ErrorModule, Result, createEventName, createHash, createResult, getInputExportPath, getRecursiveDirFiles, showErrorModule, stringToNumber, useUserHashKey } from './app/utils.js';
 export { run, start } from './main.js';
-export { ResultCode } from './code.js';
+export { ResultCode } from './core/code.js';
 export { DataText } from './typing/message/text.js';
 export { DataLink } from './typing/message/link.js';
 export { DataMention } from './typing/message/mention.js';

package/lib/index.js

@@ -1,7 +1,7 @@
 export { ActionsEventEnum } from './typing/event/actions.js';
 export { EventsKeyEnum } from './typing/event/map.js';
 export { core, logger } from './global.js';
-export { ConfigCore, getConfig, getConfigValue } from './config.js';
+export { ConfigCore, getConfig, getConfigValue } from './core/config.js';
 export { defineBot, definePlatform } from './app/define-bot.js';
 export { defineChildren } from './app/define-chidren.js';
 export { OnMiddleware, onMiddleware } from './app/event-middleware.js';
@@ -13,7 +13,7 @@ export { useObserver, useSubscribe } from './app/hook-use-subscribe.js';
 export { loadChildren, loadChildrenFile, loadModule, moduleChildrenFiles } from './app/load.js';
 export { createSendDataFormat, sendToChannel, sendToUser } from './app/message-api.js';
 export { Ark, BT, Image, ImageFile, ImageURL, Link, MD, Mention, Text } from './app/message-format.js';
-export { ChildrenApp, Core, Logger, Middleware, Response, State, StateSubscribe, SubscribeList } from './app/store.js';
+export { ChildrenApp, Core, Logger, Middleware, ProcessorEventAutoClearMap, ProcessorEventUserAudoClearMap, Response, State, StateSubscribe, SubscribeList } from './app/store.js';
 export { ErrorModule, createEventName, createHash, createResult, getInputExportPath, getRecursiveDirFiles, showErrorModule, stringToNumber, useUserHashKey } from './app/utils.js';
 export { run, start } from './main.js';
-export { ResultCode } from './code.js';
+export { ResultCode } from './core/code.js';

package/lib/jsx.js

@@ -10,7 +10,7 @@ import './typing/event/actions.js';
 import 'fs';
 import 'path';
 import 'yaml';
-import { ResultCode } from './code.js';
+import { ResultCode } from './core/code.js';
 import 'node:fs';
 import 'log4js';
 import './app/load.js';

package/lib/main.js

@@ -1,6 +1,6 @@
 import { join } from 'path';
 import { existsSync } from 'fs';
-import { getConfig, getConfigValue } from './config.js';
+import { getConfig, getConfigValue } from './core/config.js';
 import { loadChildren, loadChildrenFile } from './app/load.js';
 import { showErrorModule, getInputExportPath } from './app/utils.js';
 import './app/define-bot.js';
@@ -8,11 +8,12 @@ import './app/define-chidren.js';
 import './app/event-middleware.js';
 import './app/event-processor.js';
 import './app/event-response.js';
-import { ResultCode } from './code.js';
+import { ResultCode } from './core/code.js';
 import 'node:fs';
 import 'log4js';
 import { useState } from './app/hook-use-state.js';
 import './app/message-format.js';
+import { file_prefix_common, default_login, default_platform_prefix, default_platform_common_prefix, file_prefix_framework } from './core/variable.js';
 
 const loadConfig = () => {
     const value = getConfigValue() ?? {};
@@ -51,9 +52,9 @@ const run = (input) => {
 const start = async (input, pm) => {
     const cfg = getConfig();
     const platform$1 = pm ?? cfg.argv?.platform ?? cfg.value?.platform;
-    const login$1 = platform$1 ? platform$1.replace(/^(@alemonjs\/|alemonjs-)/, '') : null;
-    const login = login$1 ?? cfg.argv?.login ?? cfg.value?.login ?? 'gui';
-    const prefix = platform$1 && /^alemonjs-/.test(platform$1) ? `alemonjs-` : `@alemonjs/`;
+    const login$1 = platform$1 ? platform$1.replace(file_prefix_common, '') : null;
+    const login = login$1 ?? cfg.argv?.login ?? cfg.value?.login ?? default_login;
+    const prefix = platform$1 && file_prefix_framework.test(platform$1) ? default_platform_prefix : default_platform_common_prefix;
     const platform = `${prefix}${login}`;
     // 启动机器人
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alemonjs",
-  "version": "2.0.14",
+  "version": "2.0.15",
   "description": "bot script",
   "author": "lemonade",
   "license": "MIT",

package/lib/app/config.js

@@ -1,8 +0,0 @@
-const EventMessageText = [
-    'message.create',
-    'private.message.create',
-    'interaction.create',
-    'private.interaction.create'
-];
-
-export { EventMessageText };

package/lib/code.js

@@ -1,27 +0,0 @@
-/**
- * 结果反馈码
- */
-// 成功码
-const Ok = 2000; // 成功
-// 警惕码
-const Warn = 2100; // 任意警告
-// 失败码
-const Fail = 4000; // 未知错误
-const FailParams = 4001; // 参数错误
-const FailAuth = 4002; // 权限不足
-const FailInternal = 5000; // 内部错误
-/**
- * 结果反馈码
- * @description
- * - 2000: 成功
- */
-const ResultCode = {
-    Ok,
-    Fail,
-    FailParams,
-    Warn,
-    FailAuth,
-    FailInternal
-};
-
-export { ResultCode };