alemonjs 2.1.41 → 2.1.43

package/lib/app/message-format.old.js

@@ -0,0 +1,217 @@
+const Text = (val, options) => {
+    return {
+        type: 'Text',
+        value: val,
+        options
+    };
+};
+const Link = (val, options) => {
+    return {
+        type: 'Text',
+        value: val,
+        options
+    };
+};
+const ImageURL = (val) => {
+    return {
+        type: 'ImageURL',
+        value: val
+    };
+};
+const ImageFile = (val) => {
+    return {
+        type: 'ImageFile',
+        value: val
+    };
+};
+const Image = (val) => {
+    return {
+        type: 'Image',
+        value: val.toString('base64')
+    };
+};
+Image.url = ImageURL;
+Image.file = ImageFile;
+const Mention = (UserId, options) => {
+    return {
+        type: 'Mention',
+        value: UserId,
+        options: options ?? {
+            belong: 'user'
+        }
+    };
+};
+const BT = (title, data, options) => {
+    return {
+        type: 'Button',
+        value: title,
+        options: {
+            data,
+            ...options
+        }
+    };
+};
+BT.group = function Group(...rows) {
+    return {
+        type: 'BT.group',
+        value: rows
+    };
+};
+BT.template = function Template(templateId) {
+    return {
+        type: 'ButtonTemplate',
+        value: templateId
+    };
+};
+BT.row = function Row(...buttons) {
+    return {
+        type: 'BT.row',
+        value: buttons
+    };
+};
+const Ark = {
+    list: (...values) => {
+        return {
+            type: 'Ark.list',
+            value: values
+        };
+    },
+    listTip: (options) => {
+        return {
+            type: 'Ark.listTip',
+            value: options
+        };
+    },
+    listContent: (...values) => {
+        return {
+            type: 'Ark.listContent',
+            value: values
+        };
+    },
+    listItem: (value) => {
+        return {
+            type: 'Ark.listItem',
+            value: value
+        };
+    },
+    Card: (value) => {
+        return {
+            type: 'Ark.Card',
+            value: value
+        };
+    },
+    BigCard: (value) => {
+        return {
+            type: 'Ark.BigCard',
+            value
+        };
+    }
+};
+const MD = (...values) => {
+    return {
+        type: 'Markdown',
+        value: values
+    };
+};
+MD.template = (templateId, params) => {
+    return {
+        type: 'MarkdownTemplate',
+        value: templateId,
+        options: {
+            params
+        }
+    };
+};
+MD.text = (text) => {
+    return {
+        type: 'MD.text',
+        value: text
+    };
+};
+MD.title = (text) => {
+    return {
+        type: 'MD.title',
+        value: text
+    };
+};
+MD.subtitle = (text) => {
+    return {
+        type: 'MD.subtitle',
+        value: text
+    };
+};
+MD.bold = (text) => {
+    return {
+        type: 'MD.bold',
+        value: text
+    };
+};
+MD.italic = (text) => {
+    return {
+        type: 'MD.italic',
+        value: text
+    };
+};
+MD.italicStar = (text) => {
+    return {
+        type: 'MD.italicStar',
+        value: text
+    };
+};
+MD.strikethrough = (text) => {
+    return {
+        type: 'MD.strikethrough',
+        value: text
+    };
+};
+MD.link = (text, url) => {
+    return {
+        type: 'MD.link',
+        value: { text, url }
+    };
+};
+MD.image = (url, options) => {
+    return {
+        type: 'MD.image',
+        value: url,
+        options
+    };
+};
+MD.list = (...items) => {
+    return {
+        type: 'MD.list',
+        value: items
+    };
+};
+MD.listItem = (indexOrText, text) => {
+    return {
+        type: 'MD.listItem',
+        value: typeof indexOrText === 'number' ? { index: indexOrText, text } : indexOrText
+    };
+};
+MD.blockquote = (text) => {
+    return {
+        type: 'MD.blockquote',
+        value: text
+    };
+};
+MD.divider = () => {
+    return {
+        type: 'MD.divider'
+    };
+};
+MD.newline = (value = false) => {
+    return {
+        type: 'MD.newline',
+        value: value
+    };
+};
+MD.code = (value, options) => {
+    return {
+        type: 'MD.code',
+        value: value,
+        options: options
+    };
+};
+
+export { Ark, BT, Image, ImageFile, ImageURL, Link, MD, Mention, Text };

package/lib/cbp/connects/platform.js

@@ -5,7 +5,7 @@ import { ResultCode } from '../../core/variable.js';
 import 'fs';
 import 'path';
 import 'yaml';
-import '../../core/utils.js';
+import { sanitizeForSerialization } from '../../core/utils.js';
 import { createWSConnector } from './base.js';
 import { createDirectClient } from '../../process/direct-channel.js';
 
@@ -88,7 +88,7 @@ const cbpPlatformIPC = (open, existingActionReplys, existingApiReplys) => {
         if (typeof process.send === 'function') {
             data.DeviceId = deviceId;
             data.CreateAt = Date.now();
-            process.send({ type: 'ipc:data', data });
+            process.send({ type: 'ipc:data', data: sanitizeForSerialization(data) });
         }
     };
     const replyAction = (data, payload) => {
@@ -188,7 +188,7 @@ const cbpPlatform = (url, options = {
         if (global.chatbotPlatform && global.chatbotPlatform.readyState === WebSocket.OPEN) {
             data.DeviceId = deviceId;
             data.CreateAt = Date.now();
-            global.chatbotPlatform.send(flattedJSON.stringify(data));
+            global.chatbotPlatform.send(flattedJSON.stringify(sanitizeForSerialization(data)));
         }
     };
     const actionReplys = [];

package/lib/cbp/processor/actions.js

@@ -3,7 +3,7 @@ import { ResultCode } from '../../core/variable.js';
 import 'fs';
 import 'path';
 import 'yaml';
-import { createResult } from '../../core/utils.js';
+import { sanitizeForSerialization, createResult } from '../../core/utils.js';
 import { generateUniqueId, deviceId, actionResolves, actionTimeouts, timeoutTime } from './config.js';
 import { getDirectSend } from './transport.js';
 
@@ -24,14 +24,15 @@ const sendAction = (data) => {
     return new Promise(resolve => {
         data.actionId = actionId;
         data.DeviceId = deviceId;
+        const safeData = sanitizeForSerialization(data);
         const directSend = getDirectSend();
         if (directSend) {
-            directSend(data);
+            directSend(safeData);
             setupActionResolve(actionId, resolve);
             return;
         }
         if (process.env.__ALEMON_IPC === '1' && typeof process.send === 'function') {
-            process.send({ type: 'ipc:data', data });
+            process.send({ type: 'ipc:data', data: safeData });
             setupActionResolve(actionId, resolve);
             return;
         }
@@ -39,7 +40,7 @@ const sendAction = (data) => {
             resolve([createResult(ResultCode.Fail, 'Chatbot client is not available', null)]);
             return;
         }
-        global.chatbotClient?.send(flattedJSON.stringify(data));
+        global.chatbotClient?.send(flattedJSON.stringify(safeData));
         setupActionResolve(actionId, resolve);
     });
 };

package/lib/cbp/processor/api.js

@@ -2,7 +2,7 @@ import { ResultCode } from '../../core/variable.js';
 import 'fs';
 import 'path';
 import 'yaml';
-import { createResult } from '../../core/utils.js';
+import { sanitizeForSerialization, createResult } from '../../core/utils.js';
 import { generateUniqueId, deviceId, apiResolves, apiTimeouts, timeoutTime } from './config.js';
 import * as flattedJSON from 'flatted';
 import { getDirectSend } from './transport.js';
@@ -24,14 +24,15 @@ const sendAPI = (data) => {
     return new Promise(resolve => {
         data.apiId = ApiId;
         data.DeviceId = deviceId;
+        const safeData = sanitizeForSerialization(data);
         const directSend = getDirectSend();
         if (directSend) {
-            directSend(data);
+            directSend(safeData);
             setupApiResolve(ApiId, resolve);
             return;
         }
         if (process.env.__ALEMON_IPC === '1' && typeof process.send === 'function') {
-            process.send({ type: 'ipc:data', data });
+            process.send({ type: 'ipc:data', data: safeData });
             setupApiResolve(ApiId, resolve);
             return;
         }
@@ -39,7 +40,7 @@ const sendAPI = (data) => {
             resolve([createResult(ResultCode.Fail, 'Chatbot client is not available', null)]);
             return;
         }
-        global.chatbotClient?.send(flattedJSON.stringify(data));
+        global.chatbotClient?.send(flattedJSON.stringify(safeData));
         setupApiResolve(ApiId, resolve);
     });
 };

package/lib/cbp/processor/handle.d.ts

@@ -0,0 +1,3 @@
+import { Result } from '../../core';
+import type { Apis } from '../../types';
+export declare const sendAPI: (data: Apis) => Promise<Result[]>;

package/lib/cbp/processor/handle.js

@@ -0,0 +1,32 @@
+import { ResultCode } from '../../core/variable.js';
+import 'fs';
+import 'path';
+import 'yaml';
+import { createResult } from '../../core/utils.js';
+import { generateUniqueId, deviceId, apiResolves, apiTimeouts, timeoutTime } from './config.js';
+import * as flattedJSON from 'flatted';
+
+const sendAPI = (data) => {
+    const ApiId = generateUniqueId();
+    return new Promise(resolve => {
+        if (!global.chatbotClient?.send) {
+            resolve([createResult(ResultCode.Fail, 'Chatbot client is not available', null)]);
+            return;
+        }
+        data.apiId = ApiId;
+        data.DeviceId = deviceId;
+        global.chatbotClient?.send(flattedJSON.stringify(data));
+        apiResolves.set(ApiId, resolve);
+        const timeout = setTimeout(() => {
+            if (!apiResolves.has(ApiId) || !apiTimeouts.has(ApiId)) {
+                return;
+            }
+            apiResolves.delete(ApiId);
+            apiTimeouts.delete(ApiId);
+            resolve([createResult(ResultCode.Fail, '接口超时', null)]);
+        }, timeoutTime);
+        apiTimeouts.set(ApiId, timeout);
+    });
+};
+
+export { sendAPI };

package/lib/core/index.js

@@ -1,3 +1,3 @@
 export { ResultCode } from './variable.js';
 export { getConfig, getConfigValue, onWatchConfigValue } from './config.js';
-export { createEventName, createHash, createResult, fastHash, getCachedRegExp, getInputExportPath, getRecursiveDirFiles, showErrorModule, stringToNumber, useUserHashKey } from './utils.js';
+export { createEventName, createHash, createResult, fastHash, getCachedRegExp, getInputExportPath, getRecursiveDirFiles, sanitizeForSerialization, showErrorModule, stringToNumber, useUserHashKey } from './utils.js';

package/lib/core/utils.d.ts

@@ -17,6 +17,7 @@ export declare const getRecursiveDirFiles: (dir: string, condition?: (func: Dire
     name: string;
 }[];
 export declare const showErrorModule: (e: Error) => void;
+export declare const sanitizeForSerialization: (data: any) => any;
 export declare const getInputExportPath: (input?: string) => any;
 export type Result<T = any> = {
     code: ResultCode;

package/lib/core/utils.js

@@ -96,6 +96,10 @@ const showErrorModule = (e) => {
         data: e
     });
 };
+const sanitizeForSerialization = (data) => {
+    const flatted = require('flatted');
+    return flatted.parse(flatted.stringify(data));
+};
 const createExports = (packageJson) => {
     if (packageJson?.exports) {
         if (typeof packageJson.exports === 'string') {
@@ -131,4 +135,4 @@ const createResult = (code, message, data) => {
     };
 };
 
-export { createEventName, createHash, createResult, fastHash, getCachedRegExp, getInputExportPath, getRecursiveDirFiles, showErrorModule, stringToNumber, useUserHashKey };
+export { createEventName, createHash, createResult, fastHash, getCachedRegExp, getInputExportPath, getRecursiveDirFiles, sanitizeForSerialization, showErrorModule, stringToNumber, useUserHashKey };

package/lib/index.js

@@ -1,7 +1,7 @@
 export { ActionsEventEnum } from './types/event/actions.js';
 export { ResultCode } from './core/variable.js';
 export { getConfig, getConfigValue, onWatchConfigValue } from './core/config.js';
-export { createEventName, createHash, createResult, fastHash, getCachedRegExp, getInputExportPath, getRecursiveDirFiles, showErrorModule, stringToNumber, useUserHashKey } from './core/utils.js';
+export { createEventName, createHash, createResult, fastHash, getCachedRegExp, getInputExportPath, getRecursiveDirFiles, sanitizeForSerialization, showErrorModule, stringToNumber, useUserHashKey } from './core/utils.js';
 export { cbpClient } from './cbp/connects/client.js';
 export { cbpPlatform } from './cbp/connects/platform.js';
 export { cbpServer } from './cbp/server/main.js';
@@ -24,7 +24,7 @@ export { expendSubscribe, expendSubscribeCreate, expendSubscribeMount, expendSub
 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, getMessageIntent, sendToChannel, sendToUser } from './app/message-api.js';
+export { MessageDirect, createDataFormat, createEventValue, 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/lib/jsx/index.d.ts

@@ -0,0 +1,105 @@
+import { DataText, DataLink, DataImage, DataImageURL, DataImageFile, DataMention, DataButton, ButtonRow, DataButtonGroup, DataMarkDown, DataMarkdownTitle, DataMarkdownSubtitle, DataMarkdownText, DataMarkdownBold, DataMarkdownCode } from '../types/index.js';
+export interface FormatProps {
+    name?: string;
+    children?: any;
+    [key: string]: any;
+}
+export interface TextProps {
+    children?: any;
+    style?: DataText['options']['style'];
+}
+export interface LinkProps {
+    children?: any;
+    link: string;
+}
+export interface ImageProps {
+    children?: Buffer;
+}
+export interface ImageURLProps {
+    children?: string;
+}
+export interface ImageFileProps {
+    children?: string;
+}
+export interface MentionProps {
+    children?: string;
+    belong?: 'user' | 'guild' | 'channel' | 'everyone';
+    payload?: any;
+}
+export interface ButtonProps {
+    children?: any;
+    data?: DataButton['options']['data'];
+    command?: string;
+    toolTip?: string;
+    autoEnter?: boolean;
+    showList?: boolean;
+    type?: 'command' | 'link' | 'call';
+}
+export interface RowProps {
+    children?: any;
+}
+export interface ButtonGroupProps {
+    children?: any;
+}
+export interface MarkdownProps {
+    children?: any;
+}
+export interface MarkdownTitleProps {
+    children?: any;
+}
+export interface MarkdownSubtitleProps {
+    children?: any;
+}
+export interface MarkdownTextProps {
+    children?: any;
+}
+export interface MarkdownBoldProps {
+    children?: any;
+}
+export interface MarkdownCodeProps {
+    children?: any;
+    language?: string;
+}
+export interface CustomProps {
+    name: string;
+    children?: any;
+    [key: string]: any;
+}
+declare function FormatComponent(props: FormatProps): any;
+declare namespace FormatComponent {
+    var Text: typeof FormatText;
+    var Link: typeof FormatLink;
+    var Image: typeof FormatImage;
+    var ImageURL: typeof FormatImageURL;
+    var ImageFile: typeof FormatImageFile;
+    var Mention: typeof FormatMention;
+    var Button: typeof FormatButton;
+    var Row: typeof FormatRow;
+    var ButtonGroup: typeof FormatButtonGroup;
+    var Markdown: typeof FormatMarkdown;
+    var Custom: typeof FormatCustomComponent;
+}
+declare function FormatText(props: TextProps): DataText;
+declare function FormatLink(props: LinkProps): DataLink;
+declare function FormatImage(props: ImageProps): DataImage;
+declare function FormatImageURL(props: ImageURLProps): DataImageURL;
+declare function FormatImageFile(props: ImageFileProps): DataImageFile;
+declare function FormatMention(props: MentionProps): DataMention;
+declare function FormatButton(props: ButtonProps): DataButton;
+declare function FormatRow(props: RowProps): ButtonRow;
+declare function FormatButtonGroup(props: ButtonGroupProps): DataButtonGroup;
+declare function FormatMarkdownTitle(props: MarkdownTitleProps): DataMarkdownTitle;
+declare function FormatMarkdownSubtitle(props: MarkdownSubtitleProps): DataMarkdownSubtitle;
+declare function FormatMarkdownText(props: MarkdownTextProps): DataMarkdownText;
+declare function FormatMarkdownBold(props: MarkdownBoldProps): DataMarkdownBold;
+declare function FormatMarkdownCode(props: MarkdownCodeProps): DataMarkdownCode;
+declare function FormatMarkdown(props: MarkdownProps): DataMarkDown;
+declare namespace FormatMarkdown {
+    var Title: typeof FormatMarkdownTitle;
+    var Subtitle: typeof FormatMarkdownSubtitle;
+    var Text: typeof FormatMarkdownText;
+    var Bold: typeof FormatMarkdownBold;
+    var Code: typeof FormatMarkdownCode;
+}
+declare function FormatCustomComponent(props: CustomProps): any;
+export { FormatComponent as Component, FormatCustomComponent as Custom };