@alemonjs/qq-bot 2.1.0-alpha.19 → 2.1.0-alpha.20

package/lib/sdk/message.public.js

@@ -0,0 +1 @@
+

package/lib/sdk/typing.d.ts

@@ -1,6 +1,7 @@
-type MessageType = 0 | 1 | 2 | 3 | 4 | 7;
-type FileType = 1 | 2 | 3 | 4;
-interface ButtonType {
+import { IntentsEnum } from './intents';
+export type MessageType = 0 | 1 | 2 | 3 | 4 | 7;
+export type FileType = 1 | 2 | 3 | 4;
+export interface ButtonType {
     id: string;
     render_data: {
         label: string;
@@ -23,7 +24,7 @@ interface ButtonType {
         at_bot_show_channel_list?: boolean;
     };
 }
-interface KeyboardType {
+export interface KeyboardType {
     id?: string;
     content?: {
         rows: {
@@ -31,18 +32,15 @@ interface KeyboardType {
         }[];
     };
 }
-interface MarkdownType {
-    /** markdown 模版id，申请模版后获得 */
+export interface MarkdownType {
     custom_template_id?: string;
-    /** 原生 markdown 文本内容（内邀使用） */
     content?: string;
-    /** 模版内变量与填充值的kv映射 */
     params?: Array<{
         key: string;
         values: string[];
     }>;
 }
-interface ApiRequestData {
+export interface ApiRequestData {
     content?: string;
     msg_type: MessageType;
     markdown?: MarkdownType;
@@ -57,5 +55,17 @@ interface ApiRequestData {
     msg_id?: string;
     msg_seq?: number;
 }
-
-export type { ApiRequestData, ButtonType, FileType, KeyboardType, MarkdownType, MessageType };
+export interface Options {
+    app_id: string;
+    token: string;
+    secret: string;
+    shard?: number[];
+    intents?: IntentsEnum[];
+    is_private?: boolean;
+    sandbox?: boolean;
+    mode?: 'guild' | 'group' | '';
+    route?: string;
+    port?: string;
+    ws?: string;
+    gatewayURL?: string;
+}

package/lib/sdk/typing.js

@@ -0,0 +1 @@
+

package/lib/sdk/webhook.secret.d.ts

@@ -0,0 +1,14 @@
+export declare class WebhookAPI {
+    config: {
+        secret: string;
+    };
+    constructor(config: {
+        secret: string;
+    });
+    validSign(ts: any, body: any, sign: any): boolean;
+    getSign(eventTs: any, plainToken: any): string;
+    getKey(): {
+        privateKey: Buffer<ArrayBuffer>;
+        publicKey: Uint8Array<ArrayBufferLike>;
+    };
+}

package/lib/sdk/webhook.secret.js

@@ -5,13 +5,6 @@ class WebhookAPI {
     constructor(config) {
         this.config = config;
     }
-    /**
-     *  验证签名
-     * @param ts
-     * @param body
-     * @param sign
-     * @returns
-     */
     validSign(ts, body, sign) {
         const { publicKey } = this.getKey();
         const sig = Buffer.isBuffer(sign) ? sign : Buffer.from(sign, 'hex');
@@ -19,22 +12,12 @@ class WebhookAPI {
         const msg = Buffer.from(ts + httpBody);
         return ed25519.verify(sig, msg, publicKey);
     }
-    /**
-     *   生成签名
-     * @param eventTs
-     * @param plainToken
-     * @returns
-     */
     getSign(eventTs, plainToken) {
         const { privateKey } = this.getKey();
         const msg = Buffer.from(eventTs + plainToken);
         const signature = Buffer.from(ed25519.sign(msg, privateKey)).toString('hex');
         return signature;
     }
-    /**
-     * 获取 key
-     * @returns
-     */
     getKey() {
         let seed = this.config.secret;
         if (!seed) {
@@ -42,8 +25,8 @@ class WebhookAPI {
         }
         while (seed.length < 32) {
             seed = seed.repeat(2);
-        } // Ed25519 的种子大小是 32 字节
-        seed = seed.slice(0, 32); // 修剪到 32 字节
+        }
+        seed = seed.slice(0, 32);
         const privateKey = Buffer.from(seed);
         return {
             privateKey,

package/lib/sends.d.ts

@@ -0,0 +1,29 @@
+import { QQBotAPI } from './sdk/api';
+import { ClientAPIMessageResult, type DataEnums } from 'alemonjs';
+type Client = typeof QQBotAPI.prototype;
+export declare const GROUP_AT_MESSAGE_CREATE: (client: Client, event: {
+    ChannelId: string;
+    MessageId?: string;
+    tag?: string;
+}, val: DataEnums[]) => Promise<ClientAPIMessageResult[]>;
+export declare const C2C_MESSAGE_CREATE: (client: Client, event: {
+    UserId: string;
+    MessageId?: string;
+    tag?: string;
+}, val: DataEnums[]) => Promise<ClientAPIMessageResult[]>;
+export declare const DIRECT_MESSAGE_CREATE: (client: Client, event: {
+    UserId: string;
+    MessageId?: string;
+    tag?: string;
+}, val: DataEnums[]) => Promise<ClientAPIMessageResult[]>;
+export declare const MESSAGE_CREATE: (client: Client, event: {
+    ChannelId: string;
+    MessageId?: string;
+    tag?: string;
+}, val: DataEnums[]) => Promise<ClientAPIMessageResult[]>;
+export declare const AT_MESSAGE_CREATE: (client: Client, event: {
+    ChannelId: string;
+    MessageId?: string;
+    tag?: string;
+}, val: DataEnums[]) => Promise<ClientAPIMessageResult[]>;
+export {};

package/lib/sends.js

@@ -26,17 +26,12 @@ const createButtonsData = (rows) => {
                             style: 0
                         },
                         action: {
-                            // 0 link 1 callback , 2 command
                             type: map[typing],
                             permission: {
-                                // 所有人
                                 type: 2
-                                // "specify_role_ids": ["1", "2", "3"]
                             },
-                            // "click_limit": 10,
                             unsupport_tips: options?.toolTip ?? '',
                             data: options?.data ?? '',
-                            // reply: true,
                             at_bot_show_channel_list: options.showList ?? false,
                             enter: options?.autoEnter ?? false
                         }
@@ -153,72 +148,41 @@ const createArkList = (value) => {
         ]
     };
 };
-// 数据md转为文本
+const map = {
+    title: (value) => `# ${value}`,
+    subtitle: (value) => `## ${value}`,
+    text: (value) => `${value} `,
+    bold: (value) => `**${value}** `,
+    divider: () => '\n————————\n',
+    italic: (value) => `_${value}_ `,
+    italicStar: (value) => `*${value}* `,
+    strikethrough: (value) => `~~${value}~~ `,
+    blockquote: (value) => `\n> ${value}`,
+    newline: () => '\n',
+    link: (value) => `[🔗${value.text}](${value.url}) `
+};
 const createMarkdownText = (data) => {
     const content = data
         .map(mdItem => {
-        if (mdItem.type === 'MD.title') {
-            // \n
-            return `# ${mdItem.value}\n`;
-        }
-        else if (mdItem.type === 'MD.subtitle') {
-            // \n
-            return `## ${mdItem.value}\n`;
-        }
-        else if (mdItem.type === 'MD.text') {
-            // 正文
-            return `${mdItem.value} `;
-        }
-        else if (mdItem.type === 'MD.bold') {
-            // 加粗
-            return `**${mdItem.value}** `;
-        }
-        else if (mdItem.type === 'MD.divider') {
-            // 分割线
-            return '\n————————\n';
-        }
-        else if (mdItem.type === 'MD.italic') {
-            // 斜体
-            return `_${mdItem.value}_ `;
-        }
-        else if (mdItem.type === 'MD.italicStar') {
-            // 星号斜体
-            return `*${mdItem.value}* `;
-        }
-        else if (mdItem.type === 'MD.strikethrough') {
-            // 删除线
-            return `~~${mdItem.value}~~ `;
-        }
-        else if (mdItem.type === 'MD.blockquote') {
-            // \n
-            return `> ${mdItem.value}\n`;
-        }
-        else if (mdItem.type === 'MD.newline') {
-            // 换行
-            return '\n';
-        }
-        else if (mdItem.type === 'MD.link') {
-            //
-            return `[🔗${mdItem.value.text}](${mdItem.value.url}) `;
+        if (map[mdItem.type]) {
+            const value = mdItem?.value;
+            return map[mdItem.type](value);
         }
-        else if (mdItem.type === 'MD.image') {
-            //
-            return `![text #${mdItem.options?.width || 208}px #${mdItem.options?.height || 320}px](${mdItem.value}) `;
+        if (mdItem.type === 'MD.image') {
+            return `\n![text #${mdItem.options?.width || 208}px #${mdItem.options?.height || 320}px](${mdItem.value})\n`;
         }
         else if (mdItem.type === 'MD.list') {
             const listStr = mdItem.value.map(listItem => {
-                // 有序
                 if (typeof listItem.value === 'object') {
                     return `\n${listItem.value.index}. ${listItem.value.text}`;
                 }
-                // 无序
                 return `\n- ${listItem.value}`;
             });
             return `${listStr}\n`;
         }
         else if (mdItem.type === 'MD.code') {
             const language = mdItem?.options?.language || '';
-            return `\`\`\`${language}\n${mdItem.value}\n\`\`\`\n`;
+            return `\n\`\`\`${language}\n${mdItem.value}\n\`\`\`\n`;
         }
         else {
             const value = mdItem['value'] || '';
@@ -228,13 +192,6 @@ const createMarkdownText = (data) => {
         .join('');
     return content;
 };
-/**
- * 群组消息
- * @param client
- * @param event
- * @param val
- * @returns
- */
 const GROUP_AT_MESSAGE_CREATE = async (client, event, val) => {
     const baseParams = {};
     if (event.tag === 'INTERACTION_CREATE_GROUP') {
@@ -268,7 +225,6 @@ const GROUP_AT_MESSAGE_CREATE = async (client, event, val) => {
         if (images && images.length > 0) {
             let url = '';
             for (let i = 0; i < images.length; i++) {
-                // 已经处理。
                 if (url) {
                     break;
                 }
@@ -318,14 +274,12 @@ const GROUP_AT_MESSAGE_CREATE = async (client, event, val) => {
                 }
                 else if (item.type === 'BT.group') {
                     const rows = item.value;
-                    // 构造按钮
                     const content = createButtonsData(rows);
                     params['keyboard'] = {
                         content: content
                     };
                 }
                 else if (item.type === 'Markdown') {
-                    // 如果是markdown，获取内容
                     const content = createMarkdownText(item.value);
                     if (content) {
                         params['markdown'] = {
@@ -342,7 +296,6 @@ const GROUP_AT_MESSAGE_CREATE = async (client, event, val) => {
             });
             return [createResult(ResultCode.Ok, 'client.groupOpenMessages', { id: res.id })];
         }
-        // ark
         const ark = val.filter(item => item.type === 'Ark.BigCard' || item.type === 'Ark.Card' || item.type === 'Ark.list');
         if (ark && ark.length > 0) {
             const params = {};
@@ -386,13 +339,6 @@ const GROUP_AT_MESSAGE_CREATE = async (client, event, val) => {
     }
     return [];
 };
-/**
- * 私聊消息
- * @param client
- * @param event
- * @param val
- * @returns
- */
 const C2C_MESSAGE_CREATE = async (client, event, val) => {
     const baseParams = {};
     if (event.tag === 'INTERACTION_CREATE_C2C') {
@@ -426,7 +372,6 @@ const C2C_MESSAGE_CREATE = async (client, event, val) => {
         if (images && images.length > 0) {
             let url = '';
             for (let i = 0; i < images.length; i++) {
-                // 已经处理。
                 if (url) {
                     break;
                 }
@@ -476,14 +421,12 @@ const C2C_MESSAGE_CREATE = async (client, event, val) => {
                 }
                 else if (item.type === 'BT.group') {
                     const rows = item.value;
-                    // 构造成按钮
                     const content = createButtonsData(rows);
                     params['keyboard'] = {
                         content: content
                     };
                 }
                 else if (item.type === 'Markdown') {
-                    // 如果是markdown，获取内容
                     const content = createMarkdownText(item.value);
                     if (content) {
                         params['markdown'] = {
@@ -500,7 +443,6 @@ const C2C_MESSAGE_CREATE = async (client, event, val) => {
             });
             return [createResult(ResultCode.Ok, 'client.usersOpenMessages', { id: res.id })];
         }
-        // ark
         const ark = val.filter(item => item.type === 'Ark.BigCard' || item.type === 'Ark.Card' || item.type === 'Ark.list');
         if (ark && ark.length > 0) {
             const params = {};
@@ -544,13 +486,6 @@ const C2C_MESSAGE_CREATE = async (client, event, val) => {
     }
     return [];
 };
-/**
- * 频道私聊
- * @param client
- * @param event
- * @param val
- * @returns
- */
 const DIRECT_MESSAGE_CREATE = async (client, event, val) => {
     const baseParams = {};
     if (event.tag === 'INTERACTION_CREATE_GUILD') {
@@ -576,13 +511,11 @@ const DIRECT_MESSAGE_CREATE = async (client, event, val) => {
         if (images && images.length > 0) {
             let imageBuffer = null;
             for (let i = 0; i < images.length; i++) {
-                // 已经处理。
                 if (imageBuffer) {
                     break;
                 }
                 const item = images[i];
                 if (item.value === 'ImageURL') {
-                    // 请求得到buffer
                     const data = await axios
                         .get(item.value, {
                         responseType: 'arraybuffer'
@@ -615,14 +548,12 @@ const DIRECT_MESSAGE_CREATE = async (client, event, val) => {
                 }
                 else if (item.type === 'BT.group') {
                     const rows = item.value;
-                    // 构造成按钮
                     const content = createButtonsData(rows);
                     params['keyboard'] = {
                         content: content
                     };
                 }
                 else if (item.type === 'Markdown') {
-                    // 如果是markdown，获取内容
                     const content = createMarkdownText(item.value);
                     if (content) {
                         params['markdown'] = {
@@ -638,7 +569,6 @@ const DIRECT_MESSAGE_CREATE = async (client, event, val) => {
             });
             return [createResult(ResultCode.Ok, 'client.dmsMessage', { id: res.id })];
         }
-        // ark
         const ark = val.filter(item => item.type === 'Ark.BigCard' || item.type === 'Ark.Card' || item.type === 'Ark.list');
         if (ark && ark.length > 0) {
             const params = {};
@@ -676,12 +606,6 @@ const DIRECT_MESSAGE_CREATE = async (client, event, val) => {
         return [createResult(ResultCode.Fail, err?.response?.data ?? err?.message ?? err, null)];
     }
 };
-/**
- * 频道公聊
- * @param event
- * @param val
- * @returns
- */
 const MESSAGE_CREATE = async (client, event, val) => {
     const baseParams = {};
     if (event.tag === 'INTERACTION_CREATE_GUILD') {
@@ -718,13 +642,11 @@ const MESSAGE_CREATE = async (client, event, val) => {
         if (images && images.length > 0) {
             let imageBuffer = null;
             for (let i = 0; i < images.length; i++) {
-                // 已经处理。
                 if (imageBuffer) {
                     break;
                 }
                 const item = images[i];
                 if (item.value === 'ImageURL') {
-                    // 请求得到buffer
                     const data = await axios
                         .get(item.value, {
                         responseType: 'arraybuffer'
@@ -757,14 +679,12 @@ const MESSAGE_CREATE = async (client, event, val) => {
                 }
                 else if (item.type === 'BT.group') {
                     const rows = item.value;
-                    // 构造成按钮
                     const content = createButtonsData(rows);
                     params['keyboard'] = {
                         content: content
                     };
                 }
                 else if (item.type === 'Markdown') {
-                    // 如果是markdown，获取内容
                     const content = createMarkdownText(item.value);
                     if (content) {
                         params['markdown'] = {
@@ -780,7 +700,6 @@ const MESSAGE_CREATE = async (client, event, val) => {
             });
             return [createResult(ResultCode.Ok, 'client.channelsMessagesPost', { id: res.id })];
         }
-        // ark
         const ark = val.filter(item => item.type === 'Ark.BigCard' || item.type === 'Ark.Card' || item.type === 'Ark.list');
         if (ark && ark.length > 0) {
             const params = {};
@@ -818,13 +737,6 @@ const MESSAGE_CREATE = async (client, event, val) => {
         return [createResult(ResultCode.Fail, err?.response?.data ?? err?.message ?? err, null)];
     }
 };
-/**
- * 频道公聊 @
- * @param client
- * @param event
- * @param val
- * @returns
- */
 const AT_MESSAGE_CREATE = (client, event, val) => {
     return MESSAGE_CREATE(client, event, val);
 };

package/lib/utils.d.ts

@@ -0,0 +1 @@
+export declare const isGuild: (str: string) => boolean;

package/lib/utils.js

@@ -0,0 +1,8 @@
+const isGuild = (str) => {
+    if (isNaN(Number(str.substring(0, 6)))) {
+        return false;
+    }
+    return true;
+};
+
+export { isGuild };

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@alemonjs/qq-bot",
-  "version": "2.1.0-alpha.19",
-  "description": "阿柠檬qqbot平台连接",
+  "version": "2.1.0-alpha.20",
+  "description": "阿柠檬qq-bot平台连接",
   "author": "lemonade",
   "license": "MIT",
   "type": "module",
   "main": "lib/index.js",
   "scripts": {
-    "build": "node bundle.js"
+    "build": "lvy build"
   },
   "dependencies": {
     "axios": "^1.4.0",
@@ -74,4 +74,4 @@
     "type": "git",
     "url": "https://github.com/lemonade-lab/alemonjs.git"
   }
-}
+}