alemonjs 2.0.0-rc.2 → 2.0.0-rc.4

package/lib/app/event-bot.d.ts

@@ -0,0 +1,6 @@
+import { ConfigType } from '../typing/config.js';
+
+type BotType = (_: ConfigType) => typeof global.alemonjs;
+declare const defineBot: (callback: BotType) => BotType;
+
+export { defineBot };

package/lib/app/event-bot.js

@@ -0,0 +1,3 @@
+const defineBot = (callback) => callback;
+
+export { defineBot };

package/lib/app/event-chidren.d.ts

@@ -0,0 +1,11 @@
+import { ConfigType } from '../typing/config.js';
+
+type callbackObjType = {
+    onCreated?: () => void;
+    onMounted?: () => void;
+    unMounted?: () => void;
+};
+type callbackType = (config: ConfigType) => callbackObjType;
+declare const defineChildren: (_: callbackType) => void;
+
+export { defineChildren };

package/lib/app/event-chidren.js

@@ -0,0 +1,3 @@
+const defineChildren = (_) => { };
+
+export { defineChildren };

package/lib/app/event-files.d.ts

@@ -0,0 +1,8 @@
+/**
+ * 递归获取所有文件名以 res 开头的文件
+ * @param dir 目录路径
+ * @returns 文件路径数组
+ */
+declare const getAppsFiles: (dir: string) => string[];
+
+export { getAppsFiles };

package/lib/app/event-files.js

@@ -1,28 +1,18 @@
-import { join, dirname } from 'node:path';
-import fs from 'node:fs';
+import fs from 'fs';
+import { join } from 'path';
 
-const _dir = './src/apps';
-/**
- *
- */
-const values = [];
-/**
- *
- * @returns
- */
-const getFilesValues = () => values;
 /**
  * 递归获取所有文件名以 res 开头的文件
  * @param dir 目录路径
  * @returns 文件路径数组
  */
-const getFiles = (dir) => {
+const getAppsFiles = (dir) => {
     let results = [];
     const list = fs.readdirSync(dir, { withFileTypes: true });
     list.forEach(item => {
         const fullPath = join(dir, item.name);
         if (item.isDirectory()) {
-            results = results.concat(getFiles(fullPath));
+            results = results.concat(getAppsFiles(fullPath));
         }
         else if (item.isFile() && item.name.startsWith('res')) {
             if (item.name.endsWith('.ts') ||
@@ -35,30 +25,5 @@ const getFiles = (dir) => {
     });
     return results;
 };
-/**
- * 加载文件
- */
-const loadFiles = async () => {
-    const dir = join(process.cwd(), _dir);
-    const files = getFiles(dir);
-    // 读取config ，根据config对目录进行分类
-    for (const item of files) {
-        // 暂时不使用 config.js
-        // const dir = dirname(item)
-        let v = {};
-        // try {
-        //   const obj = await import(`file://${dir}/config.js`)
-        //   v = obj?.default
-        // } catch (e) {
-        //   // console.error(e)
-        // }
-        // 保存目录地址和文件地址
-        values.push({
-            ...v,
-            dir: dirname(item),
-            path: item
-        });
-    }
-};
 
-export { getFilesValues, loadFiles };
+export { getAppsFiles };

package/lib/app/event-processor.d.ts

@@ -1,9 +1,26 @@
 import { AEvents } from '../typing/typing.js';
 
+type DbKey = {
+    dir: string;
+    value?: {
+        reg: RegExp;
+        event: string;
+        priority: number;
+    } | null;
+    path: string;
+};
+declare global {
+    var AppsFiles: DbKey[];
+}
+/**
+ *
+ * @param val
+ */
+declare const pushAppsFiles: (val: DbKey) => void;
 /**
  * 加载文件
  */
-declare const loadFiles: () => Promise<void>;
+declare const loadFiles: () => void;
 /**
  * 消息处理器
  * @param value
@@ -12,4 +29,4 @@ declare const loadFiles: () => Promise<void>;
  */
 declare const OnProcessor: <T extends keyof AEvents>(value: AEvents[T], event: T) => void;
 
-export { OnProcessor, loadFiles };
+export { OnProcessor, loadFiles, pushAppsFiles };

package/lib/app/event-processor.js

@@ -3,8 +3,9 @@ import fs from 'node:fs';
 import { useParse } from '../hook/use-api.js';
 
 const _dir = './src/apps';
-//
-const files = [];
+if (!global.AppsFiles) {
+    global.AppsFiles = [];
+}
 //
 const values = {
     'message.create': []
@@ -14,13 +15,13 @@ const values = {
  * @param dir 目录路径
  * @returns 文件路径数组
  */
-const getFiles = (dir) => {
+const getAppsFiles = (dir) => {
     let results = [];
     const list = fs.readdirSync(dir, { withFileTypes: true });
     list.forEach(item => {
         const fullPath = join(dir, item.name);
         if (item.isDirectory()) {
-            results = results.concat(getFiles(fullPath));
+            results = results.concat(getAppsFiles(fullPath));
         }
         else if (item.isFile() && item.name.startsWith('res')) {
             if (item.name.endsWith('.ts') ||
@@ -33,26 +34,23 @@ const getFiles = (dir) => {
     });
     return results;
 };
+/**
+ *
+ * @param val
+ */
+const pushAppsFiles = (val) => {
+    global.AppsFiles.push(val);
+};
 /**
  * 加载文件
  */
-const loadFiles = async () => {
+const loadFiles = () => {
     const dir = join(process.cwd(), _dir);
-    const Filesx = getFiles(dir);
+    const Filesx = getAppsFiles(dir);
     // 读取config ，根据config对目录进行分类
     for (const item of Filesx) {
-        // 暂时不使用 config.js
-        // const dir = dirname(item)
-        let v = {};
-        // try {
-        //   const obj = await import(`file://${dir}/config.js`)
-        //   v = obj?.default
-        // } catch (e) {
-        //   // console.error(e)
-        // }
         // 保存目录地址和文件地址
-        files.push({
-            ...v,
+        global.AppsFiles.push({
             dir: dirname(item),
             path: item
         });
@@ -70,7 +68,7 @@ const onMessageCreate = async (e) => {
         global.storeoberver['message.create'] = [];
     }
     // copy
-    const messageFiles = [...files];
+    const messageFiles = [...global.AppsFiles];
     const messageCreate = [...values['message.create']];
     let i = 0;
     let j = 0;
@@ -97,19 +95,34 @@ const onMessageCreate = async (e) => {
             next();
             return;
         }
+        //
+        n++;
         // 发现订阅
-        const item = global.storeoberver['message.create'][n];
+        const item = global.storeoberver['message.create'][n - 1];
+        if (!item) {
+            // 继续 next
+            nextOberver();
+            return;
+        }
         for (const key in item.event) {
             // 只要发现不符合的，就继续
             if (item.event[key] !== e[key]) {
                 // 不符合。继续 next。
-                n++;
                 nextOberver();
                 return;
             }
         }
-        // 符合。调用
-        item.callback(e, { next });
+        // 设置为undefined
+        global.storeoberver['message.create'][n - 1] = undefined;
+        // 放回来
+        const Continue = () => {
+            global.storeoberver['message.create'][n - 1] = item;
+            // 直接结束才对
+        };
+        // 没有调用下一步。应该删除当前的 n ？
+        // 有没有可能。按key来分。
+        item.callback(e, { next: Continue });
+        //
     };
     const calli = async () => {
         // 调用完了
@@ -144,8 +157,8 @@ const onMessageCreate = async (e) => {
         // 推送, 确保下次直接流向 message.create ，不再从头开始
         if (!values['message.create'].find(v => v.path === file.path)) {
             // update files and values
-            const index = files.findIndex(v => v.path === file.path);
-            files.splice(index, 1);
+            const index = global.AppsFiles.findIndex(v => v.path === file.path);
+            global.AppsFiles.splice(index, 1);
             values['message.create'].push(v);
         }
         const msg = useParse(e.Megs, 'Text') ?? '';
@@ -211,4 +224,4 @@ const OnProcessor = (value, event) => {
     return;
 };
 
-export { OnProcessor, loadFiles };
+export { OnProcessor, loadFiles, pushAppsFiles };

package/lib/config.d.ts

@@ -1,19 +1,11 @@
+import { ConfigType } from './typing/config.js';
+
 declare const argv: string[];
 /**
  * @param key 参数
  * @returns 参数值
  */
 declare const getArgvValue: (key: string) => string;
-type ConfigType = {
-    login: string | undefined;
-    app_id: string | undefined;
-    token: string | undefined;
-    intent: string | undefined;
-    secret: string | undefined;
-    shard: number[] | undefined;
-    intents: string[] | undefined;
-    master_id: string[] | undefined;
-};
 /**
  * 配置类
  */
@@ -34,4 +26,4 @@ declare class Config {
     get value(): any;
 }
 
-export { Config, type ConfigType, argv, getArgvValue };
+export { Config, argv, getArgvValue };

package/lib/hook/use-api.js

@@ -68,8 +68,24 @@ const useOberver = (event, option) => {
             global.storeoberver = {};
         if (!global.storeoberver[option])
             global.storeoberver[option] = [];
-        // 如果不存在。则创建
-        global.storeoberver[option].push({ event: v, callback });
+        let i = 0;
+        const next = () => {
+            if (i >= global.storeoberver[option].length) {
+                // 如果不存在。则创建
+                global.storeoberver[option][i] = { event: v, callback };
+                return;
+            }
+            i++;
+            // 是空的。占据位置。
+            if (!global.storeoberver[option][i]) {
+                global.storeoberver[option][i] = { event: v, callback };
+            }
+            else {
+                // 不是空的。继续
+                next();
+            }
+        };
+        next();
         return;
     };
 };

package/lib/index.d.ts

@@ -1,8 +1,12 @@
-export { Config, ConfigType, argv, getArgvValue } from './config.js';
+export { Config, argv, getArgvValue } from './config.js';
 export { useOberver, useParse, useSend } from './hook/use-api.js';
 export { OnObserver, OnResponse, ResponseConfig } from './app/event-utlis.js';
 export { AEventByMessageCreate, AEventByMessageDelete, AEventByMessageUpdate, AEvents } from './typing/typing.js';
-export { OnProcessor, loadFiles } from './app/event-processor.js';
+export { ConfigType } from './typing/config.js';
+export { OnProcessor, loadFiles, pushAppsFiles } from './app/event-processor.js';
+export { getAppsFiles } from './app/event-files.js';
+export { defineBot } from './app/event-bot.js';
+export { defineChildren } from './app/event-chidren.js';
 export { Ark, At, BtBox, Button, Embed, Emoji, Files, Image, Link, Text, Video, Voice } from './hook/message-format.js';
 
 type options = {

package/lib/index.js

@@ -1,10 +1,33 @@
 import { argv, getArgvValue, Config } from './config.js';
-import { loadFiles } from './app/event-processor.js';
+import { loadFiles, pushAppsFiles } from './app/event-processor.js';
 export { OnProcessor } from './app/event-processor.js';
+import { getAppsFiles } from './app/event-files.js';
+import { join, dirname } from 'path';
+import { readFileSync } from 'fs';
 export { useOberver, useParse, useSend } from './hook/use-api.js';
 export { OnObserver, OnResponse, ResponseConfig } from './app/event-utlis.js';
+export { defineBot } from './app/event-bot.js';
+export { defineChildren } from './app/event-chidren.js';
 export { Ark, At, BtBox, Button, Embed, Emoji, Files, Image, Link, Text, Video, Voice } from './hook/message-format.js';
 
+/**
+ *
+ * @param app
+ */
+const loadChildrenFiles = app => {
+    const packageJson = JSON.parse(readFileSync(`node_modules/${app}/package.json`, 'utf-8'));
+    const mainPath = join(`node_modules/${app}`, packageJson.main);
+    const mainDir = dirname(mainPath);
+    const appsDir = join(mainDir, 'apps');
+    const files = getAppsFiles(appsDir);
+    for (const file of files) {
+        const dir = join(process.cwd(), file);
+        pushAppsFiles({
+            dir: dirname(dir),
+            path: dir
+        });
+    }
+};
 /**
  * 创建机器人
  * @returns
@@ -16,12 +39,24 @@ async function createBot() {
     if (!cfg.values?.login) {
         throw new Error('login is required');
     }
-    await loadFiles();
+    // local
+    loadFiles();
+    // module
+    if (cfg?.value?.apps) {
+        if (Array.isArray(cfg?.value?.apps)) {
+            for (const app of cfg?.value?.apps) {
+                // const m = await import(app)
+                // const c = m?.default()
+                loadChildrenFiles(app);
+            }
+        }
+    }
     // prefix
     const prefix = getArgvValue('--prefix') ?? '@alemonjs/';
     if (!skip) {
-        const { login } = await import(`${prefix}${cfg.values.login}`);
-        login(cfg.values);
+        const bot = await import(`${prefix}${cfg.values.login}`);
+        // 挂在全局
+        global.alemonjs = bot?.default(cfg.values);
         return;
     }
     await import(`${prefix}${cfg.values.login}`);
@@ -34,4 +69,4 @@ function defineConfig(options = {}) {
     return options;
 }
 
-export { Config, argv, createBot, defineConfig, getArgvValue, loadFiles };
+export { Config, argv, createBot, defineConfig, getAppsFiles, getArgvValue, loadFiles, pushAppsFiles };

package/lib/typing/config.d.ts

@@ -0,0 +1,12 @@
+type ConfigType = {
+    login: string | undefined;
+    app_id: string | undefined;
+    token: string | undefined;
+    intent: string | undefined;
+    secret: string | undefined;
+    shard: number[] | undefined;
+    intents: string[] | undefined;
+    master_id: string[] | undefined;
+};
+
+export type { ConfigType };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alemonjs",
-  "version": "2.0.0-rc.2",
+  "version": "2.0.0-rc.4",
   "description": "啊柠檬脚本",
   "author": "ningmengchongshui",
   "license": "MIT",