alemonjs 2.1.37 → 2.1.39

package/lib/app/SinglyLinkedList.d.ts

@@ -13,6 +13,7 @@ export declare class SinglyLinkedList<T> {
     popNext(): ListNode<T> | null;
     removeCurrent(): void;
     getSize(): number;
+    resetCursor(): void;
     forEach(callback: (node: ListNode<T>) => boolean | undefined): void;
 }
 export {};

package/lib/app/SinglyLinkedList.js

@@ -70,6 +70,9 @@ class SinglyLinkedList {
     getSize() {
         return this.size;
     }
+    resetCursor() {
+        this.current = null;
+    }
     forEach(callback) {
         let node = this.head;
         while (node) {

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

@@ -3,6 +3,7 @@ import { SubscribeStatus } from './config.js';
 
 const expendSubscribe = (valueEvent, select, next, choose) => {
     const subListValue = getSubscribeList(choose, select);
+    subListValue.resetCursor();
     const nextObserver = (cn, ...cns) => {
         if (cn) {
             next(...cns);

package/lib/client.js

@@ -61,6 +61,12 @@ const main = () => {
     loadModels();
 };
 const mainProcess = () => {
+    process.on('unhandledRejection', (reason) => {
+        logger.error('[alemonjs][unhandledRejection] 未捕获的 Promise 拒绝:', reason);
+    });
+    process.on('uncaughtException', (error) => {
+        logger.error('[alemonjs][uncaughtException] 未捕获的异常:', error);
+    });
     ['SIGINT', 'SIGTERM', 'SIGQUIT', 'disconnect'].forEach(sig => {
         process?.on?.(sig, () => {
             logger.info?.(`[alemonjs][${sig}] 收到信号，正在关闭...`);

package/package.json

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

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

@@ -1,50 +0,0 @@
-import { DataMention, DataImage, DataText, DataImageURL, DataImageFile, ButtonRow, DataButtonGroup, DataButton, DataArkList, DataArkListTip, DataArkListContent, DataArkListItem, DataArkCard, DataArkBigCard, DataMarkdownTemplate, DataMarkDown, DataMarkdownTitle, DataMarkdownSubtitle, DataMarkdownBold, DataMarkdownItalic, DataMarkdownItalicStar, DataMarkdownStrikethrough, DataMarkdownLink, DataMarkdownImage, DataMarkdownList, DataMarkdownListItem, DataMarkdownBlockquote, DataMarkdownDivider, DataMarkdownNewline, DataLink, DataMarkdownText, DataButtonTemplate, DataMarkdownCode } from '../types';
-export declare const Text: (val: DataText["value"], options?: DataText["options"]) => DataText;
-export declare const Link: (val: DataLink["value"], options?: DataText["options"]) => DataText;
-export declare const ImageURL: (val: DataImageURL["value"]) => DataImageURL;
-export declare const ImageFile: (val: DataImageFile["value"]) => DataImageFile;
-declare const Image: {
-    (val: Buffer): DataImage;
-    url: (val: DataImageURL["value"]) => DataImageURL;
-    file: (val: DataImageFile["value"]) => DataImageFile;
-};
-export { Image };
-export declare const Mention: (UserId?: DataMention["value"], options?: DataMention["options"]) => DataMention;
-declare const BT: {
-    (title: string, data: DataButton["options"]["data"], options?: Omit<DataButton["options"], "data">): DataButton;
-    group(...rows: ButtonRow[]): DataButtonGroup;
-    template(templateId: DataButtonTemplate["value"]): DataButtonTemplate;
-    row(...buttons: DataButton[]): ButtonRow;
-};
-export { BT };
-export declare const Ark: {
-    list: (values_0: DataArkListTip, values_1: DataArkListContent) => DataArkList;
-    listTip: (options: DataArkListTip["value"]) => DataArkListTip;
-    listContent: (...values: DataArkListContent["value"]) => DataArkListContent;
-    listItem: (value: DataArkListItem["value"]) => DataArkListItem;
-    Card: (value: DataArkCard["value"]) => DataArkCard;
-    BigCard: (value: DataArkBigCard["value"]) => DataArkBigCard;
-};
-declare const MD: {
-    (...values: DataMarkDown["value"]): DataMarkDown;
-    template(templateId: DataMarkdownTemplate["value"], params?: DataMarkdownTemplate["options"]["params"]): DataMarkdownTemplate;
-    text(text: string): DataMarkdownText;
-    title(text: string): DataMarkdownTitle;
-    subtitle(text: string): DataMarkdownSubtitle;
-    bold(text: string): DataMarkdownBold;
-    italic(text: string): DataMarkdownItalic;
-    italicStar(text: string): DataMarkdownItalicStar;
-    strikethrough(text: string): DataMarkdownStrikethrough;
-    link(text: string, url: string): DataMarkdownLink;
-    image(url: string, options?: {
-        width?: number;
-        height?: number;
-    }): DataMarkdownImage;
-    list(...items: any[]): DataMarkdownList;
-    listItem(indexOrText: number | string, text?: string): DataMarkdownListItem;
-    blockquote(text: string): DataMarkdownBlockquote;
-    divider(): DataMarkdownDivider;
-    newline(value?: boolean): DataMarkdownNewline;
-    code(value: DataMarkdownCode["value"], options?: DataMarkdownCode["options"]): DataMarkdownCode;
-};
-export { MD };

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

@@ -1,217 +0,0 @@
-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/processor/handle.d.ts

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

package/lib/cbp/processor/handle.js

@@ -1,32 +0,0 @@
-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/jsx/index.d.ts

@@ -1,105 +0,0 @@
-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 };

package/lib/jsx/index.js

@@ -1,211 +0,0 @@
-function childrenToString(children) {
-    if (children === null || children === undefined) {
-        return '';
-    }
-    if (typeof children === 'string') {
-        return children;
-    }
-    if (typeof children === 'number' || typeof children === 'boolean') {
-        return String(children);
-    }
-    if (Array.isArray(children)) {
-        return children.map(childrenToString).join('');
-    }
-    return String(children);
-}
-function flattenChildren(children) {
-    if (children === null || children === undefined) {
-        return [];
-    }
-    if (Array.isArray(children)) {
-        const result = [];
-        for (const child of children) {
-            if (Array.isArray(child)) {
-                result.push(...flattenChildren(child));
-            }
-            else if (child !== null && child !== undefined && typeof child === 'object' && 'type' in child) {
-                result.push(child);
-            }
-        }
-        return result;
-    }
-    if (typeof children === 'object' && children !== null && children !== undefined && 'type' in children) {
-        return [children];
-    }
-    return [];
-}
-function collectChildren(children, typeCheck) {
-    const flat = flattenChildren(children);
-    return flat.filter(c => c.type === typeCheck);
-}
-function extractOptions(props, excludeKeys = []) {
-    const exclude = new Set(['children', ...excludeKeys]);
-    const options = {};
-    let hasKeys = false;
-    for (const key of Object.keys(props)) {
-        if (!exclude.has(key)) {
-            options[key] = props[key];
-            hasKeys = true;
-        }
-    }
-    return hasKeys ? options : undefined;
-}
-function FormatComponent(props) {
-    if (props.name !== undefined) {
-        const { name, children, ...rest } = props;
-        const options = Object.keys(rest).length > 0 ? rest : undefined;
-        return {
-            type: name,
-            value: children !== null && children !== undefined ? childrenToString(children) : undefined,
-            options
-        };
-    }
-    return flattenChildren(props.children);
-}
-function FormatText(props) {
-    return {
-        type: 'Text',
-        value: childrenToString(props.children),
-        options: extractOptions(props)
-    };
-}
-function FormatLink(props) {
-    return {
-        type: 'Link',
-        value: childrenToString(props.children),
-        options: extractOptions(props)
-    };
-}
-function FormatImage(props) {
-    const buf = props.children;
-    return {
-        type: 'Image',
-        value: buf instanceof Buffer ? buf.toString('base64') : ''
-    };
-}
-function FormatImageURL(props) {
-    return {
-        type: 'ImageURL',
-        value: childrenToString(props.children)
-    };
-}
-function FormatImageFile(props) {
-    return {
-        type: 'ImageFile',
-        value: childrenToString(props.children)
-    };
-}
-function FormatMention(props) {
-    return {
-        type: 'Mention',
-        value: props.children !== null && props.children !== undefined ? childrenToString(props.children) : undefined,
-        options: extractOptions(props)
-    };
-}
-function FormatButton(props) {
-    const options = {};
-    if (props.command !== undefined) {
-        options.data = props.command;
-        options.type = 'command';
-    }
-    else {
-        if (props.data !== undefined) {
-            options.data = props.data;
-        }
-        if (props.type !== undefined) {
-            options.type = props.type;
-        }
-    }
-    if (props.toolTip !== undefined) {
-        options.toolTip = props.toolTip;
-    }
-    if (props.autoEnter !== undefined) {
-        options.autoEnter = props.autoEnter;
-    }
-    if (props.showList !== undefined) {
-        options.showList = props.showList;
-    }
-    return {
-        type: 'Button',
-        value: childrenToString(props.children),
-        options: Object.keys(options).length > 0 ? options : undefined
-    };
-}
-function FormatRow(props) {
-    return {
-        type: 'BT.row',
-        value: collectChildren(props.children, 'Button')
-    };
-}
-function FormatButtonGroup(props) {
-    return {
-        type: 'BT.group',
-        value: collectChildren(props.children, 'BT.row')
-    };
-}
-function FormatMarkdownTitle(props) {
-    return {
-        type: 'MD.title',
-        value: childrenToString(props.children)
-    };
-}
-function FormatMarkdownSubtitle(props) {
-    return {
-        type: 'MD.subtitle',
-        value: childrenToString(props.children)
-    };
-}
-function FormatMarkdownText(props) {
-    return {
-        type: 'MD.text',
-        value: childrenToString(props.children)
-    };
-}
-function FormatMarkdownBold(props) {
-    return {
-        type: 'MD.bold',
-        value: childrenToString(props.children)
-    };
-}
-function FormatMarkdownCode(props) {
-    return {
-        type: 'MD.code',
-        value: childrenToString(props.children),
-        options: extractOptions(props)
-    };
-}
-function FormatMarkdown(props) {
-    const flat = flattenChildren(props.children);
-    const items = flat.filter(c => typeof c.type === 'string' && c.type.startsWith('MD.'));
-    return {
-        type: 'Markdown',
-        value: items
-    };
-}
-FormatMarkdown.Title = FormatMarkdownTitle;
-FormatMarkdown.Subtitle = FormatMarkdownSubtitle;
-FormatMarkdown.Text = FormatMarkdownText;
-FormatMarkdown.Bold = FormatMarkdownBold;
-FormatMarkdown.Code = FormatMarkdownCode;
-function FormatCustomComponent(props) {
-    const { name, children, ...rest } = props;
-    const options = Object.keys(rest).length > 0 ? rest : undefined;
-    return {
-        type: name,
-        value: children !== null && children !== undefined ? childrenToString(children) : undefined,
-        options
-    };
-}
-FormatComponent.Text = FormatText;
-FormatComponent.Link = FormatLink;
-FormatComponent.Image = FormatImage;
-FormatComponent.ImageURL = FormatImageURL;
-FormatComponent.ImageFile = FormatImageFile;
-FormatComponent.Mention = FormatMention;
-FormatComponent.Button = FormatButton;
-FormatComponent.Row = FormatRow;
-FormatComponent.ButtonGroup = FormatButtonGroup;
-FormatComponent.Markdown = FormatMarkdown;
-FormatComponent.Custom = FormatCustomComponent;
-
-export { FormatComponent as Component, FormatCustomComponent as Custom };

package/lib/jsx/jsx-dev-runtime.d.ts

@@ -1,2 +0,0 @@
-export { jsx, jsxs, Fragment } from './jsx-runtime.js';
-export type { JSX } from './jsx-runtime.js';

package/lib/jsx/jsx-dev-runtime.js

@@ -1 +0,0 @@
-export { Fragment, jsx, jsxs } from './jsx-runtime.js';

package/lib/jsx/jsx-runtime.d.ts

@@ -1,18 +0,0 @@
-type JsxChild = any;
-type JsxProps = Record<string, any>;
-type JsxComponent = (props: JsxProps) => any;
-export declare function jsx(type: string | JsxComponent, props: JsxProps, _key?: string): any;
-export declare function jsxs(type: string | JsxComponent, props: JsxProps, _key?: string): any;
-export declare function Fragment(props: {
-    children?: JsxChild;
-}): any[];
-export declare namespace JSX {
-    type Element = any;
-    interface ElementChildrenAttribute {
-        children: object;
-    }
-    interface IntrinsicElements {
-        [elemName: string]: any;
-    }
-}
-export {};

package/lib/jsx/jsx-runtime.js

@@ -1,24 +0,0 @@
-function jsx(type, props, _key) {
-    if (typeof type === 'function') {
-        return type(props);
-    }
-    return { type, props };
-}
-function jsxs(type, props, _key) {
-    if (typeof type === 'function') {
-        return type(props);
-    }
-    return { type, props };
-}
-function Fragment(props) {
-    const { children } = props;
-    if (children === null || children === undefined) {
-        return [];
-    }
-    if (Array.isArray(children)) {
-        return children;
-    }
-    return [children];
-}
-
-export { Fragment, jsx, jsxs };