alemonjs 2.1.0-alpha.23 → 2.1.0-alpha.25

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

@@ -29,7 +29,7 @@ const showLog = (event, select) => {
         });
     }
     else {
-        let baseLog = `[Name: ${select}]`;
+        let baseLog = `[${ResultCode.Ok}][Name: ${select}]`;
         if (typeof event['ChannelId'] === 'string' && event['ChannelId'] !== '') {
             baseLog += `[ChannelId: ${event['ChannelId']}]`;
         }

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

@@ -1,28 +1,24 @@
 import { EventKeys, Events } from '../typing/event/map.js';
+import { User } from '../typing/event/base/user.js';
 import { Result } from '../core/utils.js';
 import '../global.js';
 import { DataEnums } from '../typing/message/index.js';
 
+type Options = {
+    UserId?: string;
+    UserKey?: string;
+    UserName?: string;
+    IsMaster?: boolean;
+    IsBot?: boolean;
+};
 /**
  * 使用提及。
  * @param {Object} event - 事件对象，包含触发提及的相关信息。
  * @throws {Error} - 如果 event 无效，抛出错误。
  */
-declare const useMention: <T extends EventKeys>(event: Events[T]) => readonly [{
-    find: (options: {
-        UserId?: string;
-        UserKey?: string;
-        UserName?: string;
-        IsMaster?: boolean;
-        IsBot?: boolean;
-    }) => Promise<Result>;
-    findOne: (options?: {
-        UserId?: string;
-        UserKey?: string;
-        UserName?: string;
-        IsMaster?: boolean;
-        IsBot?: boolean;
-    }) => Promise<Result>;
+declare const useMention: <T extends EventKeys>(event: Events[T]) => [{
+    find: (options: Options) => Promise<Result<User[]>>;
+    findOne: (options?: Options) => Promise<Result<User | null>>;
 }];
 /**
  * 消息处理

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

@@ -39,7 +39,7 @@ const useMention = (event) => {
                 return createResult(ResultCode.Fail, err?.message || 'Failed to get mention data', null);
             }
             if (!Array.isArray(res)) {
-                return createResult(ResultCode.Fail, 'No mention data found', null);
+                return createResult(ResultCode.Warn, 'No mention data found', null);
             }
             // 过滤出符合条件的数据
             const data = res.filter(item => {
@@ -83,7 +83,7 @@ const useMention = (event) => {
                 return createResult(ResultCode.Fail, err?.message || 'Failed to get mention data', null);
             }
             if (!Array.isArray(res)) {
-                return createResult(ResultCode.Fail, 'No mention data found', null);
+                return createResult(ResultCode.Warn, 'No mention data found', null);
             }
             // 根据条件查找
             const data = res.find(item => {
@@ -105,7 +105,7 @@ const useMention = (event) => {
                 return true;
             });
             if (!data) {
-                return createResult(ResultCode.Fail, 'No mention data found', null);
+                return createResult(ResultCode.Warn, 'No mention data found', null);
             }
             return createResult(ResultCode.Ok, 'Successfully retrieved mention data', data);
         }

package/lib/app/store.js

@@ -17,13 +17,28 @@ const createLogger = () => {
     mkdirSync(logDir, { recursive: true });
     // 当环境被设置为 development 时。被视为 trace
     const level = process.env.NODE_ENV === 'development' ? 'trace' : 'info';
+    const hideTime = process.env.LOGGER_TIME === 'false' ? true : false;
+    const hideLevel = process.env.LOGGER_LEVEL === 'false' ? true : false;
+    let pattern = '';
+    if (hideTime && hideLevel) {
+        pattern = `%m`;
+    }
+    else if (hideTime && !hideLevel) {
+        pattern = `[%p] %m`;
+    }
+    else if (!hideTime && hideLevel) {
+        pattern = `[%d{yyyy-MM-dd hh:mm:ss}] %m`;
+    }
+    else {
+        pattern = `[%d{yyyy-MM-dd hh:mm:ss}][%p] %m`;
+    }
     log4js.configure({
         appenders: {
             console: {
                 type: 'console',
                 layout: {
                     type: 'pattern',
-                    pattern: `%[[%d{yyyy-MM-dd hh:mm:ss}][%5.5p]%] %m`
+                    pattern: pattern
                 }
             },
             command: {
@@ -34,7 +49,7 @@ const createLogger = () => {
                 alwaysIncludePattern: true,
                 layout: {
                     type: 'pattern',
-                    pattern: `%[[%d{yyyy-MM-dd hh:mm:ss}][%5.5p]%] %m`
+                    pattern: pattern
                 }
             },
             error: {
@@ -45,7 +60,7 @@ const createLogger = () => {
                 alwaysIncludePattern: true,
                 layout: {
                     type: 'pattern',
-                    pattern: `%[[%d{yyyy-MM-dd hh:mm:ss}][%5.5p]%] %m`
+                    pattern: pattern
                 }
             }
         },

package/lib/core/utils.d.ts

@@ -59,10 +59,10 @@ declare const getInputExportPath: (input?: string) => any;
  * 异步方法。且需要读取返回值的进行判断的，
  * 都要以 Result 作为返回值
  */
-type Result = {
+type Result<T = any> = {
     code: ResultCode;
     message: string | Object;
-    data: any;
+    data: T;
 };
 /**
  * 创建结果
@@ -70,7 +70,7 @@ type Result = {
  * @param message
  * @returns
  */
-declare const createResult: (code: ResultCode, message: string | Object, data?: any) => Result;
+declare const createResult: <T>(code: ResultCode, message: string | Object, data?: T) => Result<T>;
 
 export { createEventName, createHash, createResult, getInputExportPath, getRecursiveDirFiles, showErrorModule, stringToNumber, useUserHashKey };
 export type { Result };

package/package.json

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