alemonjs 2.0.9 → 2.0.11

package/lib/app/config.js

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

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

@@ -24,10 +24,8 @@ const showLog = (event, select) => {
     if (typeof event['MessageId'] == 'string' && event['MessageId'] != '') {
         log['MessageId'] = event['MessageId'];
     }
-    if (Array.isArray(event['MessageBody'])) {
-        const content = event['MessageBody'].filter(item => item.type == 'Text').map(item => item.value);
-        const txt = content.join('');
-        log['text'] = txt;
+    if (typeof event['MessageText'] == 'string' && event['MessageText'] != '') {
+        log['MessageText'] = event['MessageText'];
     }
     logger.info({
         code: ResultCode.Ok,

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

@@ -3,6 +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';
 
 /**
  * @fileoverview 消息处理快
@@ -98,7 +99,7 @@ const expendEvent = async (valueEvent, select, next) => {
                 }
             }
             // 消息类型数据
-            if (['message.create', 'private.message.create'].includes(select)) {
+            if (EventMessageText.includes(select)) {
                 if (app?.regular) {
                     const reg = new RegExp(app.regular);
                     if (!reg.test(valueEvent['MessageText'])) {

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

@@ -3,6 +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';
 
 /**
  * @fileoverview 消息处理快
@@ -79,7 +80,7 @@ const expendMiddleware = async (valueEvent, select, next) => {
                     return;
                 }
             }
-            if (['message.create', 'private.message.create'].includes(select)) {
+            if (EventMessageText.includes(select)) {
                 if (app?.regular) {
                     const reg = new RegExp(app.regular);
                     if (!reg.test(valueEvent['MessageText'])) {

package/lib/app/load.js

@@ -120,19 +120,16 @@ const loadChildren = async (mainPath, appName) => {
                 mwData.push(middleware);
             }
             App.pushMiddleware(mwData);
-            // onMounted 完成索引识别
-            if (typeof app?.onMounted == 'function') {
-                try {
+            App.on();
+            try {
+                if (typeof app?.onMounted == 'function') {
                     await app?.onMounted({ response: resData, middleware: mwData });
-                    // 校验完周期后，再进行挂载。
-                    // 防止校验过程中，出现初始化完周期，就执行匹配
-                    App.on();
-                }
-                catch (e) {
-                    unMounted(e);
-                    return;
                 }
             }
+            catch (e) {
+                unMounted(e);
+                return;
+            }
         }
         catch (e) {
             unMounted(e);

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

@@ -2,7 +2,7 @@ import '../global.js';
 import { DataButton, ButtonRow, DataButtonGroup } from '../typing/message/button.js';
 import { DataArkListTip, DataArkListContent, DataArkList, DataArkListItem, DataArkCard, DataArkBigCard } from '../typing/message/ark.js';
 import { DataMarkDown, DataMarkdownTemplate, DataMarkdownText, DataMarkdownTitle, DataMarkdownSubtitle, DataMarkdownBold, DataMarkdownItalic, DataMarkdownItalicStar, DataMarkdownStrikethrough, DataMarkdownLink, DataMarkdownImage, DataMarkdownList, DataMarkdownListItem, DataMarkdownBlockquote, DataMarkdownDivider, DataMarkdownNewline } from '../typing/message/markdown.js';
-import { DataImageURL, DataImageFile, DataImage } from '../typing/message/image.js';
+import { DataImage, DataImageURL, DataImageFile } from '../typing/message/image.js';
 import { DataText } from '../typing/message/text.js';
 import { DataMention } from '../typing/message/mention.js';
 import { DataLink } from '../typing/message/link.js';

package/lib/app/utils.d.ts

@@ -78,4 +78,5 @@ type Result = {
  */
 declare const createResult: (code: ResultCode, message: string | Object, data?: any) => Result;
 
-export { ErrorModule, type Result, createEventName, createHash, createResult, getInputExportPath, getRecursiveDirFiles, showErrorModule, stringToNumber, useUserHashKey };
+export { ErrorModule, createEventName, createHash, createResult, getInputExportPath, getRecursiveDirFiles, showErrorModule, stringToNumber, useUserHashKey };
+export type { Result };

package/lib/jsx.d.ts

@@ -3,10 +3,10 @@ import { ClientAPIMessageResult } from './typing/client/index.js';
 import { DataEnums } from './typing/message/index.js';
 import { Result } from './app/utils.js';
 import React from 'react';
-import { DataText } from './typing/message/text.js';
 import { DataImage, DataImageURL, DataImageFile } from './typing/message/image.js';
-import { DataMention } from './typing/message/mention.js';
 import { DataButton } from './typing/message/button.js';
+import { DataText } from './typing/message/text.js';
+import { DataMention } from './typing/message/mention.js';
 
 /**
  *

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

@@ -0,0 +1,13 @@
+import { Guild, Channel } from '../base/guild.js';
+import { MessageText, MessageOpen, Message } from '../base/message.js';
+import { User } from '../base/user.js';
+import { platform } from '../base/platform.js';
+
+type PrivateEventInteractionCreate = MessageText & MessageOpen & platform & Message & User & {
+    name: 'private.interaction.create';
+};
+type PublicEventInteractionCreate = MessageText & MessageOpen & platform & Guild & Channel & Message & User & {
+    name: 'interaction.create';
+};
+
+export type { PrivateEventInteractionCreate, PublicEventInteractionCreate };

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

@@ -1,13 +1,16 @@
 import { PublicEventChannalCreate, PublicEventChannalDelete } from './channal/index.js';
 import { PublicEventGuildJoin, PublicEventGuildExit } from './guild/index.js';
+import { PublicEventInteractionCreate, PrivateEventInteractionCreate } from './interaction/index.js';
 import { PublicEventMemberAdd, PublicEventMemberRemove } from './member/index.js';
-import { PublicEventMessageCreate, PublicEventMessageUpdate, PublicEventMessageDelete, PublicEventMessageReactionAdd, PublicEventMessageReactionRemove } from './message/message.js';
-import { PrivateEventMessageCreate, PrivateEventMessageUpdate, PrivateEventMessageDelete } from './message/private.message.js';
+import { PublicEventMessageUpdate, PublicEventMessageDelete, PublicEventMessageReactionAdd, PublicEventMessageReactionRemove, PublicEventMessageCreate } from './message/message.js';
+import { PrivateEventMessageUpdate, PrivateEventMessageDelete, PrivateEventMessageCreate } from './message/private.message.js';
 import { PrivateEventRequestFriendAdd, PrivateEventRequestGuildAdd } from './request/index.js';
 
 type EventsMessageCreate = {
     'message.create': PublicEventMessageCreate;
     'private.message.create': PrivateEventMessageCreate;
+    'interaction.create': PublicEventInteractionCreate;
+    'private.interaction.create': PrivateEventInteractionCreate;
 };
 type EventsMessageCreateKeys = keyof EventsMessageCreate;
 type EventsMessageCreateEnum = Events[EventsMessageCreateKeys];
@@ -31,4 +34,5 @@ type EventKeys = keyof Events;
 type EventsEnum = Events[EventKeys];
 declare const EventsKeyEnum: EventKeys[];
 
-export { type EventKeys, type Events, type EventsEnum, EventsKeyEnum, type EventsMessageCreate, type EventsMessageCreateEnum, type EventsMessageCreateKeys };
+export { EventsKeyEnum };
+export type { EventKeys, Events, EventsEnum, EventsMessageCreate, EventsMessageCreateEnum, EventsMessageCreateKeys };

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

@@ -1,5 +1,5 @@
 import { Guild, Channel } from '../base/guild.js';
-import { MessageText, MessageOpen, Message } from '../base/message.js';
+import { Message, MessageText, MessageOpen } from '../base/message.js';
 import { User } from '../base/user.js';
 import { platform } from '../base/platform.js';
 

package/lib/typing/event/message/private.message.d.ts

@@ -1,4 +1,4 @@
-import { MessageText, MessageOpen, Message } from '../base/message.js';
+import { Message, MessageText, MessageOpen } from '../base/message.js';
 import { platform } from '../base/platform.js';
 import { User } from '../base/user.js';
 

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

@@ -12,4 +12,5 @@ import { DataLink } from './link.js';
 type DataEnums = DataText | DataLink | DataImage | DataImageURL | DataImageFile | DataMention | DataButtonGroup | DataArkList | DataArkCard | DataArkBigCard | DataMarkDown | DataMarkdownTemplate;
 type MessageDataFormat = DataEnums[];
 
-export { DataArkBigCard, DataArkCard, DataArkList, DataButtonGroup, type DataEnums, DataImage, DataImageFile, DataImageURL, DataLink, DataMarkDown, DataMarkdownTemplate, DataMention, DataText, type MessageDataFormat };
+export { DataArkBigCard, DataArkCard, DataArkList, DataButtonGroup, DataImage, DataImageFile, DataImageURL, DataLink, DataMarkDown, DataMarkdownTemplate, DataMention, DataText };
+export type { DataEnums, MessageDataFormat };

package/package.json

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

package/lib/app/code.d.ts

@@ -1,22 +0,0 @@
-/**
- * 结果反馈码
- */
-/**
- * 结果反馈码
- * @description
- * - 2000: 成功
- * - 4000: 未知错误
- * - 4001: 参数错误
- * - 4002: 权限不足
- */
-declare const ResultCode: {
-  readonly Ok: 2000
-  readonly Fail: 4000
-  readonly FailParams: 4001
-  readonly Warn: 2100
-  readonly FailAuth: 4002
-  readonly FailInternal: 5000
-}
-type ResultCode = (typeof ResultCode)[keyof typeof ResultCode]
-
-export { ResultCode }

package/lib/app/code.js

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