alemonjs 2.1.93 → 2.1.95

package/lib/application/format/message-api.d.ts

@@ -9,10 +9,21 @@ export declare class MessageDirect {
         SpaceId: string;
         format: Format | DataEnums[];
         replyId?: string;
+        BotId?: string;
     }): Promise<Result[]>;
     sendToUser(params: {
         OpenID: string;
         format: Format | DataEnums[];
+        BotId?: string;
+    }): Promise<Result[]>;
+    sendToTarget(params: {
+        target: {
+            scope: 'group' | 'c2c' | 'channel' | 'direct';
+            targetId: string;
+            BotId?: string;
+        };
+        format: Format | DataEnums[];
+        replyId?: string;
     }): Promise<Result[]>;
 }
 export declare const sendToChannel: (SpaceId: string, data: DataEnums[]) => Promise<Result[]>;

package/lib/application/format/message-api.js

@@ -46,6 +46,7 @@ class MessageDirect {
                 action: 'message.send.channel',
                 payload: {
                     ChannelId: params.SpaceId,
+                    BotId: params.BotId,
                     params: {
                         format: Array.isArray(params.format) ? params.format : params.format.value,
                         replyId: params?.replyId
@@ -75,6 +76,7 @@ class MessageDirect {
                 action: 'message.send.user',
                 payload: {
                     UserId: params.OpenID,
+                    BotId: params.BotId,
                     params: {
                         format: Array.isArray(params.format) ? params.format : params.format.value
                     }
@@ -88,6 +90,30 @@ class MessageDirect {
             throw error;
         }
     }
+    async sendToTarget(params) {
+        if (!params.target?.targetId) {
+            throw new Error('Invalid targetId: targetId must be a non-empty string');
+        }
+        markEventSendAttempt();
+        try {
+            const results = await sendAction({
+                action: 'message.send.target',
+                payload: {
+                    target: params.target,
+                    params: {
+                        format: Array.isArray(params.format) ? params.format : params.format.value,
+                        replyId: params.replyId
+                    }
+                }
+            });
+            recordEventSendResults(results, undefined);
+            return results;
+        }
+        catch (error) {
+            markEventSendFailure(error);
+            throw error;
+        }
+    }
 }
 const sendToChannel = (SpaceId, data) => {
     return MessageDirect.create().sendToChannel({ SpaceId, format: data, replyId: undefined });

package/lib/application/hooks/connection.d.ts

@@ -0,0 +1,6 @@
+import { ConnectionStatus, Result } from './common';
+export declare const useConnection: () => readonly [{
+    readonly getStatus: (params?: {
+        BotId?: string;
+    }) => Promise<Result<ConnectionStatus>>;
+}];

package/lib/application/hooks/connection.js

@@ -0,0 +1,35 @@
+import { ResultCode } from '../../common/variable.js';
+import '../runtime/store.js';
+import '../../common/utils.js';
+import { sendAction } from '../runtime/cbp/processor/actions.js';
+import 'fs';
+import 'path';
+import 'yaml';
+import '../../common/logger.js';
+import { createResult } from '../../common/result.js';
+import 'net';
+import 'v8';
+import 'os';
+import 'flatted';
+import '../../common/cbp/runtime.js';
+import 'ws';
+import '../runtime/hook-event-context.js';
+
+const useConnection = () => {
+    const getStatus = async (params) => {
+        try {
+            const results = await sendAction({
+                action: 'connection.status',
+                payload: params || {}
+            });
+            const result = results.find(item => item.code === ResultCode.Ok);
+            return result || createResult(ResultCode.Warn, 'Connection status is not supported', null);
+        }
+        catch {
+            return createResult(ResultCode.Fail, 'Failed to get connection status', null);
+        }
+    };
+    return [{ getStatus }];
+};
+
+export { useConnection };

package/lib/application/hooks/index.d.ts

@@ -1,8 +1,10 @@
 export * from './announce';
 export * from './channel';
+export * from './connection';
 export * from './client';
 export * from './guild';
 export * from './history';
+export * from './interaction';
 export * from './media';
 export * from './me';
 export * from './member';

package/lib/application/hooks/index.js

@@ -1,8 +1,10 @@
 export { useAnnounce } from './announce.js';
 export { useChannel } from './channel.js';
+export { useConnection } from './connection.js';
 export { useClient } from './client.js';
 export { useGuild } from './guild.js';
 export { useHistory } from './history.js';
+export { useInteraction } from './interaction.js';
 export { useMedia } from './media.js';
 export { useMe } from './me.js';
 export { useMember } from './member.js';

package/lib/application/hooks/interaction.d.ts

@@ -0,0 +1,8 @@
+import { ActionTarget, EventKeys, Events, Result } from './common';
+export declare const useInteraction: <T extends EventKeys>(event?: Events[T]) => readonly [{
+    readonly ack: (params?: {
+        InteractionId?: string;
+        code?: number;
+        target?: ActionTarget;
+    }) => Promise<Result>;
+}];

package/lib/application/hooks/interaction.js

@@ -0,0 +1,35 @@
+import { getEventOrThrow } from './common.js';
+import { createResult } from '../../common/result.js';
+import '../../common/utils.js';
+import { ResultCode } from '../../common/variable.js';
+import { sendAction } from '../runtime/cbp/processor/actions.js';
+
+const useInteraction = (event) => {
+    const valueEvent = getEventOrThrow(event);
+    const ack = async (params) => {
+        const interactionId = params?.InteractionId || valueEvent.InteractionId;
+        const eventTarget = valueEvent.Target;
+        const target = params?.target || eventTarget;
+        if (!interactionId) {
+            return createResult(ResultCode.FailParams, 'Missing InteractionId', null);
+        }
+        try {
+            const results = await sendAction({
+                action: 'interaction.ack',
+                payload: {
+                    InteractionId: interactionId,
+                    ...(target && { target }),
+                    params: { code: params?.code }
+                }
+            });
+            const result = results.find(item => item.code === ResultCode.Ok);
+            return result || createResult(ResultCode.Warn, 'Interaction acknowledgement is not supported', null);
+        }
+        catch {
+            return createResult(ResultCode.Fail, 'Failed to acknowledge interaction', null);
+        }
+    };
+    return [{ ack }];
+};
+
+export { useInteraction };

package/lib/application/hooks/media.d.ts

@@ -4,20 +4,46 @@ export declare const useMedia: <T extends EventKeys>(event?: Events[T]) => reado
         type: "file" | "image" | "audio" | "video";
         url?: string;
         data?: string;
+        filePath?: string;
+        fileId?: string;
         name?: string;
+        content?: string;
+    } & {
+        target?: ActionTarget;
     }) => Promise<Result>;
     sendChannel: (params: {
         type: "file" | "image" | "audio" | "video";
         url?: string;
         data?: string;
+        filePath?: string;
+        fileId?: string;
         name?: string;
+        content?: string;
+    } & {
         channelId?: string;
+        BotId?: string;
     }) => Promise<Result>;
     sendUser: (params: {
+        type: "file" | "image" | "audio" | "video";
+        url?: string;
+        data?: string;
+        filePath?: string;
+        fileId?: string;
+        name?: string;
+        content?: string;
+    } & {
         userId: string;
+        BotId?: string;
+    }) => Promise<Result>;
+    send: (params: {
         type: "file" | "image" | "audio" | "video";
         url?: string;
         data?: string;
+        filePath?: string;
+        fileId?: string;
         name?: string;
+        content?: string;
+    } & {
+        target: ActionTarget;
     }) => Promise<Result>;
 }];

package/lib/application/hooks/media.js

@@ -6,11 +6,17 @@ import { sendAction } from '../runtime/cbp/processor/actions.js';
 
 const useMedia = (event) => {
     const valueEvent = getEventOrThrow(event);
+    const validateSource = (params) => {
+        const count = [params.url, params.data, params.filePath, params.fileId].filter(value => value !== undefined).length;
+        return count === 1;
+    };
     const upload = async (params) => {
+        if (!validateSource(params))
+            return createResult(ResultCode.FailParams, 'Provide exactly one media source', null);
         try {
             const results = await sendAction({
                 action: 'media.upload',
-                payload: { params }
+                payload: { target: params.target, params }
             });
             const result = results.find(item => item.code === ResultCode.Ok);
             return result || createResult(ResultCode.Warn, 'Media upload not supported or failed', null);
@@ -27,7 +33,7 @@ const useMedia = (event) => {
         try {
             const results = await sendAction({
                 action: 'media.send.channel',
-                payload: { ChannelId: cid, params: { type: params.type, url: params.url, data: params.data, name: params.name } }
+                payload: { ChannelId: cid, BotId: params.BotId, params }
             });
             const result = results.find(item => item.code === ResultCode.Ok);
             return result || createResult(ResultCode.Warn, 'Media send not supported or failed', null);
@@ -43,7 +49,7 @@ const useMedia = (event) => {
         try {
             const results = await sendAction({
                 action: 'media.send.user',
-                payload: { UserId: params.userId, params: { type: params.type, url: params.url, data: params.data, name: params.name } }
+                payload: { UserId: params.userId, BotId: params.BotId, params }
             });
             const result = results.find(item => item.code === ResultCode.Ok);
             return result || createResult(ResultCode.Warn, 'Media send not supported or failed', null);
@@ -52,10 +58,32 @@ const useMedia = (event) => {
             return createResult(ResultCode.Fail, 'Failed to send media to user', null);
         }
     };
+    const send = async (params) => {
+        if (!params.target?.targetId) {
+            return createResult(ResultCode.FailParams, 'Missing targetId', null);
+        }
+        if (!validateSource(params))
+            return createResult(ResultCode.FailParams, 'Provide exactly one media source', null);
+        try {
+            const results = await sendAction({
+                action: 'media.send',
+                payload: {
+                    target: params.target,
+                    params
+                }
+            });
+            const result = results.find(item => item.code === ResultCode.Ok);
+            return result || createResult(ResultCode.Warn, 'Media send not supported or failed', null);
+        }
+        catch {
+            return createResult(ResultCode.Fail, 'Failed to send media', null);
+        }
+    };
     const media = {
         upload,
         sendChannel,
-        sendUser
+        sendUser,
+        send
     };
     return [media];
 };

package/lib/application/index.js

@@ -6,9 +6,11 @@ export { defineRouter, lazy, runHandler } from './define-router.js';
 export { Expose, clearAllExpose, disposeExpose, registerExpose } from './expose.js';
 export { useAnnounce } from './hooks/announce.js';
 export { useChannel } from './hooks/channel.js';
+export { useConnection } from './hooks/connection.js';
 export { useClient } from './hooks/client.js';
 export { useGuild } from './hooks/guild.js';
 export { useHistory } from './hooks/history.js';
+export { useInteraction } from './hooks/interaction.js';
 export { useMedia } from './hooks/media.js';
 export { useMe } from './hooks/me.js';
 export { useMember } from './hooks/member.js';

package/lib/application/router/dsl.js

@@ -689,7 +689,7 @@ class Router {
         const md = Format.createMarkdown();
         const format = Format.create();
         const routeEntry = (result.eventName && result.matchedPath
-            ? this.routes.get(result.eventName)?.one.get(result.matchedPath) ?? this.routes.get(result.eventName)?.two.get(result.matchedPath)
+            ? (this.routes.get(result.eventName)?.one.get(result.matchedPath) ?? this.routes.get(result.eventName)?.two.get(result.matchedPath))
             : undefined) ?? undefined;
         const description = formatRouteDescription(routeEntry?.config.description);
         const schemaHints = buildSchemaHints(routeEntry?.config.schema);

package/lib/application/runtime/load-modules/load.js

@@ -4,7 +4,11 @@ import { join, dirname } from 'path';
 import { existsSync } from 'fs';
 import { ResultCode } from '../../../common/variable.js';
 import { registerRuntimeApp } from '../store.js';
+import module$1 from 'module';
 
+const initRequire = () => { };
+initRequire.resolve = () => '';
+const require$1 = module$1?.createRequire?.(import.meta.url) ?? initRequire;
 const loadApps = () => {
     const cfg = getConfig();
     const apps = Array.isArray(cfg.value?.apps)
@@ -33,7 +37,7 @@ const run = async (input) => {
     if (!existsSync(mainPath)) {
         logger.warn({
             code: ResultCode.Warn,
-            message: '未找到主要入口文件',
+            message: '未找到指定的主应用入口文件，但不影响继续运行',
             data: null
         });
         return;
@@ -49,8 +53,16 @@ const run = async (input) => {
     await loadChildren(mainPath, 'main');
 };
 async function loadModels() {
-    const input = process.env.input ?? '';
-    await run(input);
+    if (!process.env.input) {
+        const pkgPath = join(process.cwd(), 'package.json');
+        if (existsSync(pkgPath)) {
+            const pkg = require$1(pkgPath) ?? {};
+            if (pkg?.main) {
+                process.env.input = pkg.main;
+            }
+        }
+    }
+    await run(process.env.input ?? '');
     await loadApps();
 }
 

package/lib/index.js

@@ -60,9 +60,11 @@ export { registerAppDir, scheduleCancel, scheduleCancelAll, scheduleCancelByApp,
 export { useAnnounce } from './application/hooks/announce.js';
 export { useChannel } from './application/hooks/channel.js';
 export { useClient } from './application/hooks/client.js';
+export { useConnection } from './application/hooks/connection.js';
 export { useGuild } from './application/hooks/guild.js';
 export { useHeartbeat } from './common/cbp/heartbeat.js';
 export { useHistory } from './application/hooks/history.js';
+export { useInteraction } from './application/hooks/interaction.js';
 export { useMe } from './application/hooks/me.js';
 export { useMedia } from './application/hooks/media.js';
 export { useMember } from './application/hooks/member.js';

package/lib/platform/event-format.d.ts

@@ -1,4 +1,4 @@
-import { Events, EventKeys, EventBuilder, ReservedEventKeys, User, Guild, Channel, Message, MessageText, MessageMedia, MessageOpen, Platform } from '../types';
+import { Events, EventKeys, EventBuilder, ReservedEventKeys, User, Guild, Channel, Message, MessageText, MessageMedia, MessageOpen, Platform, Interaction } from '../types';
 export declare class FormatEvent<T extends EventKeys = EventKeys> {
     #private;
     private constructor();
@@ -11,6 +11,7 @@ export declare class FormatEvent<T extends EventKeys = EventKeys> {
     addText(params: MessageText): this;
     addMedia(params: MessageMedia): this;
     addOpen(params: MessageOpen): this;
+    addInteraction(params: Interaction): this;
     add<E extends Record<string, unknown>>(fields: {
         [K in keyof E]: K extends ReservedEventKeys ? never : E[K];
     }): this;

package/lib/platform/event-format.js

@@ -65,6 +65,14 @@ class FormatEvent {
         });
         return this;
     }
+    addInteraction(params) {
+        Object.assign(this.#data, {
+            InteractionId: params.InteractionId,
+            ...(params.InteractionData !== undefined && { InteractionData: params.InteractionData }),
+            ...(params.Target !== undefined && { Target: params.Target })
+        });
+        return this;
+    }
     add(fields) {
         for (const key of Object.keys(fields)) {
             this.#data[`_${key}`] = fields[key];

package/lib/types/actions.d.ts

@@ -1,6 +1,12 @@
 import { DataEnums } from './message';
 import { PaginationParams } from './standard';
-export type MessageActionName = 'message.send' | 'message.send.channel' | 'message.send.user' | 'message.delete' | 'message.edit' | 'message.pin' | 'message.unpin' | 'message.forward.user' | 'message.forward.channel' | 'message.get' | 'message.intent';
+export type ActionTargetScope = 'group' | 'c2c' | 'channel' | 'direct';
+export type ActionTarget = {
+    scope: ActionTargetScope;
+    targetId: string;
+    BotId?: string;
+};
+export type MessageActionName = 'message.send' | 'message.send.channel' | 'message.send.user' | 'message.send.target' | 'message.delete' | 'message.edit' | 'message.pin' | 'message.unpin' | 'message.forward.user' | 'message.forward.channel' | 'message.get' | 'message.intent';
 export type MentionActionName = 'mention.get';
 export type ReactionActionName = 'reaction.add' | 'reaction.remove' | 'reaction.list';
 export type FileActionName = 'file.send.channel' | 'file.send.user';
@@ -11,10 +17,12 @@ export type RoleActionName = 'role.list' | 'role.create' | 'role.update' | 'role
 export type MeActionName = 'me.info' | 'me.guilds' | 'me.threads' | 'me.friends';
 export type RequestActionName = 'request.friend' | 'request.guild';
 export type UserActionName = 'user.info';
-export type MediaActionName = 'media.upload' | 'media.send.channel' | 'media.send.user';
+export type MediaActionName = 'media.upload' | 'media.send.channel' | 'media.send.user' | 'media.send';
+export type InteractionActionName = 'interaction.ack';
+export type ConnectionActionName = 'connection.status';
 export type HistoryActionName = 'history.list';
 export type PermissionActionName = 'permission.get' | 'permission.set';
-export type StandardActionName = MessageActionName | MentionActionName | ReactionActionName | FileActionName | MemberActionName | GuildActionName | ChannelActionName | RoleActionName | MeActionName | RequestActionName | UserActionName | MediaActionName | HistoryActionName | PermissionActionName;
+export type StandardActionName = MessageActionName | MentionActionName | ReactionActionName | FileActionName | MemberActionName | GuildActionName | ChannelActionName | RoleActionName | MeActionName | RequestActionName | UserActionName | MediaActionName | InteractionActionName | ConnectionActionName | HistoryActionName | PermissionActionName;
 export type ActionMessageSend = {
     action: 'message.send';
     payload: {
@@ -28,6 +36,7 @@ export type ActionMessageSendChannel = {
     action: 'message.send.channel';
     payload: {
         ChannelId: string;
+        BotId?: string;
         params: {
             format?: DataEnums[];
         };
@@ -37,8 +46,19 @@ export type ActionMessageSendUser = {
     action: 'message.send.user';
     payload: {
         UserId: string;
+        BotId?: string;
+        params: {
+            format?: DataEnums[];
+        };
+    };
+};
+export type ActionMessageSendTarget = {
+    action: 'message.send.target';
+    payload: {
+        target: ActionTarget;
         params: {
             format?: DataEnums[];
+            replyId?: string;
         };
     };
 };
@@ -53,9 +73,26 @@ export type ActionMessageDelete = {
     payload: {
         MessageId: string;
         ChannelId?: string;
+        target?: ActionTarget;
         event?: any;
     };
 };
+export type ActionInteractionAck = {
+    action: 'interaction.ack';
+    payload: {
+        InteractionId: string;
+        target?: ActionTarget;
+        params?: {
+            code?: number;
+        };
+    };
+};
+export type ActionConnectionStatus = {
+    action: 'connection.status';
+    payload: {
+        BotId?: string;
+    };
+};
 export type ActionMessageEdit = {
     action: 'message.edit';
     payload: {
@@ -407,39 +444,43 @@ export type ActionUserInfo = {
         UserId: string;
     };
 };
+export type ActionMediaParams = {
+    type: 'image' | 'audio' | 'video' | 'file';
+    url?: string;
+    data?: string;
+    filePath?: string;
+    fileId?: string;
+    name?: string;
+    content?: string;
+};
 export type ActionMediaUpload = {
     action: 'media.upload';
     payload: {
-        params: {
-            type: 'image' | 'audio' | 'video' | 'file';
-            url?: string;
-            data?: string;
-            name?: string;
-        };
+        target?: ActionTarget;
+        params: ActionMediaParams;
     };
 };
 export type ActionMediaSendChannel = {
     action: 'media.send.channel';
     payload: {
         ChannelId: string;
-        params: {
-            type: 'image' | 'audio' | 'video' | 'file';
-            url?: string;
-            data?: string;
-            name?: string;
-        };
+        BotId?: string;
+        params: ActionMediaParams;
     };
 };
 export type ActionMediaSendUser = {
     action: 'media.send.user';
     payload: {
         UserId: string;
-        params: {
-            type: 'image' | 'audio' | 'video' | 'file';
-            url?: string;
-            data?: string;
-            name?: string;
-        };
+        BotId?: string;
+        params: ActionMediaParams;
+    };
+};
+export type ActionMediaSend = {
+    action: 'media.send';
+    payload: {
+        target: ActionTarget;
+        params: ActionMediaParams;
     };
 };
 export type ActionHistoryList = {
@@ -507,7 +548,7 @@ type base = {
     actionId?: string;
     DeviceId?: string;
 };
-export type Actions = (ActionMessageSend | ActionMessageSendChannel | ActionMessageSendUser | ActionMessageDelete | ActionMessageEdit | ActionMessagePin | ActionMessageUnpin | ActionMentionGet | ActionReactionAdd | ActionReactionRemove | ActionFileSendChannel | ActionFileSendUser | ActionMessageForwardUser | ActionMessageForwardChannel | ActionMessageIntent | ActionMemberInfo | ActionMemberList | ActionMemberKick | ActionMemberBan | ActionMemberUnban | ActionGuildInfo | ActionGuildList | ActionChannelInfo | ActionChannelList | ActionChannelCreate | ActionChannelUpdate | ActionChannelDelete | ActionRoleList | ActionRoleCreate | ActionRoleUpdate | ActionRoleDelete | ActionRoleAssign | ActionRoleRemove | ActionMeInfo | ActionMeGuilds | ActionMeThreads | ActionMeFriends | ActionMessageGet | ActionGuildUpdate | ActionGuildLeave | ActionGuildMute | ActionMemberMute | ActionMemberAdmin | ActionMemberCard | ActionMemberTitle | ActionRequestFriend | ActionRequestGuild | ActionUserInfo | ActionMediaUpload | ActionMediaSendChannel | ActionMediaSendUser | ActionHistoryList | ActionPermissionGet | ActionPermissionSet | ActionReactionList | ActionMemberSearch | ActionChannelAnnounce | {
+export type Actions = (ActionMessageSend | ActionMessageSendChannel | ActionMessageSendUser | ActionMessageSendTarget | ActionMessageDelete | ActionInteractionAck | ActionConnectionStatus | ActionMessageEdit | ActionMessagePin | ActionMessageUnpin | ActionMentionGet | ActionReactionAdd | ActionReactionRemove | ActionFileSendChannel | ActionFileSendUser | ActionMessageForwardUser | ActionMessageForwardChannel | ActionMessageIntent | ActionMemberInfo | ActionMemberList | ActionMemberKick | ActionMemberBan | ActionMemberUnban | ActionGuildInfo | ActionGuildList | ActionChannelInfo | ActionChannelList | ActionChannelCreate | ActionChannelUpdate | ActionChannelDelete | ActionRoleList | ActionRoleCreate | ActionRoleUpdate | ActionRoleDelete | ActionRoleAssign | ActionRoleRemove | ActionMeInfo | ActionMeGuilds | ActionMeThreads | ActionMeFriends | ActionMessageGet | ActionGuildUpdate | ActionGuildLeave | ActionGuildMute | ActionMemberMute | ActionMemberAdmin | ActionMemberCard | ActionMemberTitle | ActionRequestFriend | ActionRequestGuild | ActionUserInfo | ActionMediaUpload | ActionMediaSendChannel | ActionMediaSendUser | ActionMediaSend | ActionHistoryList | ActionPermissionGet | ActionPermissionSet | ActionReactionList | ActionMemberSearch | ActionChannelAnnounce | {
     action: string;
     payload: object;
 }) & base;

package/lib/types/connection.d.ts

@@ -0,0 +1,15 @@
+export type ConnectionState = 'idle' | 'connecting' | 'ready' | 'reconnecting' | 'offline' | 'stopped';
+export type ConnectionBotStatus = {
+    BotId: string;
+    state: ConnectionState;
+    transport?: string | null;
+    reconnectAttempts?: number;
+    heartbeatAcknowledged?: boolean;
+    resumed?: boolean;
+    lastError?: string;
+};
+export type ConnectionStatus = {
+    Platform?: string;
+    state: ConnectionState;
+    bots: ConnectionBotStatus[];
+};

package/lib/types/connection.js

@@ -0,0 +1 @@
+

package/lib/types/event/base/interaction.d.ts

@@ -0,0 +1,6 @@
+export type Interaction = {
+    InteractionId: string;
+    InteractionData?: string;
+    Target?: ActionTarget;
+};
+import type { ActionTarget } from '../../actions';

package/lib/types/event/base/interaction.js

@@ -0,0 +1 @@
+

package/lib/types/event/builder.d.ts

@@ -3,8 +3,9 @@ import { Message, MessageText, MessageMedia, MessageOpen } from './base/message'
 import { Platform } from './base/platform';
 import { User } from './base/user';
 import { AutoFields } from './base/auto';
+import { Interaction } from './base/interaction';
 import { EventKeys, Events } from './map';
-export type ReservedEventKeys = keyof Guild | keyof Channel | keyof User | keyof Message | keyof MessageText | keyof MessageMedia | keyof MessageOpen | keyof Platform | keyof AutoFields | 'name' | 'Timestamp';
+export type ReservedEventKeys = keyof Guild | keyof Channel | keyof User | keyof Message | keyof MessageText | keyof MessageMedia | keyof MessageOpen | keyof Platform | keyof Interaction | keyof AutoFields | 'name' | 'Timestamp';
 type GuildMethods<T extends EventKeys> = Events[T] extends Guild ? {
     addGuild(params: Guild): EventBuilder<T>;
 } : Record<string, never>;
@@ -26,11 +27,14 @@ type MediaMethods<T extends EventKeys> = Events[T] extends MessageMedia ? {
 type OpenMethods<T extends EventKeys> = Events[T] extends MessageOpen ? {
     addOpen(params: MessageOpen): EventBuilder<T>;
 } : Record<string, never>;
+type InteractionMethods<T extends EventKeys> = Events[T] extends Interaction ? {
+    addInteraction(params: Interaction): EventBuilder<T>;
+} : Record<string, never>;
 export type EventBuilder<T extends EventKeys> = {
     addPlatform(params: Platform): EventBuilder<T>;
     add<E extends Record<string, unknown>>(fields: {
         [K in keyof E]: K extends ReservedEventKeys ? never : E[K];
     }): EventBuilder<T>;
     readonly value: Events[T];
-} & GuildMethods<T> & ChannelMethods<T> & UserMethods<T> & MessageMethods<T> & TextMethods<T> & MediaMethods<T> & OpenMethods<T>;
+} & GuildMethods<T> & ChannelMethods<T> & UserMethods<T> & MessageMethods<T> & TextMethods<T> & MediaMethods<T> & OpenMethods<T> & InteractionMethods<T>;
 export {};

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

@@ -2,10 +2,11 @@ import { Guild, Channel } from '../base/guild';
 import { Message, MessageOpen, MessageText } from '../base/message';
 import { User } from '../base/user';
 import { Platform } from '../base/platform';
+import { Interaction } from '../base/interaction';
 import { Expansion } from '../base/expansion';
-export type PrivateEventInteractionCreate = MessageText & MessageOpen & Platform & Message & User & {
+export type PrivateEventInteractionCreate = MessageText & Interaction & MessageOpen & Platform & Message & User & {
     name: 'private.interaction.create';
 } & Expansion;
-export type PublicEventInteractionCreate = MessageText & MessageOpen & Platform & Guild & Channel & Message & User & {
+export type PublicEventInteractionCreate = MessageText & Interaction & MessageOpen & Platform & Guild & Channel & Message & User & {
     name: 'interaction.create';
 } & Expansion;

package/lib/types/index.d.ts

@@ -5,6 +5,7 @@ export * from './event/base/message';
 export * from './event/base/platform';
 export * from './event/base/user';
 export * from './event/base/auto';
+export * from './event/base/interaction';
 export * from './event/channel/index';
 export * from './event/guild/index';
 export * from './event/interaction/index';
@@ -28,5 +29,6 @@ export * from './subscribe';
 export * from './schedule';
 export * from './standard';
 export * from './actions';
+export * from './connection';
 export * from './apis';
 export * from './run';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alemonjs",
-  "version": "2.1.93",
+  "version": "2.1.95",
   "description": "bot script",
   "author": "lemonade",
   "license": "MIT",
@@ -87,5 +87,5 @@
     "type": "git",
     "url": "https://github.com/lemonade-lab/alemonjs.git"
   },
-  "gitHead": "f3222b96dcdca984ec726cdd26d759952ca9c705"
+  "gitHead": "ebea3f64e13a92c671a0ecd8af856c17ca44846d"
 }