@alemonjs/qq-bot 2.1.32 → 2.1.33

package/lib/sends.js

@@ -1,11 +1,31 @@
 import { readFileSync } from 'fs';
-import { createResult, ResultCode } from 'alemonjs';
+import { createResult, ResultCode, logger } from 'alemonjs';
 import axios from 'axios';
 import { dataEnumToText, markdownToText, buttonsToText } from './format.js';
 import { getQQBotConfig } from './config.js';
 
 const MAX_BUTTON_ROWS = 5;
 const MAX_BUTTONS_PER_ROW = 5;
+const BUTTON_STYLE_MAP = {
+    gray: 0,
+    blue: 1,
+    red: 3,
+    'blue-fill': 4
+};
+const resolveButtonStyle = (style) => {
+    if (typeof style === 'number') {
+        return style;
+    }
+    if (typeof style === 'string') {
+        if (BUTTON_STYLE_MAP[style] !== undefined) {
+            return BUTTON_STYLE_MAP[style];
+        }
+        if (style.trim() !== '' && !Number.isNaN(Number(style))) {
+            return Number(style);
+        }
+    }
+    return 0;
+};
 const createButtonsData = (rows, startId = 0) => {
     let id = startId;
     const clippedRows = rows.slice(0, MAX_BUTTON_ROWS);
@@ -18,25 +38,45 @@ const createButtonsData = (rows, startId = 0) => {
                 const typing = options?.type ?? 'command';
                 const typeMap = { command: 2, link: 0, call: 1 };
                 const rowData = options?.rawData ?? {};
+                const data = options?.data;
+                const modal = options?.modal ??
+                    (typeof data === 'object' && data
+                        ? {
+                            content: data.click,
+                            confirmText: data.confirm,
+                            cancelText: data.cancel
+                        }
+                        : undefined);
+                const action = {
+                    type: typeMap[typing],
+                    permission: {
+                        type: typeof options.permission?.type === 'undefined' ? 2 : options?.permission?.type,
+                        specify_user_ids: options?.permission?.userIds,
+                        specify_role_ids: options?.permission?.roleIds
+                    },
+                    unsupport_tips: options?.toolTip ?? '',
+                    data: typeof data === 'string' ? data : '',
+                    at_bot_show_channel_list: options?.atBotShowChannelList ?? false,
+                    enter: options?.autoEnter ?? false,
+                    reply: options?.reply ?? false,
+                    anchor: options?.anchor ?? 0,
+                    click_limit: options?.clickLimit
+                };
+                if (modal) {
+                    action.modal = {
+                        content: modal.content ?? '是否确认操作?',
+                        confirm_text: modal.confirmText ?? '是',
+                        cancel_text: modal.cancelText ?? '否'
+                    };
+                }
                 return {
                     id: String(id),
                     render_data: {
                         label: value,
                         visited_label: value,
-                        style: options.style !== 'blue' ? 0 : 1
-                    },
-                    action: {
-                        type: typeMap[typing],
-                        permission: {
-                            type: typeof options.permission?.type === 'undefined' ? 2 : options?.permission?.type,
-                            specify_user_ids: options?.permission?.userIds,
-                            specify_role_ids: options?.permission?.roleIds
-                        },
-                        unsupport_tips: options?.toolTip ?? '',
-                        data: options?.data ?? '',
-                        at_bot_show_channel_list: false,
-                        enter: options?.autoEnter ?? false
+                        style: resolveButtonStyle(options?.style)
                     },
+                    action,
                     ...rowData
                 };
             })
@@ -235,6 +275,7 @@ const buildMdAndButtonsParams = (val) => {
         return null;
     }
     const params = {};
+    let keyboardExtra;
     for (const item of items) {
         if (item.type === 'ButtonTemplate') {
             if (item?.value) {
@@ -242,6 +283,13 @@ const buildMdAndButtonsParams = (val) => {
             }
         }
         else if (item.type === 'BT.group' && typeof item?.value !== 'string') {
+            const groupOptions = item?.options ?? {};
+            if (groupOptions.smallButton || groupOptions.rawData) {
+                keyboardExtra = {
+                    smallButton: keyboardExtra?.smallButton || groupOptions.smallButton,
+                    rawData: groupOptions.rawData
+                };
+            }
             if (params['keyboard']?.content?.rows) {
                 const existingRows = params['keyboard'].content.rows;
                 const currentId = params['keyboard'].content.nextId ?? existingRows.length;
@@ -277,6 +325,14 @@ const buildMdAndButtonsParams = (val) => {
             }
         }
     }
+    if (keyboardExtra && params['keyboard']?.content) {
+        if (keyboardExtra.smallButton) {
+            params['keyboard'].content.style = { font_size: 'small' };
+        }
+        if (keyboardExtra.rawData) {
+            Object.assign(params['keyboard'].content, keyboardExtra.rawData);
+        }
+    }
     if (params['keyboard']?.content?.nextId !== undefined) {
         delete params['keyboard'].content.nextId;
     }
@@ -301,50 +357,66 @@ const buildArkParams = (val) => {
     }
     return params;
 };
+const MEDIA_FILE_TYPE = {
+    Image: 1,
+    ImageFile: 1,
+    ImageURL: 1,
+    Video: 2,
+    Audio: 3,
+    Attachment: 4
+};
+const filterMedia = (val) => {
+    return val.filter(item => MEDIA_FILE_TYPE[item.type] !== undefined);
+};
 const filterImages = (val) => {
     return val.filter(item => item.type === 'Image' || item.type === 'ImageFile' || item.type === 'ImageURL');
 };
-const resolveRichMediaUrl = async (items, uploadMedia) => {
-    for (const item of items) {
-        let fileData;
-        let fileInfo;
-        const fileType = item.type === 'Video' ? 2 : item.type === 'Audio' ? 3 : item.type === 'Attachment' ? 4 : 1;
-        if (item.type === 'ImageURL') {
-            fileData = await axios.get(item.value, { responseType: 'arraybuffer' }).then(res => Buffer.from(res.data, 'binary').toString('base64'));
+const resolveFileData = async (item) => {
+    if (item.type === 'ImageURL') {
+        return await axios.get(item.value, { responseType: 'arraybuffer' }).then(res => Buffer.from(res.data, 'binary').toString('base64'));
+    }
+    if (item.type === 'ImageFile') {
+        return readFileSync(item.value, 'base64');
+    }
+    const value = item.value;
+    if (typeof value === 'string') {
+        if (value.startsWith('https://') || value.startsWith('http://')) {
+            return await axios.get(value, { responseType: 'arraybuffer' }).then(res => Buffer.from(res.data, 'binary').toString('base64'));
         }
-        else if (item.type === 'Image' || item.type === 'Audio' || item.type === 'Video' || item.type === 'Attachment') {
-            if (typeof item.value === 'string' && (item.value.startsWith('https://') || item.value.startsWith('http://'))) {
-                fileData = await axios.get(item.value, { responseType: 'arraybuffer' }).then(res => Buffer.from(res.data, 'binary').toString('base64'));
-            }
-            else if (typeof item.value === 'string' && item.value.startsWith('file://')) {
-                const localFilePath = item.value.replace('file://', '');
-                fileData = readFileSync(localFilePath, 'base64');
-            }
-            else if (typeof item.value === 'string' && item.value.startsWith('base64://')) {
-                fileData = item.value.replace('base64://', '');
-            }
-            else if (Buffer.isBuffer(item.value)) {
-                fileData = item.value.toString('base64');
-            }
-            else if (typeof item.value === 'string' && item.value.startsWith('buffer://')) {
-                fileData = item.value.replace('buffer://', '');
-            }
-            else if (typeof item.value === 'string') {
-                fileData = item.value;
-            }
+        if (value.startsWith('buffer://')) {
+            return value.replace('buffer://', '');
         }
-        else if (item.type === 'ImageFile') {
-            fileData = readFileSync(item.value, 'base64');
+        if (value.startsWith('file://')) {
+            return readFileSync(value.replace('file://', ''), 'base64');
         }
-        if (fileData) {
-            fileInfo = await uploadMedia({ file_type: fileType, file_data: fileData }).then(res => res?.file_info);
+        if (value.startsWith('base64://')) {
+            return value.replace('base64://', '');
         }
-        if (fileInfo) {
-            return fileInfo;
+        return value;
+    }
+    if (Buffer.isBuffer(value)) {
+        return value.toString('base64');
+    }
+    return undefined;
+};
+const resolveMediaUrl = async (media, uploadMedia) => {
+    for (const item of media) {
+        const fileData = await resolveFileData(item);
+        if (fileData) {
+            const fileInfo = await uploadMedia({ file_type: MEDIA_FILE_TYPE[item.type] ?? 1, file_data: fileData }).then(res => res?.file_info);
+            if (fileInfo) {
+                return fileInfo;
+            }
         }
     }
     return undefined;
 };
+const stripMediaPlaceholders = (text) => text
+    .replace(/\[附件[^\]]*\]/g, '')
+    .replace(/\[音频\]/g, '')
+    .replace(/\[视频\]/g, '')
+    .replace(/\n{2,}/g, '\n')
+    .trim();
 const flattenMdToText = (content, val) => {
     const mdItems = val.filter(item => item.type === 'Markdown');
     const btnItems = val.filter(item => item.type === 'BT.group');
@@ -364,32 +436,18 @@ const flattenMdToText = (content, val) => {
         .join('\n')
         .replace(/^[^\S\n\r]+|[^\S\n\r]+$/g, '');
 };
-const sendOpenApiMessage = async (content, val, baseParams, uploadMedia, sendMessage, label) => {
+const sendOpenApiMessage = async (content, val, baseParams, uploadMedia, sendMessage, label, options) => {
     const config = getQQBotConfig();
     const mdToText = config.markdownToText === true;
-    const images = filterImages(val);
-    const richMedia = val.filter(item => item.type === 'Audio' || item.type === 'Video' || item.type === 'Attachment');
-    if (images.length > 0) {
-        const url = await resolveRichMediaUrl(images, uploadMedia);
-        if (!url) {
-            return [createResult(ResultCode.Fail, '图片上传失败', null)];
-        }
-        const imgContent = flattenMdToText(content, val);
-        const res = await sendMessage({
-            content: imgContent,
-            media: { file_info: url },
-            msg_type: 7,
-            ...baseParams
-        });
-        return [createResult(ResultCode.Ok, label, { id: res.id })];
-    }
-    if (richMedia.length > 0) {
-        const fileInfo = await resolveRichMediaUrl(richMedia, uploadMedia);
+    const media = filterMedia(val);
+    if (media.length > 0) {
+        const fileInfo = await resolveMediaUrl(media, uploadMedia);
         if (!fileInfo) {
-            return [createResult(ResultCode.Fail, '富媒体上传失败', null)];
+            return [createResult(ResultCode.Fail, '媒体上传失败', null)];
         }
+        const mediaContent = stripMediaPlaceholders(flattenMdToText(content, val));
         const res = await sendMessage({
-            content: flattenMdToText(content, val),
+            content: mediaContent,
             media: { file_info: fileInfo },
             msg_type: 7,
             ...baseParams
@@ -413,7 +471,7 @@ const sendOpenApiMessage = async (content, val, baseParams, uploadMedia, sendMes
         if (mdParams.markdown?.content && content) {
             mdParams.markdown.content = content + '\n' + mdParams.markdown.content;
         }
-        const res = await sendMessage({ content, msg_type: 2, ...mdParams, ...baseParams });
+        const res = await sendMessage({ content, msg_type: 2, ...mdParams, ...baseParams, force_verify_image_resource: options?.forceVerifyImageResource });
         return [createResult(ResultCode.Ok, label, { id: res.id })];
     }
     const arkParams = buildArkParams(val);
@@ -494,21 +552,21 @@ const sendGuildMessage = async (content, val, baseParams, sendMessage, label) =>
     }
     return [];
 };
-const GROUP_AT_MESSAGE_CREATE = async (client, event, val) => {
+const GROUP_AT_MESSAGE_CREATE = async (client, event, val, options) => {
     const baseParams = buildBaseParams(event._tag, event.MessageId, 'INTERACTION_CREATE_GROUP');
     const content = extractContent(val, 'group');
     try {
-        return await sendOpenApiMessage(content, val, baseParams, data => client.postRichMediaByGroup(event.ChannelId, data), data => client.groupOpenMessages(event.ChannelId, data), 'client.groupOpenMessages');
+        return await sendOpenApiMessage(content, val, baseParams, data => client.postRichMediaByGroup(event.ChannelId, data), data => client.groupOpenMessages(event.ChannelId, data), 'client.groupOpenMessages', options);
     }
     catch (err) {
         return [createResult(ResultCode.Fail, err?.response?.data ?? err?.message ?? err, null)];
     }
 };
-const C2C_MESSAGE_CREATE = async (client, event, val) => {
+const C2C_MESSAGE_CREATE = async (client, event, val, options) => {
     const baseParams = buildBaseParams(event._tag, event.MessageId, 'INTERACTION_CREATE_C2C');
     const content = extractContent(val, 'group');
     try {
-        return await sendOpenApiMessage(content, val, baseParams, data => client.postRichMediaByUser(event.UserId, data), data => client.usersOpenMessages(event.UserId, data), 'client.usersOpenMessages');
+        return await sendOpenApiMessage(content, val, baseParams, data => client.postRichMediaByUser(event.UserId, data), data => client.usersOpenMessages(event.UserId, data), 'client.usersOpenMessages', options);
     }
     catch (err) {
         return [createResult(ResultCode.Fail, err?.response?.data ?? err?.message ?? err, null)];

package/lib/upload.d.ts

@@ -0,0 +1,21 @@
+import type { QQBotAPI } from './sdk/api';
+import { FileType } from './sdk/typing';
+export declare const CHUNK_THRESHOLD = 10002432;
+export declare const fileDataToBuffer: (fileData: any) => Buffer | null;
+export declare const computeFileDigests: (filePath: string) => {
+    buffer: NonSharedBuffer;
+    md5: string;
+    sha1: string;
+    md5_10m: string;
+};
+export declare const chunkedUpload: (client: QQBotAPI, scope: "user" | "group", openId: string, file: string | Buffer, options: {
+    file_type: FileType;
+    file_name?: string;
+    srv_send_msg?: boolean;
+}) => Promise<{
+    file_uuid: string;
+    file_info: string;
+    ttl: number;
+    id?: string;
+    raw_url?: string;
+}>;

package/lib/upload.js

@@ -0,0 +1,60 @@
+import { createHash } from 'crypto';
+import { readFileSync } from 'fs';
+
+const CHUNK_THRESHOLD = 10002432;
+const fileDataToBuffer = (fileData) => {
+    if (!fileData) {
+        return null;
+    }
+    if (Buffer.isBuffer(fileData)) {
+        return fileData;
+    }
+    if (typeof fileData === 'string') {
+        if (fileData.indexOf('base64://') === 0) {
+            return Buffer.from(fileData.replace('base64://', ''), 'base64');
+        }
+        return Buffer.from(fileData, 'base64');
+    }
+    return null;
+};
+const computeFileDigests = (filePath) => {
+    const buffer = readFileSync(filePath);
+    const md5 = createHash('md5').update(buffer).digest('hex');
+    const sha1 = createHash('sha1').update(buffer).digest('hex');
+    const md5_10m = createHash('md5').update(buffer.subarray(0, CHUNK_THRESHOLD)).digest('hex');
+    return { buffer, md5, sha1, md5_10m };
+};
+const chunkedUpload = async (client, scope, openId, file, options) => {
+    const buffer = typeof file === 'string' ? readFileSync(file) : file;
+    const md5 = createHash('md5').update(buffer).digest('hex');
+    const sha1 = createHash('sha1').update(buffer).digest('hex');
+    const md5_10m = createHash('md5').update(buffer.subarray(0, CHUNK_THRESHOLD)).digest('hex');
+    const file_name = options.file_name ?? (typeof file === 'string' ? (file.split(/[\\/]/).pop() ?? 'file') : 'file');
+    const prepareData = {
+        file_type: options.file_type,
+        file_name,
+        file_size: String(buffer.byteLength),
+        md5,
+        sha1,
+        md5_10m
+    };
+    const prepare = await (scope === 'user' ? client.usersUploadPrepare(openId, prepareData) : client.groupUploadPrepare(openId, prepareData));
+    const blockSize = Number(prepare.block_size);
+    for (const part of prepare.parts) {
+        const start = part.index * blockSize;
+        const chunk = Buffer.from(buffer.subarray(start, start + Number(part.block_size)));
+        const partMd5 = createHash('md5').update(chunk).digest('hex');
+        await client.uploadPartDirect(part.presigned_url, chunk);
+        const finishData = {
+            upload_id: prepare.upload_id,
+            part_index: part.index,
+            block_size: part.block_size,
+            md5: partMd5
+        };
+        await (scope === 'user' ? client.usersUploadPartFinish(openId, finishData) : client.groupUploadPartFinish(openId, finishData));
+    }
+    const merge = { file_type: options.file_type, upload_id: prepare.upload_id, file_name, srv_send_msg: options.srv_send_msg };
+    return scope === 'user' ? client.postRichMediaByUser(openId, merge) : client.postRichMediaByGroup(openId, merge);
+};
+
+export { CHUNK_THRESHOLD, chunkedUpload, computeFileDigests, fileDataToBuffer };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@alemonjs/qq-bot",
-  "version": "2.1.32",
-  "description": "阿柠檬qq-bot平台连接",
+  "version": "2.1.33",
+  "description": "QQ官方平台",
   "author": "lemonade",
   "license": "MIT",
   "type": "module",
@@ -55,7 +55,7 @@
       }
     ],
     "config-source": {
-      "readme": "https://github.com/lemonade-lab/alemonjs/blob/main/packages/qq-bot/README.md",
+      "readme": "https://raw.githubusercontent.com/lemonade-lab/alemonjs/main/packages/qq-bot/README.md",
       "official": "https://bot.q.qq.com/wiki/develop/api-v2/",
       "platform": "https://q.qq.com/"
     },
@@ -94,5 +94,5 @@
     "type": "git",
     "url": "https://github.com/lemonade-lab/alemonjs.git"
   },
-  "gitHead": "ebea3f64e13a92c671a0ecd8af856c17ca44846d"
+  "gitHead": "6c93b0455b8db78ffa1a83becc1c2de19ba544db"
 }