@alemonjs/qq-bot 2.1.30 → 2.1.32

package/lib/sdk/session.js

@@ -0,0 +1,56 @@
+import { readFile, mkdir, writeFile, rename, unlink } from 'node:fs/promises';
+import { randomUUID } from 'node:crypto';
+import { join, dirname } from 'node:path';
+
+class FileSessionStore {
+    root;
+    #queues = new Map();
+    #generations = new Map();
+    constructor(root = join(process.cwd(), '.data', 'qq-bot', 'sessions')) {
+        this.root = root;
+    }
+    #path(botId) {
+        return join(this.root, `${encodeURIComponent(botId)}.json`);
+    }
+    async load(botId) {
+        try {
+            const value = JSON.parse(await readFile(this.#path(botId), 'utf8'));
+            return value?.botId === botId && typeof value.sessionId === 'string' && Number.isFinite(value.sequence) ? value : null;
+        }
+        catch {
+            return null;
+        }
+    }
+    async save(session) {
+        const generation = this.#generations.get(session.botId) || 0;
+        await this.#enqueue(session.botId, async () => {
+            if (generation !== (this.#generations.get(session.botId) || 0))
+                return;
+            const path = this.#path(session.botId);
+            const temp = `${path}.${process.pid}.${randomUUID()}.tmp`;
+            await mkdir(dirname(path), { recursive: true });
+            await writeFile(temp, JSON.stringify(session), 'utf8');
+            await rename(temp, path);
+        });
+    }
+    async clear(botId) {
+        this.#generations.set(botId, (this.#generations.get(botId) || 0) + 1);
+        await this.#enqueue(botId, async () => {
+            await unlink(this.#path(botId)).catch(() => undefined);
+        });
+    }
+    #enqueue(botId, task) {
+        const previous = this.#queues.get(botId) || Promise.resolve();
+        const next = previous.catch(() => undefined).then(task);
+        this.#queues.set(botId, next);
+        void next
+            .finally(() => {
+            if (this.#queues.get(botId) === next)
+                this.#queues.delete(botId);
+        })
+            .catch(() => undefined);
+        return next;
+    }
+}
+
+export { FileSessionStore };

package/lib/sdk/typing.d.ts

@@ -1,4 +1,5 @@
 import { IntentsEnum } from './intents';
+import type { SessionStore } from './session.js';
 export type MessageType = 0 | 1 | 2 | 3 | 4 | 7;
 export type FileType = 1 | 2 | 3 | 4;
 export interface ButtonType {
@@ -68,4 +69,5 @@ export interface Options {
     gatewayURL?: string;
     base_url_gateway?: string;
     base_url_app_access_token?: string;
+    sessionStore?: SessionStore;
 }

package/lib/sends.js

@@ -188,6 +188,9 @@ const extractContent = (val, mode) => {
         'Image',
         'ImageFile',
         'ImageURL',
+        'Audio',
+        'Video',
+        'Attachment',
         'Markdown',
         'MarkdownOriginal',
         'BT.group',
@@ -301,14 +304,15 @@ const buildArkParams = (val) => {
 const filterImages = (val) => {
     return val.filter(item => item.type === 'Image' || item.type === 'ImageFile' || item.type === 'ImageURL');
 };
-const resolveRichMediaUrl = async (images, uploadMedia) => {
-    for (const item of images) {
+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'));
         }
-        else if (item.type === 'Image') {
+        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'));
             }
@@ -322,6 +326,9 @@ const resolveRichMediaUrl = async (images, uploadMedia) => {
             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;
             }
@@ -330,7 +337,7 @@ const resolveRichMediaUrl = async (images, uploadMedia) => {
             fileData = readFileSync(item.value, 'base64');
         }
         if (fileData) {
-            fileInfo = await uploadMedia({ file_type: 1, file_data: fileData }).then(res => res?.file_info);
+            fileInfo = await uploadMedia({ file_type: fileType, file_data: fileData }).then(res => res?.file_info);
         }
         if (fileInfo) {
             return fileInfo;
@@ -361,6 +368,7 @@ const sendOpenApiMessage = async (content, val, baseParams, uploadMedia, sendMes
     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) {
@@ -375,6 +383,19 @@ const sendOpenApiMessage = async (content, val, baseParams, uploadMedia, sendMes
         });
         return [createResult(ResultCode.Ok, label, { id: res.id })];
     }
+    if (richMedia.length > 0) {
+        const fileInfo = await resolveRichMediaUrl(richMedia, uploadMedia);
+        if (!fileInfo) {
+            return [createResult(ResultCode.Fail, '富媒体上传失败', null)];
+        }
+        const res = await sendMessage({
+            content: flattenMdToText(content, val),
+            media: { file_info: fileInfo },
+            msg_type: 7,
+            ...baseParams
+        });
+        return [createResult(ResultCode.Ok, label, { id: res.id })];
+    }
     if (config.hideUnsupported === true && !content && !buildMdAndButtonsParams(val) && !buildArkParams(val)) {
         logger.info('[qq-bot] hideUnsupported: 消息内容转换后为空，跳过发送');
         return [];

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "@alemonjs/qq-bot",
-  "version": "2.1.30",
+  "version": "2.1.32",
   "description": "阿柠檬qq-bot平台连接",
   "author": "lemonade",
   "license": "MIT",
   "type": "module",
   "main": "lib/index.js",
   "scripts": {
-    "build": "lvy build"
+    "build": "lvy build",
+    "test:ws": "yarn build && node tests/websocket.integration.mjs"
   },
   "dependencies": {
     "@noble/curves": "^1.7.0",
@@ -22,6 +23,7 @@
     "mime-types": "^2.1.35",
     "public-ip": "^6.0.1",
     "qrcode": "^1.5.3",
+    "uuid": "^14.0.1",
     "ws": "^8.13.0"
   },
   "peerDependencies": {
@@ -92,5 +94,5 @@
     "type": "git",
     "url": "https://github.com/lemonade-lab/alemonjs.git"
   },
-  "gitHead": "edc7f9c5c75f4f5eaf527bb1dfdb31882bde6d6c"
+  "gitHead": "ebea3f64e13a92c671a0ecd8af856c17ca44846d"
 }