alemonjs 2.0.3-alpha.1 → 2.0.5-alpha.1

package/lib/app/define-chidren.js

@@ -6,7 +6,7 @@
 const defineChildren = callback => {
     if (typeof callback === 'function' || typeof callback === 'object') {
         return {
-            _name: 'apps',
+            _name: 'app',
             callback
         };
     }

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

@@ -19,7 +19,7 @@ import { useSend } from './hook-use-api.js';
 const expendEvent = async (valueEvent, select, next) => {
     const res = new Response();
     const Send = useSend(valueEvent);
-    // 得到所有 apps
+    // 得到所有 res
     const StoreResponse = res.value;
     let valueI = 0;
     /**
@@ -71,8 +71,8 @@ const expendEvent = async (valueEvent, select, next) => {
                 return;
             }
             // 检查状态
-            if (file?.state) {
-                const [state] = useState(file?.state);
+            if (file?.stateKey) {
+                const [state] = useState(file?.stateKey);
                 if (state == false) {
                     // 继续
                     nextEvent();

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

@@ -19,7 +19,7 @@ import { useSend } from './hook-use-api.js';
 const expendMiddleware = async (valueEvent, select, next) => {
     const mw = new Middleware();
     const Send = useSend(valueEvent);
-    // 得到所有 apps
+    // 得到所有 mws
     const mwFiles = mw.value;
     let valueI = 0;
     // let valueJ = 0
@@ -37,7 +37,7 @@ const expendMiddleware = async (valueEvent, select, next) => {
             next();
             return;
         }
-        // 检查所有 
+        // 检查所有
         calli();
     };
     /**
@@ -71,8 +71,8 @@ const expendMiddleware = async (valueEvent, select, next) => {
                 return;
             }
             // 检查状态
-            if (file?.state) {
-                const [state] = useState(file?.state);
+            if (file?.stateKey) {
+                const [state] = useState(file?.stateKey);
                 if (state == false) {
                     // 继续
                     nextMiddleware();

package/lib/app/hook-use-api.d.ts

@@ -16,17 +16,15 @@ declare const useMention: <T extends EventKeys>(event: Events[T]) => Promise<Use
  */
 declare const useSend: <T extends EventKeys>(event: Events[T]) => (...val: DataEnums[]) => Promise<any[]>;
 /**
- * 卸载模块。
- * 从全局存储中移除与指定模块相关的数据。
- * @param {string} mainDir - 模块的主目录路径。
- * @throws {Error} - 如果 mainDir 无效，抛出错误。
+ * 卸载模块
+ * @param name
  */
-declare const unChildren: (mainDir: string) => void;
+declare const unChildren: (name?: string) => void;
 /**
  * 废弃,请使用unChildren
  * @deprecated
  */
-declare const unMount: (mainDir: string) => void;
+declare const unMount: () => void;
 /**
  *
  * @param values

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

@@ -1,3 +1,5 @@
+import { ChildrenApp } from './store.js';
+
 /**
  * 使用提及。
  * @param {Object} event - 事件对象，包含触发提及的相关信息。
@@ -41,34 +43,21 @@ const useSend = (event) => {
     };
 };
 /**
- * 卸载模块。
- * 从全局存储中移除与指定模块相关的数据。
- * @param {string} mainDir - 模块的主目录路径。
- * @throws {Error} - 如果 mainDir 无效，抛出错误。
+ * 卸载模块
+ * @param name
  */
-const unChildren = (mainDir) => {
-    if (!mainDir || typeof mainDir !== 'string') {
-        throw new Error('Invalid mainDir: mainDir must be a non-empty string');
-    }
-    // 从 storeMains 中移除
-    // const storeMainsIndex = alemonjsCore.storeMains.indexOf(mainDir)
-    // if (storeMainsIndex !== -1) {
-    //   alemonjsCore.storeMains.splice(storeMainsIndex, 1)
-    // }
-    // 从 storeResponse 中移除
-    if (alemonjsCore.storeResponse.find(item => item.source == mainDir)) {
-        alemonjsCore.storeResponse = alemonjsCore.storeResponse.filter(item => item.source !== mainDir);
-    }
-    // 从 storeMiddleware 中移除
-    if (alemonjsCore.storeMiddleware.find(item => item.source == mainDir)) {
-        alemonjsCore.storeMiddleware = alemonjsCore.storeMiddleware.filter(item => item.source !== mainDir);
-    }
+const unChildren = (name = 'main') => {
+    const app = new ChildrenApp(name);
+    app.un();
 };
 /**
  * 废弃,请使用unChildren
  * @deprecated
  */
-const unMount = unChildren;
+const unMount = () => {
+    // 警告，已废弃。
+    console.warn('unMount 已废弃，请使用 unChildren');
+};
 /**
  *
  * @param values

package/lib/app/load.d.ts

@@ -2,21 +2,21 @@
  * 加载模块
  * @param mainPath
  */
-declare const loadChildren: (mainPath: string, node: string) => Promise<void>;
+declare const loadChildren: (mainPath: string, appName: string) => Promise<void>;
 /**
  * 废弃，请使用 loadChildren
  * @deprecated
  */
-declare const loadModule: (mainPath: string, node: string) => Promise<void>;
+declare const loadModule: (mainPath: string, appName: string) => Promise<void>;
 /**
  * 模块文件
  * @param app
  */
-declare const loadChildrenFile: (node: string) => Promise<void>;
+declare const loadChildrenFile: (appName: string) => Promise<void>;
 /**
  * 废弃，请使用 loadChildrenFile
  * @deprecated
  */
-declare const moduleChildrenFiles: (node: string) => Promise<void>;
+declare const moduleChildrenFiles: (appName: string) => Promise<void>;
 
 export { loadChildren, loadChildrenFile, loadModule, moduleChildrenFiles };

package/lib/app/load.js

@@ -1,67 +1,26 @@
 import { dirname, join } from 'path';
 import { existsSync } from 'fs';
-import { unChildren } from './hook-use-api.js';
 import { showErrorModule, getRecursiveDirFiles, createEventName } from './utils.js';
 import { createRequire } from 'module';
+import { ChildrenApp } from './store.js';
 
 const require = createRequire(import.meta.url);
 const mwReg = /^mw(\.|\..*\.)(js|ts|jsx|tsx)$/;
-/**
- * 加载文件
- * @param app
- */
-const loadChildrenFiles = async (mainDir, node) => {
-    const appsDir = join(mainDir, 'apps');
-    const appsFiles = getRecursiveDirFiles(appsDir);
-    const data = [];
-    for (const file of appsFiles) {
-        const state = createEventName(file.path, node);
-        const reesponse = {
-            source: mainDir,
-            dir: dirname(file.path),
-            path: file.path,
-            name: file.name,
-            state,
-            node
-        };
-        data.push(reesponse);
-        alemonjsCore.storeResponse.push(reesponse);
-    }
-    const mwDir = join(mainDir, 'middleware');
-    const mwFiles = getRecursiveDirFiles(mwDir, item => mwReg.test(item.name));
-    const mwData = [];
-    for (const file of mwFiles) {
-        const state = createEventName(file.path, node, 'mw');
-        const middleware = {
-            source: mainDir,
-            dir: dirname(file.path),
-            path: file.path,
-            name: file.name,
-            state,
-            node
-        };
-        mwData.push(middleware);
-        alemonjsCore.storeMiddleware.push(middleware);
-    }
-    return {
-        response: data,
-        middleware: mwData
-    };
-};
 /**
  * 加载模块
  * @param mainPath
  */
-const loadChildren = async (mainPath, node) => {
+const loadChildren = async (mainPath, appName) => {
     if (!mainPath || typeof mainPath !== 'string') {
         logger.error('The module path is not correct');
         return;
     }
     const mainDir = dirname(mainPath);
+    const App = new ChildrenApp(appName);
     const show = (e) => {
         showErrorModule(e);
-        // 卸载索引
-        unChildren(mainDir);
+        // 卸载
+        App.un();
     };
     try {
         const moduleApp = await import(`file://${mainPath}`);
@@ -71,7 +30,7 @@ const loadChildren = async (mainPath, node) => {
         if (!moduleApp?.default?._name) {
             throw new Error('The Children name is not correct');
         }
-        if (moduleApp.default._name !== 'apps') {
+        if (moduleApp.default._name !== 'app') {
             throw new Error('The Children name is not correct');
         }
         if (!moduleApp?.default?.callback) {
@@ -84,13 +43,15 @@ const loadChildren = async (mainPath, node) => {
         else {
             app = await moduleApp.default.callback();
         }
+        App.pushSycle(app);
         const unMounted = async (e) => {
             show(e);
             try {
                 await app?.unMounted(e);
             }
             catch (e) {
-                show(e);
+                // 卸载周期出意外，不需要进行卸载
+                showErrorModule(e);
             }
         };
         // onCreated 创建
@@ -106,20 +67,65 @@ const loadChildren = async (mainPath, node) => {
         }
         // onMounted 加载
         try {
-            // 加载
-            const res = await loadChildrenFiles(mainDir, node);
+            /**
+             * load response files
+             */
+            const appsDir = join(mainDir, 'apps');
+            const appsFiles = getRecursiveDirFiles(appsDir);
+            // 使用 新 目录 response
+            const responseDir = join(mainDir, 'response');
+            const responseFiles = getRecursiveDirFiles(responseDir);
+            const files = [...appsFiles, ...responseFiles];
+            const resData = [];
+            for (const file of files) {
+                // 切掉 mainDir
+                const url = file.path.replace(mainDir, '');
+                const stateKey = createEventName(url, appName);
+                const reesponse = {
+                    input: mainDir,
+                    dir: dirname(file.path),
+                    path: file.path,
+                    name: file.name,
+                    stateKey,
+                    appName: appName
+                };
+                resData.push(reesponse);
+            }
+            App.pushResponse(resData);
+            /**
+             * load middleware files
+             */
+            const mwDir = join(mainDir, 'middleware');
+            const mwFiles = getRecursiveDirFiles(mwDir, item => mwReg.test(item.name));
+            const mwData = [];
+            for (const file of mwFiles) {
+                // 切掉 mainDir
+                const url = file.path.replace(mainDir, '');
+                const stateKey = createEventName(url, appName);
+                const middleware = {
+                    input: mainDir,
+                    dir: dirname(file.path),
+                    path: file.path,
+                    name: file.name,
+                    stateKey,
+                    appName: appName
+                };
+                mwData.push(middleware);
+            }
+            App.pushMiddleware(mwData);
             // onMounted 完成索引识别
             if (typeof app?.onMounted == 'function') {
                 try {
-                    await app?.onMounted(res);
+                    await app?.onMounted({ response: resData, middleware: mwData });
+                    // 校验完周期后，再进行挂载。
+                    // 防止校验过程中，出现初始化完周期，就执行匹配
+                    App.on();
                 }
                 catch (e) {
                     unMounted(e);
                     return;
                 }
             }
-            // 记录 main
-            // alemonjsCore.storeMains.push(mainDir)
         }
         catch (e) {
             unMounted(e);
@@ -139,20 +145,19 @@ const loadModule = loadChildren;
  * 模块文件
  * @param app
  */
-const loadChildrenFile = async (node) => {
-    if (typeof node !== 'string') {
+const loadChildrenFile = async (appName) => {
+    if (typeof appName !== 'string') {
         logger.error('The module name is not correct');
         return;
     }
     try {
-        const mainPath = require.resolve(node);
+        const mainPath = require.resolve(appName);
         // 不存在 main
         if (!existsSync(mainPath)) {
             logger.error('The main file does not exist', mainPath);
             return;
         }
-        // 根据main来识别apps
-        loadChildren(mainPath, node);
+        loadChildren(mainPath, appName);
     }
     catch (e) {
         showErrorModule(e);

package/lib/app/message-format.d.ts

@@ -1,4 +1,4 @@
-import { DataText, DataImage, DataImageURL, DataImageFile, DataMention } from '../typing/message/index.js';
+import { DataText, DataImage, DataImageURL, DataImageFile, DataMention, DataButton, ButtonRow, DataButtonGroup } from '../typing/message/index.js';
 
 /**
  * 文本消息
@@ -32,5 +32,11 @@ declare const ImageFile: (val: DataImageFile["value"]) => DataImageFile;
  * @returns
  */
 declare const Mention: (UserId?: DataMention["value"], options?: DataMention["options"]) => DataMention;
+declare const BT: {
+    (title: string, data: DataButton["options"]["data"], options?: Omit<DataButton["options"], "data">): DataButton;
+    group(...rows: ButtonRow[]): DataButtonGroup;
+    template(value: DataButtonGroup["options"]["template_id"]): DataButtonGroup;
+    row(...buttons: DataButton[]): ButtonRow;
+};
 
-export { Image, ImageFile, ImageURL, Mention, Text };
+export { BT, Image, ImageFile, ImageURL, Mention, Text };

package/lib/app/message-format.js

@@ -54,11 +54,53 @@ const Mention = (UserId, options) => {
     return {
         type: 'Mention',
         value: UserId,
-        //
         options: options ?? {
             belong: 'user'
         }
     };
 };
+const BT = (title, data, options) => {
+    return {
+        type: 'Button',
+        value: title,
+        options: {
+            data,
+            ...options
+        }
+    };
+};
+BT.group = function Group(...rows) {
+    return {
+        type: 'BT.group',
+        value: rows
+    };
+};
+BT.template = function Template(value) {
+    return {
+        type: 'BT.group',
+        value: [],
+        options: {
+            template_id: value
+        }
+    };
+};
+BT.row = function Row(...buttons) {
+    return {
+        type: 'BT.row',
+        value: buttons
+    };
+};
+// const Send = (...x: DataButtonGroup[]) => {
+//   return x;
+// };
+// Send(
+//   BT.template('123'),
+//   BT.group(
+//     BT.row(BT("开始", "/开始游戏")),
+//     BT.row(BT("百度一下", "https://baidu.com", { isLink: true })),
+//     BT.row(BT("是否同意", { click: "/同意", confirm: "/同意", cancel: "/不同意" })),
+//     BT.row(BT("哈哈", "/哈哈", { autoEnter: false, showList: true, toolTip: '不支持' }))
+//   )
+// )
 
-export { Image, ImageFile, ImageURL, Mention, Text };
+export { BT, Image, ImageFile, ImageURL, Mention, Text };

package/lib/app/store.d.ts

@@ -1,6 +1,6 @@
-import { EventCycleEnum } from '../typing/cycle/index.js';
+import { EventCycleEnum, ChildrenCycle } from '../typing/cycle/index.js';
 import { EventKeys } from '../typing/event/map.js';
-import { StoreMiddlewareItem, StoreResponseItem } from '../typing/store/res.js';
+import { StoreChildrenApp, StoreResponseItem, StoreMiddlewareItem } from '../typing/store/res.js';
 import { StateSubscribeMap, SubscribeKeysMap, SubscribeValue } from '../typing/subscribe/index.js';
 import '../global.js';
 import { ResponseState } from '../typing/state/index.js';
@@ -21,8 +21,9 @@ declare class Core {
         storeState: ResponseState;
         storeStateSubscribe: StateSubscribeMap;
         storeSubscribeList: SubscribeKeysMap;
-        storeMiddleware: StoreMiddlewareItem[];
-        storeResponse: StoreResponseItem[];
+        storeChildrenApp: {
+            [key: string]: StoreChildrenApp;
+        };
     };
 }
 declare class Response {
@@ -45,9 +46,45 @@ declare class StateSubscribe {
 }
 declare class State {
     #private;
+    /**
+     *
+     * @param name
+     * @param defaultValue 默认，允许匹配
+     */
     constructor(name: string, defaultValue?: boolean);
     get value(): boolean;
     set value(value: boolean);
 }
+declare class ChildrenApp {
+    #private;
+    constructor(name?: string);
+    /**
+     * 推送响应体
+     * @param data
+     */
+    pushResponse(data: StoreResponseItem[]): void;
+    /**
+     * 推送中间件
+     * @param data
+     */
+    pushMiddleware(data: StoreMiddlewareItem[]): void;
+    /**
+     * 推送周期
+     * @param data
+     */
+    pushSycle(data: ChildrenCycle): void;
+    /**
+     * 挂载
+     */
+    on(): void;
+    /**
+     * 卸载
+     */
+    un(): void;
+    /**
+     * 获取
+     */
+    get value(): StoreChildrenApp;
+}
 
-export { Core, Logger, Middleware, Response, State, StateSubscribe, SubscribeList };
+export { ChildrenApp, Core, Logger, Middleware, Response, State, StateSubscribe, SubscribeList };

package/lib/app/store.js

@@ -103,8 +103,7 @@ class Core {
                     mount: {},
                     unmount: {}
                 },
-                storeMiddleware: [],
-                storeResponse: [],
+                storeChildrenApp: {}
             };
         }
     }
@@ -114,12 +113,20 @@ class Core {
 }
 class Response {
     get value() {
-        return alemonjsCore.storeResponse;
+        // 得到所有 app，得到所有 res
+        const data = Object.keys(alemonjsCore.storeChildrenApp).map(key => {
+            return alemonjsCore.storeChildrenApp[key].response;
+        });
+        return data.flat();
     }
 }
 class Middleware {
     get value() {
-        return alemonjsCore.storeMiddleware;
+        // 得到所有 app，得到所有 res
+        const data = Object.keys(alemonjsCore.storeChildrenApp).map(key => {
+            return alemonjsCore.storeChildrenApp[key].middleware;
+        });
+        return data.flat();
     }
 }
 class SubscribeList {
@@ -154,28 +161,38 @@ class StateSubscribe {
         return alemonjsCore.storeStateSubscribe[this.#name];
     }
 }
+class StateProxy {
+    create(value = {}) {
+        return new Proxy(value, {
+            get(target, prop) {
+                return prop in target ? target[prop] : false;
+            },
+            set(target, prop, value) {
+                target[prop] = value;
+                // 通知所有订阅者
+                if (alemonjsCore.storeStateSubscribe[prop]) {
+                    for (const callback of alemonjsCore.storeStateSubscribe[prop]) {
+                        callback(value);
+                    }
+                }
+                return true; // 表示设置成功
+            }
+        });
+    }
+}
 class State {
     #name = null;
+    /**
+     *
+     * @param name
+     * @param defaultValue 默认，允许匹配
+     */
     constructor(name, defaultValue = true) {
         this.#name = name;
         // 不存在，需要初始化
         if (!alemonjsCore.storeState) {
             // 初始化全局状态
-            alemonjsCore.storeState = new Proxy({}, {
-                get(target, prop) {
-                    return prop in target ? target[prop] : false;
-                },
-                set(target, prop, value) {
-                    target[prop] = value;
-                    // 通知所有订阅者
-                    if (alemonjsCore.storeStateSubscribe[prop]) {
-                        for (const callback of alemonjsCore.storeStateSubscribe[prop]) {
-                            callback(value);
-                        }
-                    }
-                    return true; // 表示设置成功
-                }
-            });
+            alemonjsCore.storeState = new StateProxy().create();
         }
         // 如果不存在则设置默认值
         if (!(name in alemonjsCore.storeState)) {
@@ -189,38 +206,67 @@ class State {
         alemonjsCore.storeState[this.#name] = value;
     }
 }
-// export class ActionsBus {
-//   constructor() {
-//     if (!alemonjsCore.storeActionsBus) {
-//       alemonjsCore.storeActionsBus = {}
-//     }
-//   }
-//   /**
-//    * @param actions
-//    * @param callback
-//    */
-//   subscribe<T extends EventKeys>(
-//     actions: ActionsEventEnum,
-//     callback: (event: Events[T], data?: any) => void
-//   ) {
-//     if (!alemonjsCore.storeActionsBus[actions]) {
-//       alemonjsCore.storeActionsBus[actions] = []
-//     }
-//     alemonjsCore.storeActionsBus[actions].push(callback)
-//   }
-//   /**
-//    *
-//    */
-//   publish<T extends EventKeys>(actions: ActionsEventEnum, event: Events[T], data?: any) {
-//     if (alemonjsCore.storeActionsBus[actions]) {
-//       return Promise.all(
-//         alemonjsCore.storeActionsBus[actions].map(callback => callback(event, data))
-//       )
-//     }
-//   }
-//   get value() {
-//     return alemonjsCore.storeActionsBus
-//   }
-// }
+class ChildrenApp {
+    // 名字
+    #name = null;
+    // 中间件
+    #middleware = [];
+    // 响应体
+    #response = [];
+    // 周期
+    #cycle = null;
+    // create
+    constructor(name = 'main') {
+        this.#name = name;
+    }
+    /**
+     * 推送响应体
+     * @param data
+     */
+    pushResponse(data) {
+        this.#response = this.#response.concat(data);
+    }
+    /**
+     * 推送中间件
+     * @param data
+     */
+    pushMiddleware(data) {
+        this.#middleware = this.#middleware.concat(data);
+    }
+    /**
+     * 推送周期
+     * @param data
+     */
+    pushSycle(data) {
+        this.#cycle = data;
+    }
+    /**
+     * 挂载
+     */
+    on() {
+        alemonjsCore.storeChildrenApp[this.#name] = {
+            name: this.#name,
+            middleware: this.#middleware,
+            response: this.#response,
+            cycle: this.#cycle
+        };
+    }
+    /**
+     * 卸载
+     */
+    un() {
+        // 清理
+        delete alemonjsCore.storeChildrenApp[this.#name];
+    }
+    /**
+     * 获取
+     */
+    get value() {
+        if (!alemonjsCore.storeChildrenApp[this.#name]) {
+            this.on();
+        }
+        return alemonjsCore.storeChildrenApp[this.#name];
+    }
+}
 
-export { Core, Logger, Middleware, Response, State, StateSubscribe, SubscribeList };
+export { ChildrenApp, Core, Logger, Middleware, Response, State, StateSubscribe, SubscribeList };

package/lib/app/utils.d.ts

@@ -23,10 +23,10 @@ declare const useUserHashKey: (event: {
  * 创建app名称
  * @param url
  * @param app 模块名
- * @param select 选择事件类型,默认apps
+ * @param select 选择事件类型,默认 res
  * @returns
  */
-declare const createEventName: (url: string, app: string, select?: "apps" | "mw") => string;
+declare const createEventName: (url: string, appKey: string) => string;
 /**
  * 将字符串转为数字
  * @param str

package/lib/app/utils.js

@@ -29,18 +29,19 @@ const useUserHashKey = (event) => {
  * 创建app名称
  * @param url
  * @param app 模块名
- * @param select 选择事件类型,默认apps
+ * @param select 选择事件类型,默认 res
  * @returns
  */
-const createEventName = (url, app, select = 'apps') => {
-    const names = url.replace(process.cwd(), '').split('/');
-    const index = names.findIndex(v => v === select);
-    const cur = names.slice(index);
-    if (/.(ts.js)/.test(cur[cur.length])) {
-        const name = `${app}:${cur.slice(0, -1).join(':')}`;
-        return name;
+const createEventName = (url, appKey) => {
+    let uri = url;
+    if (process.platform === 'win32') {
+        uri = uri.replace(/\\/g, '/');
     }
-    const name = `${app}:${cur.join(':')}`;
+    // 去掉空字符串
+    const names = uri.split('/').filter(item => item !== '');
+    // 去掉最后一个文件名
+    names.pop();
+    const name = `${appKey}:${names.join(':')}`;
     return name;
 };
 /**
@@ -59,14 +60,14 @@ const stringToNumber = (str, size = 33) => {
      *通过执行无符号位移，将带符号的int转换为无符号*/
     return hash >>> 0;
 };
-const appsReg = /^res(\.|\..*\.)(js|ts|jsx|tsx)$/;
+const resReg = /^res(\.|\..*\.)(js|ts|jsx|tsx)$/;
 /**
  * 递归获取所有文件
  * @param dir
  * @param condition
  * @returns
  */
-const getRecursiveDirFiles = (dir, condition = item => appsReg.test(item.name)) => {
+const getRecursiveDirFiles = (dir, condition = item => resReg.test(item.name)) => {
     //
     let results = [];
     if (!existsSync(dir))

package/lib/global.d.ts

@@ -1,6 +1,6 @@
 import { OnResponseFunc, OnResponseReversalFunc, OnMiddlewareFunc, OnMiddlewareReversalFunc, DefineChildrenFunc, DefinePlatformFunc } from './typing/event/index.js';
 import { ClientAPI } from './typing/client/index.js';
-import { StoreMiddlewareItem, StoreResponseItem } from './typing/store/res.js';
+import { StoreChildrenApp } from './typing/store/res.js';
 import { StateSubscribeMap, SubscribeKeysMap } from './typing/subscribe/index.js';
 import { LoggerUtils } from './typing/logger/index.js';
 import { ResponseState } from './typing/state/index.js';
@@ -27,13 +27,11 @@ declare global {
          */
         storeSubscribeList: SubscribeKeysMap;
         /**
-         * 中间件
+         * 子模块
          */
-        storeMiddleware: StoreMiddlewareItem[];
-        /**
-         * 响应
-         */
-        storeResponse: StoreResponseItem[];
+        storeChildrenApp: {
+            [key: string]: StoreChildrenApp;
+        };
     };
     /**
      * 客户端
@@ -86,13 +84,11 @@ declare const core: {
      */
     storeSubscribeList: SubscribeKeysMap;
     /**
-     * 中间件
+     * 子模块
      */
-    storeMiddleware: StoreMiddlewareItem[];
-    /**
-     * 响应
-     */
-    storeResponse: StoreResponseItem[];
+    storeChildrenApp: {
+        [key: string]: StoreChildrenApp;
+    };
 };
 
 export { core, logger };

package/lib/index.d.ts

@@ -14,8 +14,8 @@ export { Current, CurrentResult, DefineBot, DefineBotCallback, DefineBotValue, D
 export { EventKeys, Events, EventsEnum, EventsKeyEnum, EventsMessageCreate, EventsMessageCreateEnum, EventsMessageCreateKeys } from './typing/event/map.js';
 export { LoggerUtils } from './typing/logger/index.js';
 export { ClientAPI } from './typing/client/index.js';
-export { DataEnums, DataImage, DataImageFile, DataImageURL, DataMap, DataMention, DataText, MessageDataFormat, ParseKeys } from './typing/message/index.js';
-export { StoreMiddleware, StoreMiddlewareItem, StoreResponse, StoreResponseItem } from './typing/store/res.js';
+export { ButtonRow, DataButton, DataButtonGroup, DataEnums, DataImage, DataImageFile, DataImageURL, DataMap, DataMention, DataText, 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';
@@ -29,7 +29,7 @@ export { eventState, onState, unEventState, unState, useState } from './app/hook
 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 { Image, ImageFile, ImageURL, Mention, Text } from './app/message-format.js';
-export { Core, Logger, Middleware, Response, State, StateSubscribe, SubscribeList } from './app/store.js';
+export { BT, Image, ImageFile, ImageURL, Mention, Text } from './app/message-format.js';
+export { ChildrenApp, Core, Logger, Middleware, Response, State, StateSubscribe, SubscribeList } from './app/store.js';
 export { ErrorModule, createEventName, createHash, getInputExportPath, getRecursiveDirFiles, showErrorModule, stringToNumber, useUserHashKey } from './app/utils.js';
 export { run, start } from './main.js';

package/lib/index.js

@@ -12,7 +12,7 @@ export { eventState, onState, unEventState, unState, useState } from './app/hook
 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 { Image, ImageFile, ImageURL, Mention, Text } from './app/message-format.js';
-export { Core, Logger, Middleware, Response, State, StateSubscribe, SubscribeList } from './app/store.js';
+export { BT, Image, ImageFile, ImageURL, Mention, Text } from './app/message-format.js';
+export { ChildrenApp, Core, Logger, Middleware, Response, State, StateSubscribe, SubscribeList } from './app/store.js';
 export { ErrorModule, createEventName, createHash, getInputExportPath, getRecursiveDirFiles, showErrorModule, stringToNumber, useUserHashKey } from './app/utils.js';
 export { run, start } from './main.js';

package/lib/jsx.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { EventKeys, Events } from './typing/event/map.js';
-import { DataText, DataImageURL, DataImageFile, DataImage, DataMention, DataEnums } from './typing/message/index.js';
+import { DataText, DataImageURL, DataImageFile, DataImage, DataMention, DataEnums, DataButton } from './typing/message/index.js';
 
 /**
  *
@@ -54,6 +54,27 @@ declare function Mention(_props: {
 }): React.ReactElement<{
     dataType: string;
 }, string | React.JSXElementConstructor<any>>;
+interface BTProps {
+    text: DataButton['value'];
+    data: DataButton['options']['data'];
+    autoEnter?: DataButton['options']['autoEnter'];
+    toolTip?: DataButton['options']['toolTip'];
+    showList?: DataButton['options']['showList'];
+    isLink?: DataButton['options']['isLink'];
+    children?: DataButton['value'];
+}
+declare const BT: React.FC<BTProps> & {
+    group: React.FC<{
+        children?: React.ReactNode;
+    }>;
+    row: React.FC<{
+        children?: React.ReactNode;
+    }>;
+    template: React.FC<{
+        id: string;
+    }>;
+};
+
 /**
  *  转换数据
  * ***
@@ -88,4 +109,4 @@ declare const sendToChannel: (channel_id: string, data: React.JSX.Element[]) =>
  */
 declare const sendToUser: (user_id: string, data: React.JSX.Element[]) => Promise<any[]>;
 
-export { Image, ImageFile, ImageURL, JSX, Mention, Text, sendToChannel, sendToUser, useSend };
+export { BT, Image, ImageFile, ImageURL, JSX, Mention, Text, sendToChannel, sendToUser, useSend };

package/lib/jsx.js

@@ -63,6 +63,28 @@ function Mention(_props) {
         dataType: 'Mention'
     });
 }
+const BT = (_props) => {
+    return React.createElement('div', {
+        dataType: 'Button',
+    });
+};
+// BT.group 子组件
+BT.group = (_props) => {
+    return React.createElement('div', {
+        dataType: 'BT.group',
+    });
+};
+BT.template = (_props) => {
+    return React.createElement('div', {
+        dataType: 'BT.group',
+    });
+};
+// BT.row 子组件
+BT.row = (_props) => {
+    return React.createElement('div', {
+        dataType: 'BT.row',
+    });
+};
 /**
  *  转换数据
  * ***
@@ -104,6 +126,9 @@ function JSX(...arg) {
                 }
                 : null));
         }
+        else if (dataType === 'BT.group') {
+            console.log('Button', props, item.type());
+        }
     }
     if (data.length === 0) {
         logger.error('Invalid data: data must be a non-empty array');
@@ -138,5 +163,18 @@ const sendToChannel = async (channel_id, data) => {
 const sendToUser = async (user_id, data) => {
     return sendToUser$1(user_id, JSX(...data));
 };
+// const Send = (..._x: any[]) => {
+//   //
+// }
+// Send(
+//   <BT.template id="12121" />,
+//   <BT.group>
+//     <BT.row><BT text="登录" data="/登录游戏" /><BT text="退出" data="/退出游戏" /></BT.row>
+//     <BT.row><BT text="是否同意" data={{ "click": "/点击", "confirm": "/同意", "cancel": "/不同意" }} /></BT.row>
+//     <BT.row><BT text="百度一下" data="htts://baidu.com" isLink /></BT.row>
+//     <BT.row><BT text="自动" data="/自动发出" autoEnter /></BT.row>
+//     <BT.row><BT text="禁用的" data="/点不了" toolTip="不支持点击" /></BT.row>
+//   </BT.group>
+// )
 
-export { Image, ImageFile, ImageURL, JSX, Mention, Text, sendToChannel, sendToUser, useSend };
+export { BT, Image, ImageFile, ImageURL, JSX, Mention, Text, sendToChannel, sendToUser, useSend };

package/lib/main.js

@@ -18,7 +18,7 @@ const run = (input) => {
         logger.error('未找到主要入口文件', mainPath);
         return;
     }
-    // 指定运行的，name识别为 'main:apps:xxx'
+    // 指定运行的，name识别为 'main:res:xxx'
     loadChildren(mainPath, 'main');
 };
 /**

package/lib/typing/event/index.d.ts

@@ -47,7 +47,7 @@ type DefineChildrenCallback = (() => Promise<ChildrenCycle> | ChildrenCycle) | C
  * 定义子模块
  */
 type DefineChildrenValue = {
-    _name: 'apps';
+    _name: 'app';
     callback: DefineChildrenCallback;
 };
 /**

package/lib/typing/message/index.d.ts

@@ -43,31 +43,44 @@ type DataMention = {
         payload?: User | Guild | Channel | 'everyone';
     };
 };
+type DataButton = {
+    type: 'Button';
+    value: string | {
+        title: string;
+        label: string;
+    };
+    options?: {
+        toolTip?: string;
+        autoEnter?: boolean;
+        showList?: boolean;
+        data?: string | {
+            "click": string;
+            "confirm": string;
+            "cancel": string;
+        };
+        isLink?: boolean;
+    };
+};
+type ButtonRow = {
+    type: 'BT.row';
+    value: DataButton[];
+};
+type DataButtonGroup = {
+    type: 'BT.group';
+    value: ButtonRow[];
+    options?: {
+        template_id?: string;
+    };
+};
 type DataMap = {
     Text: DataText;
     Image: DataImage;
     ImageURL: DataImageURL;
     ImageFile: DataImageFile;
     Mention: DataMention;
+    ButtonGroup: DataButtonGroup;
 };
-type ParseKeys = {
-    Text: string | undefined;
-    Image: Buffer[] | undefined;
-    Link: any;
-    Mention: {
-        value: string;
-        typing: string;
-        name: string;
-        avatar: string;
-        bot: boolean;
-    }[] | undefined;
-    Button: any;
-    File: any;
-    Voice: any;
-    Video: any;
-    ButtonBox: any;
-};
-type DataEnums = DataText | DataImage | DataImageURL | DataImageFile | DataMention;
+type DataEnums = DataText | DataImage | DataImageURL | DataImageFile | DataMention | DataButtonGroup;
 type MessageDataFormat = DataEnums[];
 
-export type { DataEnums, DataImage, DataImageFile, DataImageURL, DataMap, DataMention, DataText, MessageDataFormat, ParseKeys };
+export type { ButtonRow, DataButton, DataButtonGroup, DataEnums, DataImage, DataImageFile, DataImageURL, DataMap, DataMention, DataText, MessageDataFormat };

package/lib/typing/store/res.d.ts

@@ -1,10 +1,11 @@
+import { ChildrenCycle } from '../cycle/index.js';
 import { EventKeys } from '../event/map.js';
 
 type StoreResponseItem = {
     /**
      * 来源
      */
-    source: string;
+    input: string;
     /**
      * 目录
      */
@@ -20,11 +21,11 @@ type StoreResponseItem = {
     /**
      * 节点
      */
-    node: string;
+    appName: string;
     /**
      *
      */
-    state?: string;
+    stateKey?: string;
     /**
      *
      */
@@ -39,12 +40,12 @@ type StoreMiddlewareItem = {
     /**
      * 来源
      */
-    source: string;
+    input: string;
     dir: string;
     path: string;
     name: string;
-    node: string;
-    state?: string;
+    appName: string;
+    stateKey?: string;
     value?: {
         select: string;
     } | null;
@@ -61,5 +62,14 @@ type StoreMiddleware = {
 type StoreResponse = {
     [key in EventKeys]: StoreMiddlewareItem[];
 };
+/**
+ *
+ */
+type StoreChildrenApp = {
+    name: string;
+    middleware: StoreMiddlewareItem[];
+    response: StoreResponseItem[];
+    cycle: ChildrenCycle;
+};
 
-export type { StoreMiddleware, StoreMiddlewareItem, StoreResponse, StoreResponseItem };
+export type { StoreChildrenApp, StoreMiddleware, StoreMiddlewareItem, StoreResponse, StoreResponseItem };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alemonjs",
-  "version": "2.0.3-alpha.1",
+  "version": "2.0.5-alpha.1",
   "description": "bot script",
   "author": "lemonade",
   "license": "MIT",