alemonjs 2.1.48 → 2.1.49

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

@@ -4,6 +4,7 @@ import { createResult } from '../core/utils.js';
 import { sendAction } from '../cbp/processor/actions.js';
 import { sendAPI } from '../cbp/processor/api.js';
 import { Format } from './message-format.js';
+import { getCurrentEvent } from './hook-event-context.js';
 
 const useMention = (event) => {
     if (!event || typeof event !== 'object') {
@@ -94,7 +95,8 @@ const useMention = (event) => {
     return [mention];
 };
 const useMessage = (event) => {
-    if (!event || typeof event !== 'object') {
+    const currentEvent = (event ?? getCurrentEvent());
+    if (!currentEvent || typeof currentEvent !== 'object') {
         logger.error({
             code: ResultCode.FailParams,
             message: 'Invalid event: event must be an object',
@@ -102,6 +104,7 @@ const useMessage = (event) => {
         });
         throw new Error('Invalid event: event must be an object');
     }
+    const valueEvent = currentEvent;
     const resolveFormat = (params) => {
         if (params.format instanceof Format) {
             return params.format.value;
@@ -115,7 +118,7 @@ const useMessage = (event) => {
         const result = await sendAction({
             action: 'message.send',
             payload: {
-                event,
+                event: valueEvent,
                 params: {
                     format: val,
                     replyId
@@ -129,17 +132,17 @@ const useMessage = (event) => {
             if (Array.isArray(params)) {
                 return sendRaw(params.length > 0 ? params : []);
             }
-            return sendRaw(resolveFormat(params), params?.replyId ?? event.MessageId);
+            return sendRaw(resolveFormat(params), params?.replyId ?? valueEvent.MessageId);
         },
         async delete(params) {
-            const targetId = params?.messageId || event.MessageId;
+            const targetId = params?.messageId || valueEvent.MessageId;
             if (!targetId) {
                 return createResult(ResultCode.FailParams, 'Missing MessageId', null);
             }
             try {
                 const results = await sendAction({
                     action: 'message.delete',
-                    payload: { MessageId: targetId, ChannelId: event.ChannelId, event }
+                    payload: { MessageId: targetId, ChannelId: valueEvent.ChannelId, event: valueEvent }
                 });
                 const result = results.find(item => item.code === ResultCode.Ok);
                 return result || createResult(ResultCode.Warn, 'Delete not supported or failed', null);
@@ -149,8 +152,8 @@ const useMessage = (event) => {
             }
         },
         async edit(params) {
-            const targetId = params.messageId || event.MessageId;
-            const channelId = event.ChannelId;
+            const targetId = params.messageId || valueEvent.MessageId;
+            const channelId = valueEvent.ChannelId;
             if (!targetId || !channelId) {
                 return createResult(ResultCode.FailParams, 'Missing MessageId or ChannelId', null);
             }
@@ -158,7 +161,7 @@ const useMessage = (event) => {
                 const val = params.format instanceof Format ? params.format.value : params.format;
                 const results = await sendAction({
                     action: 'message.edit',
-                    payload: { ChannelId: channelId, MessageId: targetId, params: { format: val }, event }
+                    payload: { ChannelId: channelId, MessageId: targetId, params: { format: val }, event: valueEvent }
                 });
                 const result = results.find(item => item.code === ResultCode.Ok);
                 return result || createResult(ResultCode.Warn, 'Edit not supported or failed', null);
@@ -168,8 +171,8 @@ const useMessage = (event) => {
             }
         },
         async pin(params) {
-            const targetId = params?.messageId || event.MessageId;
-            const channelId = event.ChannelId;
+            const targetId = params?.messageId || valueEvent.MessageId;
+            const channelId = valueEvent.ChannelId;
             if (!targetId || !channelId) {
                 return createResult(ResultCode.FailParams, 'Missing MessageId or ChannelId', null);
             }
@@ -186,8 +189,8 @@ const useMessage = (event) => {
             }
         },
         async unpin(params) {
-            const targetId = params?.messageId || event.MessageId;
-            const channelId = event.ChannelId;
+            const targetId = params?.messageId || valueEvent.MessageId;
+            const channelId = valueEvent.ChannelId;
             if (!targetId || !channelId) {
                 return createResult(ResultCode.FailParams, 'Missing MessageId or ChannelId', null);
             }
@@ -204,7 +207,7 @@ const useMessage = (event) => {
             }
         },
         async get(params) {
-            const targetId = params?.messageId || event.MessageId;
+            const targetId = params?.messageId || valueEvent.MessageId;
             if (!targetId) {
                 return createResult(ResultCode.FailParams, 'Missing MessageId', null);
             }

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

@@ -1,32 +1,73 @@
 import { EventCycleEnum, Current, Events, EventKeys } from '../types';
-export declare const useSubscribe: <T extends EventKeys>(event: Events[T], selects: T | T[]) => readonly [{
-    create: (callback: Current<T>, keys: (keyof Events[T])[]) => {
+export declare function useSubscribe<T extends EventKeys>(selects: T | T[]): readonly [
+    {
+        create: (callback: Current<T>, keys: (keyof Events[T])[]) => {
+            id: string;
+            selects: T[];
+            choose: EventCycleEnum;
+        };
+        mount: (callback: Current<T>, keys: (keyof Events[T])[]) => {
+            id: string;
+            selects: T[];
+            choose: EventCycleEnum;
+        };
+        unmount: (callback: Current<T>, keys: (keyof Events[T])[]) => {
+            id: string;
+            selects: T[];
+            choose: EventCycleEnum;
+        };
+        cancel: (value: {
+            id: string;
+            selects: T[];
+            choose: EventCycleEnum;
+        }) => void;
+    }
+];
+export declare function useSubscribe<T extends EventKeys>(event: Events[T] | undefined, selects: T | T[]): readonly [
+    {
+        create: (callback: Current<T>, keys: (keyof Events[T])[]) => {
+            id: string;
+            selects: T[];
+            choose: EventCycleEnum;
+        };
+        mount: (callback: Current<T>, keys: (keyof Events[T])[]) => {
+            id: string;
+            selects: T[];
+            choose: EventCycleEnum;
+        };
+        unmount: (callback: Current<T>, keys: (keyof Events[T])[]) => {
+            id: string;
+            selects: T[];
+            choose: EventCycleEnum;
+        };
+        cancel: (value: {
+            id: string;
+            selects: T[];
+            choose: EventCycleEnum;
+        }) => void;
+    }
+];
+export declare function useObserver<T extends EventKeys>(selects: T | T[]): readonly [
+    (callback: Current<T>, keys: (keyof Events[T])[]) => {
+        id: string;
         selects: T[];
         choose: EventCycleEnum;
+    },
+    (value: {
         id: string;
-    };
-    mount: (callback: Current<T>, keys: (keyof Events[T])[]) => {
         selects: T[];
         choose: EventCycleEnum;
+    }) => void
+];
+export declare function useObserver<T extends EventKeys>(event: Events[T] | undefined, selects: T | T[]): readonly [
+    (callback: Current<T>, keys: (keyof Events[T])[]) => {
         id: string;
-    };
-    unmount: (callback: Current<T>, keys: (keyof Events[T])[]) => {
         selects: T[];
         choose: EventCycleEnum;
-        id: string;
-    };
-    cancel: (value: {
+    },
+    (value: {
         id: string;
         selects: T[];
         choose: EventCycleEnum;
-    }) => void;
-}];
-export declare const useObserver: <T extends EventKeys>(event: Events[T], selects: T | T[]) => readonly [(callback: Current<T>, keys: (keyof Events[T])[]) => {
-    selects: T[];
-    choose: EventCycleEnum;
-    id: string;
-}, (value: {
-    id: string;
-    selects: T[];
-    choose: EventCycleEnum;
-}) => void];
+    }) => void
+];

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

@@ -1,9 +1,13 @@
 import { ResultCode } from '../core/variable.js';
 import { SubscribeList } from './store.js';
 import { SubscribeStatus } from './config.js';
+import { getCurrentEvent } from './hook-event-context.js';
 
-const useSubscribe = (event, selects) => {
-    if (typeof event !== 'object') {
+function useSubscribe(eventOrSelects, maybeSelects) {
+    const selects = (maybeSelects === undefined ? eventOrSelects : maybeSelects);
+    const event = (maybeSelects === undefined ? undefined : eventOrSelects);
+    const valueEvent = event ?? getCurrentEvent();
+    if (typeof valueEvent !== 'object' || valueEvent === null) {
         logger.error({
             code: ResultCode.FailParams,
             message: 'event is not object',
@@ -34,8 +38,8 @@ const useSubscribe = (event, selects) => {
             const subList = new SubscribeList(choose, select);
             const values = {};
             for (const key of keys) {
-                if (typeof key === 'string' && (typeof event[key] === 'string' || typeof event[key] === 'number' || typeof event[key] === 'boolean')) {
-                    values[key] = event[key];
+                if (typeof key === 'string' && (typeof valueEvent[key] === 'string' || typeof valueEvent[key] === 'number' || typeof valueEvent[key] === 'boolean')) {
+                    values[key] = valueEvent[key];
                 }
                 else {
                     logger.warn({
@@ -89,10 +93,20 @@ const useSubscribe = (event, selects) => {
         cancel
     };
     return [subscribe];
-};
-const useObserver = (event, selects) => {
+}
+function useObserver(eventOrSelects, maybeSelects) {
+    const selects = (maybeSelects === undefined ? eventOrSelects : maybeSelects);
+    const event = (maybeSelects === undefined ? undefined : eventOrSelects);
+    if (selects === undefined) {
+        logger.error({
+            code: ResultCode.FailParams,
+            message: 'select is not string or array',
+            data: null
+        });
+        throw new Error('select is not string or array');
+    }
     const [subscribe] = useSubscribe(event, selects);
     return [subscribe.mount, subscribe.cancel];
-};
+}
 
 export { useObserver, useSubscribe };

package/lib/app/index.d.ts

@@ -13,8 +13,9 @@ export * from './event-processor-cycle.js';
 export * from './event-processor-event.js';
 export * from './event-processor-middleware.js';
 export * from './event-processor-subscribe.js';
-export * from './hook-use-api.js';
-export * from './hook-use-state.js';
+export * from './hook-use/index.js';
+export * from './hook-event-context.js';
+export * from './event-utils.js';
 export * from './hook-use-subscribe.js';
 export * from './message-api.js';
 export * from './message-format.js';

package/lib/app/index.js

@@ -14,9 +14,24 @@ export { expendCycle } from './event-processor-cycle.js';
 export { expendEvent } from './event-processor-event.js';
 export { expendMiddleware } from './event-processor-middleware.js';
 export { expendSubscribe, expendSubscribeCreate, expendSubscribeMount, expendSubscribeUnmount } from './event-processor-subscribe.js';
-export { createSelects, onSelects, unChildren, useAnnounce, useChannel, useClient, useGuild, useHistory, useMe, useMedia, useMember, useMention, useMessage, usePermission, useReaction, useRequest, useRole, useSend, useSends, useUser } from './hook-use-api.js';
-export { onState, unState, useState } from './hook-use-state.js';
+export { useAnnounce } from './hook-use/announce.js';
+export { useChannel } from './hook-use/channel.js';
+export { useClient } from './hook-use/client.js';
+export { useGuild } from './hook-use/guild.js';
+export { useHistory } from './hook-use/history.js';
+export { useMedia } from './hook-use/media.js';
+export { useMe } from './hook-use/me.js';
+export { useMember } from './hook-use/member.js';
+export { useMention } from './hook-use/mention.js';
+export { useMessage, useSend, useSends } from './hook-use/message.js';
+export { usePermission } from './hook-use/permission.js';
+export { useReaction } from './hook-use/reaction.js';
+export { useRequest } from './hook-use/request.js';
+export { useRole } from './hook-use/role.js';
+export { useUser } from './hook-use/user.js';
+export { getCurrentEvent, withEventContext } from './hook-event-context.js';
+export { createEventValue, createSelects, onSelects, onState, unChildren, unState, useState } from './event-utils.js';
 export { useObserver, useSubscribe } from './hook-use-subscribe.js';
-export { MessageDirect, createDataFormat, createEventValue, format, getMessageIntent, sendToChannel, sendToUser } from './message-api.js';
+export { MessageDirect, createDataFormat, format, getMessageIntent, sendToChannel, sendToUser } from './message-api.js';
 export { Format, FormatButtonGroup, FormatMarkDown, createEvent } from './message-format.js';
 export { Attachment, Audio, BT, Button, Image, ImageFile, ImageURL, Link, MD, Markdown, MarkdownOriginal, Mention, Text, Video } from './message-format-old.js';

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

@@ -1,12 +1,6 @@
 import { DataEnums, OnDataFormatFunc } from '../types';
 import { Result } from '../core';
 import { Format } from './message-format';
-type BaseMap = {
-    [key: string]: unknown;
-};
-export declare const createEventValue: <T extends keyof R, R extends BaseMap>(event: {
-    value: R[T];
-}) => R[T];
 export declare const format: OnDataFormatFunc;
 export declare const createDataFormat: OnDataFormatFunc;
 export declare class MessageDirect {

package/lib/app/message-api.js

@@ -5,9 +5,6 @@ import 'path';
 import 'yaml';
 import { createResult } from '../core/utils.js';
 
-const createEventValue = (event) => {
-    return event.value;
-};
 const format = (...data) => {
     if (!data || data.length === 0) {
         logger.error({
@@ -111,4 +108,4 @@ const getMessageIntent = async () => {
     return createResult(ResultCode.Ok, '获取成功', results[0]?.data ?? null);
 };
 
-export { MessageDirect, createDataFormat, createEventValue, format, getMessageIntent, sendToChannel, sendToUser };
+export { MessageDirect, createDataFormat, format, getMessageIntent, sendToChannel, sendToUser };

package/lib/app/message-format.js

@@ -1,4 +1,4 @@
-import { BT, MD, Text, Image, Mention, MarkdownOriginal, Attachment, Audio, Video, Link, ImageFile, ImageURL } from './message-format-old.js';
+import { Text, Image, Mention, BT, MD, MarkdownOriginal, Attachment, Audio, Video, Link, ImageFile, ImageURL } from './message-format-old.js';
 export { Button, Markdown } from './message-format-old.js';
 
 class FormatButtonGroup {

package/lib/cbp/connects/client.js

@@ -13,12 +13,13 @@ import '../../app/event-middleware.js';
 import { onProcessor } from '../../app/event-processor.js';
 import '../../app/event-response.js';
 import { createResult } from '../../core/utils.js';
-import '../../app/hook-use-api.js';
-import '../../app/message-api.js';
-import '../../app/message-format-old.js';
+import '../../app/hook-event-context.js';
+import '../../app/event-utils.js';
 import { apiResolves, apiTimeouts, actionResolves, actionTimeouts, FULL_RECEIVE_HEADER } from '../processor/config.js';
-import { createWSConnector } from './base.js';
 import { setDirectSend } from '../processor/transport.js';
+import '../../app/message-format-old.js';
+import '../../app/message-api.js';
+import { createWSConnector } from './base.js';
 import { createDirectServer } from '../../process/direct-channel.js';
 
 const handleParsedMessage = (parsedMessage) => {

package/lib/client.js

@@ -26,9 +26,10 @@ import './app/event-group.js';
 import './app/event-middleware.js';
 import './app/event-processor.js';
 import './app/event-response.js';
-import './app/hook-use-api.js';
-import './app/message-api.js';
+import './app/hook-event-context.js';
+import './app/event-utils.js';
 import './app/message-format-old.js';
+import './app/message-api.js';
 import './process/platform.js';
 import './process/module.js';
 import { createServer } from './server/main.js';

package/lib/index.js

@@ -21,10 +21,25 @@ export { expendCycle } from './app/event-processor-cycle.js';
 export { expendEvent } from './app/event-processor-event.js';
 export { expendMiddleware } from './app/event-processor-middleware.js';
 export { expendSubscribe, expendSubscribeCreate, expendSubscribeMount, expendSubscribeUnmount } from './app/event-processor-subscribe.js';
-export { createSelects, onSelects, unChildren, useAnnounce, useChannel, useClient, useGuild, useHistory, useMe, useMedia, useMember, useMention, useMessage, usePermission, useReaction, useRequest, useRole, useSend, useSends, useUser } from './app/hook-use-api.js';
-export { onState, unState, useState } from './app/hook-use-state.js';
+export { useAnnounce } from './app/hook-use/announce.js';
+export { useChannel } from './app/hook-use/channel.js';
+export { useClient } from './app/hook-use/client.js';
+export { useGuild } from './app/hook-use/guild.js';
+export { useHistory } from './app/hook-use/history.js';
+export { useMedia } from './app/hook-use/media.js';
+export { useMe } from './app/hook-use/me.js';
+export { useMember } from './app/hook-use/member.js';
+export { useMention } from './app/hook-use/mention.js';
+export { useMessage, useSend, useSends } from './app/hook-use/message.js';
+export { usePermission } from './app/hook-use/permission.js';
+export { useReaction } from './app/hook-use/reaction.js';
+export { useRequest } from './app/hook-use/request.js';
+export { useRole } from './app/hook-use/role.js';
+export { useUser } from './app/hook-use/user.js';
+export { getCurrentEvent, withEventContext } from './app/hook-event-context.js';
+export { createEventValue, createSelects, onSelects, onState, unChildren, unState, useState } from './app/event-utils.js';
 export { useObserver, useSubscribe } from './app/hook-use-subscribe.js';
-export { MessageDirect, createDataFormat, createEventValue, format, getMessageIntent, sendToChannel, sendToUser } from './app/message-api.js';
+export { MessageDirect, createDataFormat, format, getMessageIntent, sendToChannel, sendToUser } from './app/message-api.js';
 export { Format, FormatButtonGroup, FormatMarkDown, createEvent } from './app/message-format.js';
 export { start } from './main.js';
 export { Attachment, Audio, BT, Button, Image, ImageFile, ImageURL, Link, MD, Markdown, MarkdownOriginal, Mention, Text, Video } from './app/message-format-old.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alemonjs",
-  "version": "2.1.48",
+  "version": "2.1.49",
   "description": "bot script",
   "author": "lemonade",
   "license": "MIT",
@@ -69,5 +69,5 @@
     "type": "git",
     "url": "https://github.com/lemonade-lab/alemonjs.git"
   },
-  "gitHead": "e50477125586204c6e56a8ecfe3391136f5fe74b"
-}
+  "gitHead": "c6aa5616afe091a37610dad22fbb2d2618d943b8"
+}

package/LICENSE

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2013-present, Yuxi (Evan) You
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIdED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.