alemonjs 2.1.63 → 2.1.65

package/lib/app/index.js

@@ -38,5 +38,5 @@ export { getCurrentEvent, getCurrentNext, withEventContext } from './hook-event-
 export { registerAppDir, scheduleCancel, scheduleCancelAll, scheduleCancelByApp, scheduleCron, scheduleInterval, scheduleList, schedulePause, scheduleResume, scheduleTimeout, unregisterAppDir } from './schedule-store.js';
 export { createEventValue, createSelects, onSelects, onState, unChildren, unState, useState } from './event-utils.js';
 export { MessageDirect, createDataFormat, format, getMessageIntent, sendToChannel, sendToUser } from './message-api.js';
-export { Format, FormatButtonGroup, FormatMarkDown, FormatModal, FormatSelect } from './message-format.js';
+export { Format, FormatButtonGroup, FormatMarkDown, FormatSelect } 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-format.d.ts

@@ -1,4 +1,4 @@
-import { DataMention, DataText, DataImageURL, DataImageFile, DataButtonRow, DataButtonGroup, DataButton, DataMarkDown, DataLink, DataMarkdownCode, DataAttachment, DataMarkdownMention, DataMarkdownButton, DataEnums, DataSelect, DataSelectOption, DataModal, DataTextInput, DataEmbed } from '../types';
+import { DataMention, DataText, DataImageURL, DataImageFile, DataButtonRow, DataButtonGroup, DataButton, DataMarkDown, DataLink, DataMarkdownCode, DataAttachment, DataMarkdownMention, DataMarkdownButton, DataEnums, DataSelect, DataSelectOption, DataEmbed } from '../types';
 export * from './message-format-old.js';
 export declare class FormatButtonGroup {
     #private;
@@ -46,21 +46,12 @@ export declare class FormatSelect {
     addOption(label: string, value: string, extra?: Omit<DataSelectOption, 'label' | 'value'>): this;
     clear(): this;
 }
-export declare class FormatModal {
-    #private;
-    get value(): DataModal;
-    setCustomId(customId: string): this;
-    setTitle(title: string): this;
-    addInput(label: string, options: DataTextInput['options']): this;
-    clear(): this;
-}
 export declare class Format {
     #private;
     static create(): Format;
     static createMarkdown(): FormatMarkDown;
     static createButtonGroup(): FormatButtonGroup;
     static createSelect(): FormatSelect;
-    static createModal(): FormatModal;
     get value(): DataEnums[];
     absorb(format: Format): this;
     addText(val: DataText['value'], options?: DataText['options']): this;
@@ -79,8 +70,6 @@ export declare class Format {
     addImageURL(val: DataImageURL['value']): this;
     addSelect(select: FormatSelect): this;
     addSelect(options: DataSelectOption[], meta?: DataSelect['options']): this;
-    addModal(modal: FormatModal): this;
-    addModal(inputs: DataTextInput[], meta: DataModal['options']): this;
     addEmbed(embed: DataEmbed['value']): this;
     clear(): this;
 }

package/lib/app/message-format.js

@@ -238,38 +238,6 @@ class FormatSelect {
         return this;
     }
 }
-class FormatModal {
-    #inputs = [];
-    #meta = { customId: '', title: '' };
-    get value() {
-        return {
-            type: 'Modal',
-            value: this.#inputs,
-            options: this.#meta
-        };
-    }
-    setCustomId(customId) {
-        this.#meta.customId = customId;
-        return this;
-    }
-    setTitle(title) {
-        this.#meta.title = title;
-        return this;
-    }
-    addInput(label, options) {
-        this.#inputs.push({
-            type: 'TextInput',
-            value: label,
-            options
-        });
-        return this;
-    }
-    clear() {
-        this.#inputs = [];
-        this.#meta = { customId: '', title: '' };
-        return this;
-    }
-}
 class Format {
     #data = [];
     static create() {
@@ -284,9 +252,6 @@ class Format {
     static createSelect() {
         return new FormatSelect();
     }
-    static createModal() {
-        return new FormatModal();
-    }
     get value() {
         return this.#data;
     }
@@ -405,19 +370,6 @@ class Format {
         }
         return this;
     }
-    addModal(...args) {
-        if (args[0] instanceof FormatModal) {
-            this.#data.push(args[0].value);
-        }
-        else {
-            this.#data.push({
-                type: 'Modal',
-                value: args[0],
-                options: args[1]
-            });
-        }
-        return this;
-    }
     addEmbed(embed) {
         this.#data.push({
             type: 'Embed',
@@ -431,4 +383,4 @@ class Format {
     }
 }
 
-export { Format, FormatButtonGroup, FormatMarkDown, FormatModal, FormatSelect };
+export { Format, FormatButtonGroup, FormatMarkDown, FormatSelect };

package/lib/index.js

@@ -45,6 +45,6 @@ export { getCurrentEvent, getCurrentNext, withEventContext } from './app/hook-ev
 export { registerAppDir, scheduleCancel, scheduleCancelAll, scheduleCancelByApp, scheduleCron, scheduleInterval, scheduleList, schedulePause, scheduleResume, scheduleTimeout, unregisterAppDir } from './app/schedule-store.js';
 export { createEventValue, createSelects, onSelects, onState, unChildren, unState, useState } from './app/event-utils.js';
 export { MessageDirect, createDataFormat, format, getMessageIntent, sendToChannel, sendToUser } from './app/message-api.js';
-export { Format, FormatButtonGroup, FormatMarkDown, FormatModal, FormatSelect } from './app/message-format.js';
+export { Format, FormatButtonGroup, FormatMarkDown, FormatSelect } 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/types/message/index.d.ts

@@ -9,7 +9,6 @@ import { DataAudio } from './audio';
 import { DataVideo } from './video';
 import { DataMarkdownOriginal } from './markdown-raw';
 import { DataSelect } from './select';
-import { DataModal, DataTextInput } from './modal';
 import { DataEmbed } from './embed';
 export * from './text';
 export * from './link';
@@ -22,7 +21,6 @@ export * from './attachment';
 export * from './audio';
 export * from './video';
 export * from './select';
-export * from './modal';
 export * from './embed';
-export type DataEnums = DataText | DataLink | DataImage | DataImageURL | DataImageFile | DataMention | DataButtonGroup | DataMarkDown | DataMarkdownOriginal | DataAttachment | DataAudio | DataVideo | DataSelect | DataModal | DataTextInput | DataEmbed;
+export type DataEnums = DataText | DataLink | DataImage | DataImageURL | DataImageFile | DataMention | DataButtonGroup | DataMarkDown | DataMarkdownOriginal | DataAttachment | DataAudio | DataVideo | DataSelect | DataEmbed;
 export type MessageDataFormat = DataEnums[];

package/lib/types/message/modal.d.ts

@@ -1,21 +1 @@
-export type DataTextInput = {
-    type: 'TextInput';
-    value: string;
-    options: {
-        customId: string;
-        style?: 'short' | 'paragraph';
-        placeholder?: string;
-        minLength?: number;
-        maxLength?: number;
-        required?: boolean;
-        defaultValue?: string;
-    };
-};
-export type DataModal = {
-    type: 'Modal';
-    value: DataTextInput[];
-    options: {
-        customId: string;
-        title: string;
-    };
-};
+export {};

package/lib/utils.d.ts

@@ -1,6 +1,8 @@
 import { PathLike } from 'fs';
 import { Readable } from 'node:stream';
 import { Options } from 'public-ip';
+import { AxiosInstance, AxiosRequestConfig } from 'axios';
+import { Buffer } from 'buffer';
 export declare const getBufferByURL: (url: string) => Promise<Buffer>;
 export declare const createQRCode: (text: string, targetPath?: string) => Promise<Buffer | false>;
 export declare class Counter {
@@ -31,3 +33,7 @@ export declare class Regular extends RegExp {
     withFlags(flags: 'i' | 'g' | 'm' | 's' | 'u' | 'y'): Regular;
     withoutFlags(flagsToRemove: 'i' | 'g' | 'm' | 's' | 'u' | 'y'): Regular;
 }
+export declare const createAxiosInstance: (service: AxiosInstance, options: AxiosRequestConfig) => Promise<any>;
+export declare const request: (options: AxiosRequestConfig & {
+    requestProxy: string;
+}) => Promise<any>;

package/lib/utils.js

@@ -5,6 +5,8 @@ import { isReadable, Readable } from 'node:stream';
 import { basename } from 'path';
 import { fileTypeFromBuffer, fileTypeFromStream } from 'file-type';
 import { publicIp } from 'public-ip';
+import { Buffer } from 'buffer';
+import { HttpsProxyAgent } from 'https-proxy-agent';
 
 const getBufferByURL = async (url) => {
     return await axios
@@ -178,5 +180,113 @@ class Regular extends RegExp {
         return new Regular(this.source, newFlags);
     }
 }
+const filterHeaders = (headers = {}) => {
+    if (!headers) {
+        return headers;
+    }
+    const filtered = {};
+    const sensitiveKeys = [/^authorization$/i, /^cookie$/i, /^set-cookie$/i, /token/i, /key/i, /jwt/i, /^session[-_]id$/i, /^uid$/i, /^user[-_]id$/i];
+    for (const key in headers) {
+        if (/^_/.test(key)) {
+            continue;
+        }
+        if (typeof key === 'symbol') {
+            continue;
+        }
+        if (typeof headers[key] === 'function') {
+            continue;
+        }
+        if (sensitiveKeys.some(re => re.test(key))) {
+            filtered[key] = '******';
+        }
+        else {
+            filtered[key] = headers[key];
+        }
+    }
+    return filtered;
+};
+const filterConfig = (config = {}) => {
+    if (!config) {
+        return config;
+    }
+    const filtered = {};
+    for (const key in config) {
+        if (/^_/.test(key)) {
+            continue;
+        }
+        if (typeof key === 'symbol') {
+            continue;
+        }
+        if (typeof config[key] === 'function') {
+            continue;
+        }
+        filtered[key] = config[key];
+    }
+    return filtered;
+};
+const filterRequest = (request = {}) => {
+    if (!request) {
+        return request;
+    }
+    const filtered = {};
+    for (const key in request) {
+        if (/^_/.test(key)) {
+            continue;
+        }
+        if (typeof key === 'symbol') {
+            continue;
+        }
+        if (typeof request[key] === 'function') {
+            continue;
+        }
+        filtered[key] = request[key];
+    }
+    return filtered;
+};
+const loggerError = err => {
+    const errorData = {
+        config: {
+            headers: filterHeaders(err?.config?.headers),
+            params: err?.config?.params,
+            data: err?.config?.data
+        },
+        response: {
+            status: err?.response?.status,
+            statusText: err?.response?.statusText,
+            headers: filterHeaders(err?.response?.headers),
+            config: filterConfig(err?.response?.config),
+            request: filterRequest(err?.response?.request),
+            data: err?.response?.data
+        },
+        message: err?.message
+    };
+    if (global?.logger) {
+        global.logger.error(errorData);
+    }
+    else {
+        console.error(errorData);
+    }
+};
+const createAxiosInstance = async (service, options) => {
+    try {
+        const res = await service(options);
+        return res?.data ?? {};
+    }
+    catch (err) {
+        loggerError(err);
+        throw err?.response?.data ?? err;
+    }
+};
+const request = (options) => {
+    const { requestProxy, ...requestConfig } = options;
+    if (requestProxy) {
+        requestConfig.httpsAgent = new HttpsProxyAgent(requestProxy);
+    }
+    const service = axios.create({
+        ...requestConfig,
+        timeout: 6000
+    });
+    return createAxiosInstance(service, options);
+};
 
-export { Counter, Regular, createPicFrom, createQRCode, getBufferByURL, getPublicIP };
+export { Counter, Regular, createAxiosInstance, createPicFrom, createQRCode, getBufferByURL, getPublicIP, request };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alemonjs",
-  "version": "2.1.63",
+  "version": "2.1.65",
   "description": "bot script",
   "author": "lemonade",
   "license": "MIT",
@@ -43,6 +43,7 @@
     "qrcode": "^1.5.4",
     "uuid": "11.1.0",
     "ws": "^8.18.0",
+    "https-proxy-agent": "^9.0.0",
     "yaml": "^2.5.1"
   },
   "devDependencies": {