alemonjs 2.1.11 → 2.1.13

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

@@ -1,5 +1,6 @@
 import { DataEnums, EventKeys, Events, User } from '../types';
 import { Result } from '../core/utils';
+import { BT, MD } from './message-format';
 type Options = {
     UserId?: string;
     UserKey?: string;
@@ -12,17 +13,40 @@ export declare const useMention: <T extends EventKeys>(event: Events[T]) => [{
     findOne: (options?: Options) => Promise<Result<User | null>>;
 }];
 export declare const useMessage: <T extends EventKeys>(event: Events[T]) => readonly [{
-    send: (val: DataEnums[]) => Promise<Result[]>;
+    "__#7@#format": DataEnums[];
+    readonly currentFormat: DataEnums[];
+    addText(val: string, options?: {
+        style?: "none" | "bold" | "block" | "strikethrough" | "boldItalic" | "italic";
+    }): any;
+    addLink(val: string, options?: {
+        style?: "none" | "bold" | "block" | "strikethrough" | "boldItalic" | "italic";
+    }): any;
+    addImage(val: Buffer<ArrayBufferLike>): any;
+    addImageFile(val: string): any;
+    addImageURL(val: string): any;
+    addMention(UserId?: string, options?: {
+        belong?: "user" | "guild" | "channel" | "everyone";
+        payload?: User | import("..").Guild | import("..").Channel | "everyone";
+    }): any;
+    addButtonGroup(...args: Parameters<typeof BT.group>): any;
+    addButtonTemplate(templateId: string): any;
+    addMarkdown(...args: Parameters<typeof MD>): any;
+    addMarkdownTemplate(templateId: string, params?: {
+        [key: string]: string;
+    }): any;
+    addFormat(val: DataEnums[]): any;
+    clear(): any;
+    send(val?: DataEnums[]): Promise<Result[]>;
 }];
-export declare const useMenber: <T extends EventKeys>(event: Events[T]) => readonly [{}];
+export declare const useMember: <T extends EventKeys>(event: Events[T]) => readonly [{}];
 export declare const useChannel: <T extends EventKeys>(event: Events[T]) => readonly [{}];
 export declare const useSend: <T extends EventKeys>(event: Events[T]) => (...val: DataEnums[]) => Promise<Result[]>;
-export declare const useSends: <T extends EventKeys>(event: Events[T]) => readonly [(val: DataEnums[]) => Promise<Result[]>];
+export declare const useSends: <T extends EventKeys>(event: Events[T]) => readonly [(val?: DataEnums[]) => Promise<Result[]>];
 export declare const unChildren: (name?: string) => void;
 export declare const onSelects: <T extends EventKeys[] | EventKeys>(values: T) => T;
 export declare const createSelects: <T extends EventKeys[] | EventKeys>(values: T) => T;
 export declare const useClient: <T extends object>(event: any, _ApiClass: new (...args: any[]) => T) => readonly [T];
 export declare const useMe: () => readonly [{
-    info: () => Promise<Result<any>>;
+    info: () => Promise<Result<User | null>>;
 }];
 export {};

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

@@ -3,6 +3,7 @@ import { ChildrenApp } from './store.js';
 import { createResult } from '../core/utils.js';
 import { sendAction } from '../cbp/processor/actions.js';
 import { sendAPI } from '../cbp/processor/api.js';
+import { Text, Link, Image, ImageFile, ImageURL, Mention, BT, MD } from './message-format.js';
 
 const useMention = (event) => {
     if (!event || typeof event !== 'object') {
@@ -130,12 +131,67 @@ const useMessage = (event) => {
         });
         return Array.isArray(result) ? result : [result];
     };
-    const message = {
-        send
-    };
-    return [message];
+    class MessageController {
+        #format = [];
+        get currentFormat() {
+            return this.#format;
+        }
+        addText(...args) {
+            this.#format.push(Text(...args));
+            return this;
+        }
+        addLink(...args) {
+            this.#format.push(Link(...args));
+            return this;
+        }
+        addImage(...args) {
+            this.#format.push(Image(...args));
+            return this;
+        }
+        addImageFile(...args) {
+            this.#format.push(ImageFile(...args));
+            return this;
+        }
+        addImageURL(...args) {
+            this.#format.push(ImageURL(...args));
+            return this;
+        }
+        addMention(...args) {
+            this.#format.push(Mention(...args));
+            return this;
+        }
+        addButtonGroup(...args) {
+            this.#format.push(BT.group(...args));
+            return this;
+        }
+        addButtonTemplate(...args) {
+            this.#format.push(BT.template(...args));
+            return this;
+        }
+        addMarkdown(...args) {
+            this.#format.push(MD(...args));
+            return this;
+        }
+        addMarkdownTemplate(...args) {
+            this.#format.push(MD.template(...args));
+            return this;
+        }
+        addFormat(val) {
+            this.#format.push(...val);
+            return this;
+        }
+        clear() {
+            this.#format = [];
+            return this;
+        }
+        send(val) {
+            const dataToSend = val && val.length > 0 ? val : this.#format;
+            return send(dataToSend);
+        }
+    }
+    return [new MessageController()];
 };
-const useMenber = (event) => {
+const useMember = (event) => {
     if (!event || typeof event !== 'object') {
         logger.error({
             code: ResultCode.FailParams,
@@ -211,15 +267,13 @@ const useMe = () => {
             });
             const result = results.find(item => item.code === ResultCode.Ok);
             if (result) {
-                const data = result.data;
+                const data = result?.data ?? null;
                 return createResult(ResultCode.Ok, 'Successfully retrieved bot information', data);
             }
-            else {
-                return createResult(ResultCode.Warn, 'No bot information found', null);
-            }
+            return createResult(ResultCode.Warn, 'No bot information found', null);
         }
-        catch (err) {
-            return createResult(ResultCode.Fail, err?.message || 'Failed to get bot information', null);
+        catch {
+            return createResult(ResultCode.Fail, 'Failed to get bot information', null);
         }
     };
     const control = {
@@ -228,4 +282,4 @@ const useMe = () => {
     return [control];
 };
 
-export { createSelects, onSelects, unChildren, useChannel, useClient, useMe, useMenber, useMention, useMessage, useSend, useSends };
+export { createSelects, onSelects, unChildren, useChannel, useClient, useMe, useMember, useMention, useMessage, useSend, useSends };

package/lib/app/index.js

@@ -12,8 +12,8 @@ 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, useChannel, useClient, useMe, useMenber, useMention, useMessage, useSend, useSends } from './hook-use-api.js';
+export { createSelects, onSelects, unChildren, useChannel, useClient, useMe, useMember, useMention, useMessage, useSend, useSends } from './hook-use-api.js';
 export { onState, unState, useState } from './hook-use-state.js';
 export { useObserver, useSubscribe } from './hook-use-subscribe.js';
-export { createDataFormat, createEventValue, format, sendToChannel, sendToUser } from './message-api.js';
+export { createDataFormat, createEventValue, format, getMessageIntent, sendToChannel, sendToUser } from './message-api.js';
 export { Ark, BT, Image, ImageFile, ImageURL, Link, MD, Mention, Text } from './message-format.js';

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

@@ -1,12 +1,31 @@
 import { DataEnums, OnDataFormatFunc } from '../types';
+import { Result } from '../core';
 type BaseMap = {
-    [key: string]: any;
+    [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 const sendToChannel: (SpaceId: string, data: DataEnums[]) => Promise<import("..").Result[]>;
-export declare const sendToUser: (OpenID: string, data: DataEnums[]) => Promise<import("..").Result[]>;
+export declare const sendToChannel: (SpaceId: string, data: DataEnums[]) => Promise<Result[]>;
+export declare const sendToUser: (OpenID: string, data: DataEnums[]) => Promise<Result[]>;
+type IntentResult = {
+    [key: string]: boolean | number;
+    maxImageCount?: number;
+    maxImageSize?: number;
+    maxTextLength?: number;
+    maxMarkdownLength?: number;
+    allowMarkdownLink?: boolean;
+    allowMarkdownImage?: boolean;
+    allowMarkdownMention?: boolean;
+    maxFileCount?: number;
+    maxFileSize?: number;
+    maxVideoCount?: number;
+    maxVideoSize?: number;
+    allowButton?: boolean;
+    allowMixImageText?: boolean;
+    allowMixMarkdownButton?: boolean;
+};
+export declare const getMessageIntent: () => Promise<Result<IntentResult>>;
 export {};

package/lib/app/message-api.js

@@ -1,5 +1,9 @@
 import { ResultCode } from '../core/variable.js';
 import { sendAction } from '../cbp/processor/actions.js';
+import 'fs';
+import 'path';
+import 'yaml';
+import { createResult } from '../core/utils.js';
 
 const createEventValue = (event) => {
     return event.value;
@@ -55,5 +59,12 @@ const sendToUser = async (OpenID, data) => {
         }
     });
 };
+const getMessageIntent = async () => {
+    const results = await sendAction({
+        action: 'message.intent',
+        payload: {}
+    });
+    return createResult(ResultCode.Ok, '获取成功', results[0]?.data ?? null);
+};
 
-export { createDataFormat, createEventValue, format, sendToChannel, sendToUser };
+export { createDataFormat, createEventValue, format, getMessageIntent, sendToChannel, sendToUser };

package/lib/index.js

@@ -19,9 +19,9 @@ 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, useChannel, useClient, useMe, useMenber, useMention, useMessage, useSend, useSends } from './app/hook-use-api.js';
+export { createSelects, onSelects, unChildren, useChannel, useClient, useMe, useMember, useMention, useMessage, useSend, useSends } from './app/hook-use-api.js';
 export { onState, unState, useState } from './app/hook-use-state.js';
 export { useObserver, useSubscribe } from './app/hook-use-subscribe.js';
-export { createDataFormat, createEventValue, format, sendToChannel, sendToUser } from './app/message-api.js';
+export { createDataFormat, createEventValue, format, getMessageIntent, sendToChannel, sendToUser } from './app/message-api.js';
 export { Ark, BT, Image, ImageFile, ImageURL, Link, MD, Mention, Text } from './app/message-format.js';
 export { start } from './main.js';

package/lib/types/actions.d.ts

@@ -91,5 +91,8 @@ type base = {
     actionId?: string;
     DeviceId?: string;
 };
-export type Actions = (ActionMessageSend | ActionMentionGet | ActionMessageSendChannel | ActionMessageSendUser | ActionMessageDelete | ActionFileSendChannel | ActionFileSendUser | ActionMessageForwardUser | ActionMessageForwardChannel | ActionMeInfo) & base;
+export type Actions = (ActionMessageSend | ActionMentionGet | ActionMessageSendChannel | ActionMessageSendUser | ActionMessageDelete | ActionFileSendChannel | ActionFileSendUser | ActionMessageForwardUser | ActionMessageForwardChannel | ActionMeInfo | {
+    action: string;
+    payload: object;
+}) & base;
 export {};

package/lib/utils.d.ts

@@ -22,8 +22,12 @@ export declare const getPublicIP: (options?: Options & {
     force?: boolean;
 }) => Promise<string>;
 export declare class Regular extends RegExp {
-    static or(...regs: RegExp[]): Regular;
-    static and(...regs: RegExp[]): Regular;
-    or(...regs: RegExp[]): Regular;
-    and(...regs: RegExp[]): Regular;
+    static create(pattern: RegExp | string, flags?: string): Regular;
+    private static mergeFlags;
+    static or(...regulars: RegExp[]): Regular;
+    static and(...regulars: RegExp[]): Regular;
+    or(...regulars: RegExp[]): Regular;
+    and(...regulars: RegExp[]): Regular;
+    withFlags(flags: 'i' | 'g' | 'm' | 's' | 'u' | 'y'): Regular;
+    withoutFlags(flagsToRemove: 'i' | 'g' | 'm' | 's' | 'u' | 'y'): Regular;
 }

package/lib/utils.js

@@ -137,17 +137,45 @@ const getPublicIP = async (options = {}) => {
     });
 };
 class Regular extends RegExp {
-    static or(...regs) {
-        return new Regular(`(${regs.map(reg => reg.source).join('|')})`, regs.map(reg => reg.flags).join(''));
+    static create(pattern, flags) {
+        return new Regular(pattern, flags);
+    }
+    static mergeFlags(...flags) {
+        const flagSet = new Set();
+        for (const flagStr of flags) {
+            for (const char of flagStr) {
+                flagSet.add(char);
+            }
+        }
+        return Array.from(flagSet).sort().join('');
+    }
+    static or(...regulars) {
+        const source = regulars.map(reg => `(?:${reg.source})`).join('|');
+        const flags = Regular.mergeFlags(...regulars.map(reg => reg.flags));
+        return new Regular(`(?:${source})`, flags);
     }
-    static and(...regs) {
-        return new Regular(regs.map(reg => `(?=${reg.source})`).join('') + '.*', regs.map(reg => reg.flags).join(''));
+    static and(...regulars) {
+        const lookAHeads = regulars.map(reg => `(?=.*${reg.source})`).join('');
+        const flags = Regular.mergeFlags(...regulars.map(reg => reg.flags));
+        return new Regular(`${lookAHeads}.*`, flags);
     }
-    or(...regs) {
-        return Regular.or(this, ...regs);
+    or(...regulars) {
+        return Regular.or(this, ...regulars);
     }
-    and(...regs) {
-        return Regular.and(this, ...regs);
+    and(...regulars) {
+        return Regular.and(this, ...regulars);
+    }
+    withFlags(flags) {
+        const mergedFlags = Regular.mergeFlags(this.flags, flags);
+        return new Regular(this.source, mergedFlags);
+    }
+    withoutFlags(flagsToRemove) {
+        const currentFlagsSet = new Set(this.flags);
+        for (const char of flagsToRemove) {
+            currentFlagsSet.delete(char);
+        }
+        const newFlags = Array.from(currentFlagsSet).sort().join('');
+        return new Regular(this.source, newFlags);
     }
 }
 

package/package.json

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