alemonjs 2.0.0-rc.76 → 2.0.0-rc.78

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

@@ -94,6 +94,17 @@ const expendEvent = async (valueEvent, select, next) => {
                     });
                 }
             }
+            // 消息类型数据
+            if (select == 'message.create' || select == 'private.message.create') {
+                if (obj?.regular) {
+                    const reg = new RegExp(obj.regular);
+                    if (!reg.test(valueEvent['MessageText'])) {
+                        // 继续
+                        await nextEvent();
+                        return;
+                    }
+                }
+            }
             if (!res.current) {
                 // 继续
                 await nextEvent();
@@ -130,6 +141,17 @@ const expendEvent = async (valueEvent, select, next) => {
         try {
             const obj = await import(`file://${file.path}`);
             const res = obj?.default;
+            // 消息类型数据
+            if (select == 'message.create' || select == 'private.message.create') {
+                if (obj?.regular) {
+                    const reg = new RegExp(obj.regular);
+                    if (!reg.test(valueEvent['MessageText'])) {
+                        // 继续
+                        await nextEvent();
+                        return;
+                    }
+                }
+            }
             if (!res.current) {
                 // 继续
                 await nextEvent();

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

@@ -1,6 +1,7 @@
 import '../global.js';
 import { User } from '../typing/event/base/user.js';
 import { DataEnums } from '../typing/message/index.js';
+import { Current } from '../typing/event/index.js';
 import { AEvents } from '../typing/event/map.js';
 
 /**
@@ -23,13 +24,13 @@ declare const useSend: (event: {
  * @param option
  * @returns
  */
-declare const useSubscribe: <T extends keyof AEvents>(event: any, select: T) => ((callback: (e: AEvents[T], next: Function) => any, keys: (keyof AEvents[T])[]) => void)[];
+declare const useSubscribe: <T extends keyof AEvents>(event: any, select: T) => ((callback: Current<T>, keys: (keyof AEvents[T])[]) => void)[];
 /**
  *
  * @param event
  * @param option
  * @returns
  */
-declare const useObserver: <T extends keyof AEvents>(event: any, option: T) => (callback: (e: AEvents[T], next: Function) => any, keys: (keyof AEvents[T])[]) => void;
+declare const useObserver: <T extends keyof AEvents>(event: any, option: T) => (callback: Current<T>, keys: (keyof AEvents[T])[]) => void;
 
 export { useMention, useObserver, useSend, useSubscribe };

package/lib/config.d.ts

@@ -17,12 +17,12 @@ declare class ConfigCore {
     /**
      * package.json
      */
-    get package(): any;
+    get package(): null;
     /**
      * 命令行参数
      */
     get argv(): {
-        [key: string]: string | true;
+        [key: string]: string | true | undefined;
     };
 }
 /**
@@ -36,4 +36,4 @@ declare const getConfig: () => typeof ConfigCore.prototype;
  */
 declare const getConfigValue: () => any;
 
-export { getConfig, getConfigValue };
+export { ConfigCore, getConfig, getConfigValue };

package/lib/config.js

@@ -22,6 +22,8 @@ class ConfigCore {
      * @returns
      */
     #update() {
+        if (!this.#dir)
+            return this.#value;
         // 读取配置文件
         const dir = join(process.cwd(), this.#dir);
         logger.info('config read', dir);
@@ -119,4 +121,4 @@ const getConfig = () => {
  */
 const getConfigValue = () => getConfig()?.value;
 
-export { getConfig, getConfigValue };
+export { ConfigCore, getConfig, getConfigValue };

package/lib/index.d.ts

@@ -9,7 +9,7 @@ export { useMention, useObserver, useSend, useSubscribe } from './app/hook-use-a
 export { Ark, Button, ButtonBox, Embed, Emoji, File, Image, Link, Mention, Text, Video, Voice } from './app/hook-message-format.js';
 export { createHash, useUserHashKey } from './app/utils.js';
 export { getIoRedis } from './db/redis.js';
-export { getConfig, getConfigValue } from './config.js';
+export { ConfigCore, getConfig, getConfigValue } from './config.js';
 export { ChildrenCycle, EventCycle, Next } from './typing/cycle/index.js';
 export { Channel, Guild } from './typing/event/base/guild.js';
 export { Message, MessageOpen, MessageText } from './typing/event/base/message.js';

package/lib/index.js

@@ -2,7 +2,7 @@ import './global.js';
 import { join, dirname } from 'path';
 import { readFileSync, existsSync } from 'fs';
 import { getConfig } from './config.js';
-export { getConfigValue } from './config.js';
+export { ConfigCore, getConfigValue } from './config.js';
 import { getDirFiles } from './app/event-files.js';
 export { defineBot } from './app/event-bot.js';
 export { defineChildren } from './app/event-chidren.js';
@@ -125,7 +125,7 @@ const start = async (input = 'lib/index.js') => {
     if (typeof platform == 'boolean')
         return;
     // module
-    if (cfg.value?.apps && Array.isArray(cfg.value.apps)) {
+    if (cfg.value && cfg.value?.apps && Array.isArray(cfg.value.apps)) {
         for (const app of cfg.value?.apps) {
             moduleChildrenFiles(app);
         }

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

@@ -24,4 +24,4 @@ type OnObserverValue<T extends keyof AEvents> = {
     select: T[] | T;
 };
 
-export type { OnMiddlewareType, OnMiddlewareValue, OnObserverType, OnObserverValue, OnResponseType, OnResponseValue };
+export type { Current, OnMiddlewareType, OnMiddlewareValue, OnObserverType, OnObserverValue, OnResponseType, OnResponseValue };

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

@@ -1,10 +1,11 @@
+type Value = {
+    keys: {
+        [key: string]: string | number | boolean;
+    };
+    current: Function;
+};
 type SubscribeMap = {
-    [key: string]: {
-        keys: {
-            [key: string]: string | number | boolean;
-        };
-        current: Function;
-    }[];
+    [key: string]: (Value | undefined)[];
 };
 type Subscribe = {
     create: SubscribeMap;

package/package.json

@@ -1,11 +1,14 @@
 {
   "name": "alemonjs",
-  "version": "2.0.0-rc.76",
+  "version": "2.0.0-rc.78",
   "description": "alemonjs bot script",
   "author": "lemonade",
   "license": "MIT",
   "type": "module",
   "main": "lib/index.js",
+  "scripts": {
+    "build": "node bundle.js"
+  },
   "dependencies": {
     "chalk": "^5.3.0",
     "ioredis": "^5.4.1",
@@ -15,6 +18,13 @@
     "typescript": "^5.5.3",
     "yaml": "^2.5.1"
   },
+  "devDependencies": {
+    "@rollup/plugin-typescript": "^11.1.6",
+    "lvyjs": "^0.2.13",
+    "rollup": "^4.18.1",
+    "rollup-plugin-dts": "^6.1.1",
+    "tsx": "^4.19.1"
+  },
   "types": "lib",
   "exports": {
     ".": {

package/tsconfig.json

@@ -0,0 +1,4 @@
+{
+  "include": ["src/**/*"],
+  "extends": "lvyjs/tsconfig.json"
+}