koishi-plugin-chat-patch 2.0.0 → 2.1.0

package/lib/api-handlers.d.ts

@@ -0,0 +1,19 @@
+import { FileManager } from './file-manager';
+import { MessageHandler } from './message-handler';
+import { Context } from 'koishi';
+import { Config } from './config';
+export declare class ApiHandlers {
+    private ctx;
+    private config;
+    private fileManager;
+    private messageHandler;
+    private logger;
+    constructor(ctx: Context, config: Config, fileManager: FileManager, messageHandler: MessageHandler);
+    registerApiHandlers(): void;
+    private isFileUrl;
+    private createFileUrl;
+    private handleLocalFileRequest;
+    private setupTempFileCleanup;
+    private cleanupMediaCache;
+    private logInfo;
+}

package/lib/index.js

@@ -197,55 +197,118 @@ var MessageHandler = class {
   }
   // 更新频道信息到JSON文件
   async updateChannelInfoToFile(session) {
+    const isDirect = session.isDirect || session.channelId?.includes("private");
     let guildName = session.channelId;
-    let directUserName = session.username || session.userId || "未知用户";
+    const directUserName = session.username || session.event?.user?.name || session.userId;
     const data = this.fileManager.readChatDataFromFile();
-    try {
-      if (session.guildId && session.bot.getGuild && typeof session.bot.getGuild === "function") {
-        const guild = await session.bot.getGuild(session.guildId);
-        guildName = guild?.name || session.channelId;
-      }
-      if (session.userId && session.isDirect && session.bot.getUser && typeof session.bot.getUser === "function") {
-        try {
-          const user = await session.bot.getUser(session.userId);
-          directUserName = user?.name || session.username || session.userId || "未知用户";
-        } catch (userError) {
-          this.logInfo("获取用户信息失败，使用备用名称:", userError);
+    if (!isDirect) {
+      try {
+        if (session.guildId && session.bot.getGuild && typeof session.bot.getGuild === "function") {
+          const guild = await session.bot.getGuild(session.guildId);
+          guildName = guild?.name || session.channelId;
         }
-      }
-      if (session.guildId && !session.bot.getGuild && session.bot.getChannel && typeof session.bot.getChannel === "function") {
-        try {
-          const channel = await session.bot.getChannel(session.guildId);
-          guildName = channel?.name || session.channelId;
-        } catch (channelError) {
-          this.logInfo("获取频道信息失败，使用频道ID作为备用:", channelError);
+        if (session.guildId && !session.bot.getGuild && session.bot.getChannel && typeof session.bot.getChannel === "function") {
+          try {
+            const channel = await session.bot.getChannel(session.guildId);
+            guildName = channel?.name || session.channelId;
+          } catch (channelError) {
+            this.logInfo("获取频道信息失败，使用频道ID作为备用:", channelError);
+          }
         }
+      } catch (error) {
+        this.logInfo("获取频道信息失败，使用频道ID作为备用:", error);
+        guildName = session.channelId;
       }
-    } catch (error) {
-      this.logInfo("获取频道信息失败，使用频道ID作为备用:", error);
-      guildName = session.channelId;
     }
     if (!data.channels[session.selfId]) {
       data.channels[session.selfId] = {};
     }
+    const existingChannel = data.channels[session.selfId][session.channelId];
+    let finalName;
+    if (isDirect) {
+      if (directUserName && directUserName !== session.userId) {
+        finalName = `私聊（${directUserName}）`;
+      } else if (existingChannel?.name && !existingChannel.name.includes("未知")) {
+        finalName = existingChannel.name;
+      } else {
+        finalName = "私聊（未知用户）";
+      }
+    } else {
+      finalName = guildName || session.channelId;
+    }
     const channelInfo = {
       id: session.channelId,
-      name: session.isDirect ? `私聊（${session.username || session.userId || directUserName}）` : `${guildName} (${session.channelId})`,
+      name: finalName,
       type: session.type || 0,
       channelId: session.channelId,
       guildName,
-      isDirect: session.isDirect
+      isDirect: !!isDirect
     };
+    if (existingChannel && existingChannel.name !== finalName) {
+      this.logInfo("更新频道名称:", {
+        channelId: session.channelId,
+        oldName: existingChannel.name,
+        newName: finalName
+      });
+    }
     data.channels[session.selfId][session.channelId] = channelInfo;
     this.fileManager.writeChatDataToFile(data);
     this.logInfo("更新频道信息到文件:", channelInfo.name);
     return guildName;
   }
+  // 下载并缓存媒体文件
+  async downloadAndCacheMedia(url, type) {
+    try {
+      if (!url || url.startsWith("data:") || url.startsWith("file:")) return url;
+      let folder = "media";
+      if (type === "image") folder = "images";
+      else if (type === "avatar") folder = "avatars";
+      const dir = require("node:path").join(this.ctx.baseDir, "data", "chat-patch", "persist-media", folder);
+      if (!require("node:fs").existsSync(dir)) {
+        require("node:fs").mkdirSync(dir, { recursive: true });
+      }
+      const crypto = require("node:crypto");
+      const hash = crypto.createHash("md5").update(url).digest("hex");
+      const ext = require("node:path").extname(new URL(url).pathname) || (type === "image" ? ".jpg" : ".mp4");
+      const filename = `${hash}${ext}`;
+      const filePath = require("node:path").join(dir, filename);
+      if (require("node:fs").existsSync(filePath)) {
+        return require("node:url").pathToFileURL(filePath).href;
+      }
+      const buffer = await this.ctx.http.get(url, { responseType: "arraybuffer" });
+      require("node:fs").writeFileSync(filePath, Buffer.from(buffer));
+      return require("node:url").pathToFileURL(filePath).href;
+    } catch (e) {
+      return url;
+    }
+  }
+  // 处理消息中的媒体元素并缓存
+  async processMediaElements(elements) {
+    if (!elements) return elements;
+    for (const el of elements) {
+      if (["image", "img", "mface"].includes(el.type)) {
+        const src = el.attrs.src || el.attrs.url || el.attrs.file;
+        if (src) el.attrs.src = await this.downloadAndCacheMedia(src, "image");
+      } else if (["audio", "video"].includes(el.type)) {
+        const src = el.attrs.src || el.attrs.url || el.attrs.file;
+        if (src) el.attrs.src = await this.downloadAndCacheMedia(src, "media");
+      }
+      if (el.children) await this.processMediaElements(el.children);
+    }
+    return elements;
+  }
   async broadcastMessageEvent(session) {
     try {
       await this.updateBotInfoToFile(session);
       const guildName = await this.updateChannelInfoToFile(session);
+      const isDirect = session.isDirect || session.channelId?.includes("private");
       const timestamp = Date.now();
+      if (session.elements) {
+        await this.processMediaElements(session.elements);
+      }
+      if (session.quote?.elements) {
+        await this.processMediaElements(session.quote.elements);
+      }
       let quoteInfo = void 0;
       if (session.quote) {
         quoteInfo = {
@@ -290,7 +353,7 @@ var MessageHandler = class {
         guildName,
         platform: session.platform || "unknown",
         quote: quoteInfo ? this.utils.cleanBase64Content(quoteInfo) : void 0,
-        isDirect: session.isDirect
+        isDirect: !!isDirect
       };
       await this.fileManager.addMessageToFile(messageInfo);
       const messageEvent = {
@@ -323,22 +386,47 @@ var MessageHandler = class {
   async broadcastBotMessageEvent(session) {
     try {
       const correctChannelId = this.getCorrectChannelId(session.selfId);
-      this.logInfo("机器人发送消息调试信息:", {
-        "session.channelId": session.channelId,
-        "session.event?.channel?.id": session.event?.channel?.id,
-        "correctChannelId": correctChannelId,
-        "session.guildId": session.guildId,
-        "session.isDirect": session.isDirect,
-        "session.platform": session.platform
-      });
       const finalChannelId = correctChannelId || session.channelId;
       await this.updateBotInfoToFile(session);
       const guildName = await this.updateChannelInfoToFile(session);
+      const isDirect = session.isDirect || finalChannelId?.includes("private");
       const timestamp = Date.now();
+      if (session.event?.message?.elements) {
+        await this.processMediaElements(session.event.message.elements);
+      }
       let content = session.content || "";
       if (!content && session.event?.message?.elements) {
         content = this.utils.extractTextContent(session.event.message.elements).trim();
       }
+      let quoteInfo = void 0;
+      const quoteMatch = content.match(/<quote id="([^"]+)"\/>/);
+      if (quoteMatch) {
+        const quoteId = quoteMatch[1];
+        const data = this.fileManager.readChatDataFromFile();
+        const channelKey = `${session.selfId}:${finalChannelId}`;
+        const quotedMsg = data.messages[channelKey]?.find((m) => m.id === quoteId);
+        if (quotedMsg) {
+          const realId = quotedMsg.id.startsWith("bot-msg-") ? quotedMsg.realId : quotedMsg.id;
+          quoteInfo = {
+            messageId: realId || quotedMsg.id,
+            id: realId || quotedMsg.id,
+            content: quotedMsg.content,
+            elements: quotedMsg.elements,
+            user: {
+              id: quotedMsg.userId,
+              name: quotedMsg.username,
+              userId: quotedMsg.userId,
+              avatar: quotedMsg.avatar,
+              username: quotedMsg.username
+            },
+            timestamp: quotedMsg.timestamp
+          };
+          content = content.replace(/<quote id="[^"]+"\/>\s*/, "");
+          if (realId) {
+            session.content = session.content.replace(/id="[^"]+"/, `id="${realId}"`);
+          }
+        }
+      }
       const messageInfo = {
         id: `bot-msg-${timestamp}`,
         content,
@@ -352,7 +440,10 @@ var MessageHandler = class {
         type: "bot",
         guildName,
         platform: session.platform || "unknown",
-        isDirect: session.isDirect
+        quote: quoteInfo,
+        isDirect: !!isDirect,
+        sending: true
+        // 标记为正在发送
       };
       await this.fileManager.addMessageToFile(messageInfo);
       const messageEvent = {
@@ -369,26 +460,14 @@ var MessageHandler = class {
         guildName,
         channelType: session.event?.channel?.type || session.type || 0,
         elements: this.utils.cleanBase64Content(session.event?.message?.elements),
-        isDirect: session.isDirect,
+        quote: quoteInfo,
+        isDirect: !!isDirect,
+        sending: true,
         bot: {
           avatar: session.bot.user?.avatar,
           name: session.bot.user?.name
         }
       };
-      const imageElements = session.event?.message?.elements?.filter(
-        (element) => element.type === "img" || element.type === "image" || element.type === "mface"
-      ) || [];
-      this.logInfo("机器人发送消息 (before-send):", {
-        selfId: session.selfId,
-        channelId: messageEvent.channelId,
-        originalChannelId: session.channelId,
-        correctedChannelId: finalChannelId,
-        content,
-        platform: session.platform,
-        imageCount: imageElements.length,
-        imageUrls: imageElements.map((el) => el.attrs?.src || el.attrs?.url || el.attrs?.file)
-      });
-      this.correctChannelIds.delete(session.selfId);
       this.ctx.console.broadcast("chat-bot-message-event", messageEvent);
     } catch (error) {
       this.logger.error("广播机器人消息事件失败:", error);
@@ -574,19 +653,16 @@ var ApiHandlers = class {
     this.ctx.console.addListener("get-chat-data", async () => {
       try {
         const data = this.fileManager.readChatDataFromFile();
-        const cleanedData = this.fileManager.cleanExcessMessages(data);
-        this.logInfo("获取聊天数据:", {
-          机器人数量: Object.keys(cleanedData.bots).length,
-          频道数量: Object.keys(cleanedData.channels).reduce((total, botId) => total + Object.keys(cleanedData.channels[botId] || {}).length, 0),
-          消息频道数: Object.keys(cleanedData.messages).length,
-          总消息数: Object.values(cleanedData.messages).reduce((total, msgs) => total + msgs.length, 0)
-        });
+        this.logInfo("获取基础聊天数据");
         return {
           success: true,
           data: {
-            ...cleanedData,
-            pinnedBots: cleanedData.pinnedBots,
-            pinnedChannels: cleanedData.pinnedChannels
+            bots: data.bots || {},
+            channels: data.channels || {},
+            pinnedBots: data.pinnedBots || [],
+            pinnedChannels: data.pinnedChannels || [],
+            // 不返回 messages，由前端按需拉取
+            messages: {}
           }
         };
       } catch (error) {
@@ -731,31 +807,23 @@ var ApiHandlers = class {
         this.logInfo("消息发送成功:", result);
         const messageId = Array.isArray(result) ? result[0] : result;
         if (messageId) {
-          const bot2 = this.ctx.bots.find((b) => b.selfId === data.selfId);
-          const botMessageEvent = {
-            type: "bot-message-sent",
-            selfId: data.selfId,
-            platform: bot2?.platform || "unknown",
-            channelId: data.channelId,
-            messageId,
-            content: messageContent,
-            userId: data.selfId,
-            username: bot2?.user?.name || `Bot-${data.selfId}`,
-            avatar: bot2?.user?.avatar,
-            timestamp: Date.now(),
-            guildName: "",
-            // 这个信息在前端会补充
-            channelType: 0,
-            // 这个信息在前端会补充
-            elements: [],
-            // 这个信息在前端会补充
-            isDirect: false
-            // 这个信息在前端会补充
-          };
-          this.ctx.console.broadcast("bot-message-sent-event", botMessageEvent);
+          const chatData = this.fileManager.readChatDataFromFile();
+          const channelKey = `${data.selfId}:${data.channelId}`;
+          const messages = chatData.messages[channelKey] || [];
+          const msg = [...messages].reverse().find((m) => m.type === "bot" && m.sending);
+          if (msg) {
+            msg.realId = messageId;
+            msg.sending = false;
+            this.fileManager.writeChatDataToFile(chatData);
+            this.ctx.console.broadcast("bot-message-updated", {
+              channelKey,
+              tempId: msg.id,
+              realId: messageId
+            });
+          }
         }
         return {
-          success: true,
+          success: !!messageId,
           messageId,
           tempImageIds: data.images?.map((img) => img.tempId) || []
         };
@@ -923,6 +991,61 @@ var ApiHandlers = class {
         return { success: false, error: error?.message || String(error) };
       }
     });
+    this.ctx.console.addListener("get-user-info", async (data) => {
+      try {
+        const bot = this.ctx.bots.find((b) => b.selfId === data.selfId);
+        if (!bot) return { success: false, error: "机器人不存在" };
+        const user = await bot.getUser(data.userId, data.guildId);
+        if (user) {
+          if (user.avatar) {
+            user.avatar = await this.messageHandler.downloadAndCacheMedia(user.avatar, "avatar");
+          }
+          const chatData = this.fileManager.readChatDataFromFile();
+          let changed = false;
+          const botChannels = chatData.channels[data.selfId] || {};
+          const possibleChannelIds = [
+            data.userId,
+            `private:${data.userId}`,
+            `direct:${data.userId}`
+          ];
+          for (const channelId of possibleChannelIds) {
+            const channel = botChannels[channelId];
+            if (channel && channel.isDirect) {
+              const newName = `私聊（${user.name}）`;
+              if (channel.name !== newName) {
+                channel.name = newName;
+                changed = true;
+                this.logInfo("更新私聊频道名称:", { channelId, oldName: channel.name, newName });
+              }
+            }
+          }
+          const channelKeyPrefix = `${data.selfId}:`;
+          for (const [key, messages] of Object.entries(chatData.messages)) {
+            if (key.startsWith(channelKeyPrefix)) {
+              messages.forEach((msg) => {
+                if (msg.userId === data.userId) {
+                  if (user.name && msg.username !== user.name) {
+                    msg.username = user.name;
+                    changed = true;
+                  }
+                  if (user.avatar && msg.avatar !== user.avatar) {
+                    msg.avatar = user.avatar;
+                    changed = true;
+                  }
+                }
+              });
+            }
+          }
+          if (changed) {
+            this.fileManager.writeChatDataToFile(chatData);
+            this.ctx.console.broadcast("chat-data-updated", {});
+          }
+        }
+        return { success: true, data: user };
+      } catch (error) {
+        return { success: false, error: error?.message || "获取用户信息失败" };
+      }
+    });
     this.ctx.console.addListener("debug-get-raw-data", async () => {
       try {
         const data = this.fileManager.readChatDataFromFile();
@@ -979,61 +1102,32 @@ var ApiHandlers = class {
   // 设置定时清理临时文件
   setupTempFileCleanup() {
     setInterval(() => {
-      this.cleanupTempImagesByCount();
+      this.cleanupMediaCache();
     }, 5 * 60 * 1e3);
   }
-  // 基于数量清理临时图片（保留最新的N张）
-  async cleanupTempImagesByCount() {
-    try {
-      const tempDir = this.ctx.baseDir + "/data/chat-patch/temp";
-      if (!require("fs").existsSync(tempDir)) {
-        return;
-      }
-      const now = Date.now();
-      const protectionTime = 30 * 1e3;
-      const files = require("fs").readdirSync(tempDir).filter((file) => file.startsWith("temp_")).map((file) => {
-        const filePath = `${tempDir}/${file}`;
-        try {
-          const stats = require("fs").statSync(filePath);
-          const fileAge = now - stats.mtime.getTime();
-          return {
-            name: file,
-            path: filePath,
-            mtime: stats.mtime.getTime(),
-            age: fileAge,
-            protected: fileAge < protectionTime
-            // 是否在保护期内
-          };
-        } catch (error) {
-          return null;
-        }
-      }).filter((file) => file !== null).sort((a, b) => b.mtime - a.mtime);
-      const keepCount = this.config.keepTempImages;
-      let cleanedCount = 0;
-      let protectedCount = 0;
-      const protectedFiles = files.filter((file) => file.protected);
-      const deletableFiles = files.filter((file) => !file.protected);
-      protectedCount = protectedFiles.length;
-      if (deletableFiles.length > keepCount) {
-        const filesToDelete = deletableFiles.slice(keepCount);
-        for (const file of filesToDelete) {
+  // 统一清理媒体缓存
+  async cleanupMediaCache() {
+    const baseDir = this.ctx.baseDir + "/data/chat-patch/persist-media";
+    if (!require("node:fs").existsSync(baseDir)) return;
+    const cleanupDir = /* @__PURE__ */ __name((dirName, limit) => {
+      const dirPath = require("node:path").join(baseDir, dirName);
+      if (!require("node:fs").existsSync(dirPath)) return;
+      const files = require("node:fs").readdirSync(dirPath).map((file) => {
+        const filePath = require("node:path").join(dirPath, file);
+        const stats = require("node:fs").statSync(filePath);
+        return { name: file, path: filePath, mtime: stats.mtimeMs };
+      }).sort((a, b) => b.mtime - a.mtime);
+      if (files.length > limit) {
+        files.slice(limit).forEach((f) => {
           try {
-            if (require("fs").existsSync(file.path)) {
-              require("fs").unlinkSync(file.path);
-              cleanedCount++;
-              this.logInfo("清理多余临时图片:", file.path);
-            }
-          } catch (fileError) {
-            this.logger.warn("删除临时文件失败:", { file: file.name, error: fileError });
+            require("node:fs").unlinkSync(f.path);
+          } catch {
           }
-        }
-      }
-      if (cleanedCount > 0 || protectedCount > 0) {
-        this.logInfo(`基于数量清理完成，保留最新 ${keepCount} 张图片，清理了 ${cleanedCount} 张多余图片，保护了 ${protectedCount} 张新上传图片`);
+        });
       }
-    } catch (error) {
-      this.logger.warn("基于数量清理临时文件失败:", error);
-    }
+    }, "cleanupDir");
+    cleanupDir("images", 100);
+    cleanupDir("media", 20);
   }
   logInfo(...args) {
     if (this.config.loggerinfo) {

package/lib/message-handler.d.ts

@@ -0,0 +1,21 @@
+import { Context, Session } from 'koishi';
+import { FileManager } from './file-manager';
+import { Config } from './config';
+export declare class MessageHandler {
+    private ctx;
+    private config;
+    private fileManager;
+    private logger;
+    private utils;
+    private correctChannelIds;
+    constructor(ctx: Context, config: Config, fileManager: FileManager);
+    setCorrectChannelId(selfId: string, channelId: string): void;
+    getCorrectChannelId(selfId: string): string | undefined;
+    updateBotInfoToFile(session: Session): Promise<void>;
+    updateChannelInfoToFile(session: Session): Promise<string>;
+    downloadAndCacheMedia(url: string, type: 'image' | 'media' | 'avatar'): Promise<any>;
+    private processMediaElements;
+    broadcastMessageEvent(session: Session): Promise<void>;
+    broadcastBotMessageEvent(session: Session): Promise<void>;
+    private logInfo;
+}

package/lib/types.d.ts

@@ -0,0 +1,57 @@
+import { h } from 'koishi';
+export interface BotInfo {
+    selfId: string;
+    platform: string;
+    username: string;
+    avatar?: string;
+    status: 'online' | 'offline';
+}
+export interface ChannelInfo {
+    id: string;
+    name: string;
+    type: number | string;
+    channelId?: string;
+    guildName?: string;
+    isDirect?: boolean;
+}
+export interface QuoteInfo {
+    messageId: string;
+    id: string;
+    content: string;
+    elements?: h[];
+    user: {
+        id: string;
+        name: string;
+        userId: string;
+        avatar?: string;
+        username: string;
+    };
+    timestamp: number;
+}
+export interface MessageInfo {
+    id: string;
+    content: string;
+    userId: string;
+    username: string;
+    avatar?: string;
+    timestamp: number;
+    channelId: string;
+    selfId: string;
+    elements?: h[];
+    type: 'user' | 'bot';
+    guildId?: string;
+    guildName?: string;
+    platform: string;
+    quote?: QuoteInfo;
+    isDirect?: boolean;
+    sending?: boolean;
+    realId?: string;
+}
+export interface ChatData {
+    bots: Record<string, BotInfo>;
+    channels: Record<string, Record<string, ChannelInfo>>;
+    messages: Record<string, MessageInfo[]>;
+    pinnedBots: string[];
+    pinnedChannels: string[];
+    lastSaveTime?: number;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chat-patch",
   "description": "[<ruby>chat-patch<rp>（</rp><rt>点我预览效果</rt><rp>）</rp></ruby>](https://i0.hdslb.com/bfs/openplatform/71074dfc9e5256fc3333d8bd8478bec1af874046.png) 视奸小插件((bushi( (低性能警告)。手机端适配。灵感来自 chat 插件。",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [