koishi-plugin-chat-patch 2.2.0 → 2.3.0

package/src/message-handler.ts

@@ -8,7 +8,7 @@ import { } from '@koishijs/plugin-console'
 export class MessageHandler {
   private logger: Logger
   private utils: Utils
-  // 存储正确的 channelId 映射，key 是 selfId，value 是正确的 channelId
+
   private correctChannelIds: Map<string, string> = new Map()
 
   constructor(
@@ -20,118 +20,152 @@ export class MessageHandler {
     this.utils = new Utils(config)
   }
 
-  // 设置正确的 channelId
+  recordUserMessage(session: Session, timestamp: number) {
+
+    setImmediate(() => {
+      this.processUserMessage(session, timestamp).catch(error => {
+        this.logger.error('记录用户消息失败:', error)
+      })
+    })
+  }
+
+  recordBotMessage(session: Session, timestamp: number) {
+
+    setImmediate(() => {
+      this.processBotMessage(session, timestamp).catch(error => {
+        this.logger.error('记录机器人消息失败:', error)
+      })
+    })
+  }
+
   setCorrectChannelId(selfId: string, channelId: string) {
     this.correctChannelIds.set(selfId, channelId)
     this.logInfo('设置正确的 channelId:', { selfId, channelId })
   }
 
-  // 获取正确的 channelId
   getCorrectChannelId(selfId: string): string | undefined {
     return this.correctChannelIds.get(selfId)
   }
 
-  // 更新机器人信息到JSON文件
-  async updateBotInfoToFile(session: Session) {
-    const data = this.fileManager.readChatDataFromFile()
-
-    const botInfo: BotInfo = {
-      selfId: session.selfId,
-      platform: session.platform || 'unknown',
-      username: session.bot.user?.name || `Bot-${session.selfId}`,
-      avatar: session.bot.user?.avatar,
-      status: 'online'
-    }
-
-    data.bots[session.selfId] = botInfo
-    this.fileManager.writeChatDataToFile(data)
-    this.logInfo('更新机器人信息到文件:', botInfo.username)
-  }
-
-  // 更新频道信息到JSON文件
-  async updateChannelInfoToFile(session: Session): Promise<string> {
-    const isDirect = session.isDirect || session.channelId?.includes('private')
-    let guildName = session.channelId
-    // 直接使用 session.username 作为私聊用户名
-    const directUserName = session.username || session.event?.user?.name || session.userId
+  updateBotInfoToFile(session: Session) {
 
-    const data = this.fileManager.readChatDataFromFile()
-
-    if (!isDirect) {
+    setImmediate(() => {
       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
-        }
+        const data = this.fileManager.readChatDataFromFile()
 
-        // 如果没有getGuild方法，尝试使用getChannel方法
-        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)
-          }
+        const botInfo: BotInfo = {
+          selfId: session.selfId,
+          platform: session.platform || 'unknown',
+          username: session.bot.user?.name || `Bot-${session.selfId}`,
+          avatar: session.bot.user?.avatar,
+          status: 'online'
         }
+
+        data.bots[session.selfId] = botInfo
+        this.fileManager.writeChatDataToFile(data)
+        this.logInfo('更新机器人信息到文件:', botInfo.username)
       } catch (error) {
-        this.logInfo('获取频道信息失败，使用频道ID作为备用:', error)
-        guildName = session.channelId
+        this.logger.error('更新机器人信息失败:', error)
       }
-    }
+    })
+  }
 
-    if (!data.channels[session.selfId]) {
-      data.channels[session.selfId] = {}
-    }
+  updateChannelInfoToFile(session: Session): string {
+    const isDirect = session.isDirect || session.channelId?.includes('private')
+    const directUserName = session.username || session.event?.user?.name || session.userId
 
-    // 获取现有频道信息
-    const existingChannel = data.channels[session.selfId][session.channelId]
+    const data = this.fileManager.readChatDataFromFile()
+    const existingChannel = data.channels[session.selfId]?.[session.channelId]
 
-    // 构造频道名称
-    let finalName: string
+    let immediateName = session.channelId
     if (isDirect) {
-      // 私聊频道：优先使用真实用户名
       if (directUserName && directUserName !== session.userId) {
-        finalName = `私聊（${directUserName}）`
+        immediateName = `私聊（${directUserName}）`
       } else if (existingChannel?.name && !existingChannel.name.includes('未知')) {
-        // 如果已有名称且不是"未知用户"，保持原名称
-        finalName = existingChannel.name
+        immediateName = existingChannel.name
       } else if (session.platform && session.platform.toLowerCase().includes('sandbox')) {
-        // sandbox 平台直接使用 userId 作为频道名称
-        finalName = `私聊（${session.userId}）`
+        immediateName = `私聊（${session.userId}）`
       } else {
-        finalName = '私聊（未知用户）'
+        immediateName = '私聊（未知用户）'
       }
-    } else {
-      finalName = guildName || session.channelId
+    } else if (existingChannel?.guildName) {
+      immediateName = existingChannel.guildName
     }
 
-    const channelInfo: ChannelInfo = {
-      id: session.channelId,
-      name: finalName,
-      type: session.type || 0,
-      channelId: session.channelId,
-      guildName: guildName,
-      isDirect: !!isDirect
-    }
+    setImmediate(async () => {
+      try {
+        let guildName = session.channelId
 
-    // 记录名称变化
-    if (existingChannel && existingChannel.name !== finalName) {
-      this.logInfo('更新频道名称:', {
-        channelId: session.channelId,
-        oldName: existingChannel.name,
-        newName: finalName
-      })
-    }
+        if (!isDirect) {
+          try {
 
-    data.channels[session.selfId][session.channelId] = channelInfo
-    this.fileManager.writeChatDataToFile(data)
-    this.logInfo('更新频道信息到文件:', channelInfo.name)
+            if (session.guildId && session.bot.getGuild && typeof session.bot.getGuild === 'function') {
+              const guild = await session.bot.getGuild(session.guildId)
+              guildName = guild?.name || session.channelId
+            } else 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
+          }
+        }
+
+        const freshData = this.fileManager.readChatDataFromFile()
+        if (!freshData.channels[session.selfId]) {
+          freshData.channels[session.selfId] = {}
+        }
 
-    return guildName
+        const existingChannel = freshData.channels[session.selfId][session.channelId]
+
+        let finalName: string
+        if (isDirect) {
+          if (directUserName && directUserName !== session.userId) {
+            finalName = `私聊（${directUserName}）`
+          } else if (existingChannel?.name && !existingChannel.name.includes('未知')) {
+            finalName = existingChannel.name
+          } else if (session.platform && session.platform.toLowerCase().includes('sandbox')) {
+            finalName = `私聊（${session.userId}）`
+          } else {
+            finalName = '私聊（未知用户）'
+          }
+        } else {
+          finalName = guildName || session.channelId
+        }
+
+        const channelInfo: ChannelInfo = {
+          id: session.channelId,
+          name: finalName,
+          type: session.type || 0,
+          channelId: session.channelId,
+          guildName: guildName,
+          isDirect: !!isDirect
+        }
+
+        if (existingChannel && existingChannel.name !== finalName) {
+          this.logInfo('更新频道名称:', {
+            channelId: session.channelId,
+            oldName: existingChannel.name,
+            newName: finalName
+          })
+        }
+
+        freshData.channels[session.selfId][session.channelId] = channelInfo
+        this.fileManager.writeChatDataToFile(freshData)
+        this.logInfo('更新频道信息到文件:', channelInfo.name)
+      } catch (error) {
+        this.logger.error('异步更新频道信息失败:', error)
+      }
+    })
+
+    return immediateName
   }
 
-  // 下载并缓存媒体文件
   public async downloadAndCacheMedia(url: string, type: 'image' | 'media' | 'avatar') {
     try {
       if (!url || url.startsWith('data:') || url.startsWith('file:')) return url
@@ -145,7 +179,6 @@ export class MessageHandler {
         require('node:fs').mkdirSync(dir, { recursive: true })
       }
 
-      // 使用 URL 的 hash 作为文件名，避免重复下载
       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')
@@ -165,47 +198,54 @@ export class MessageHandler {
     }
   }
 
-  // 处理消息中的媒体元素并缓存
-  // 只缓存用户的图片和语音，不缓存视频和文件
-  private async processMediaElements(elements: h[], isUserMessage: boolean = true) {
-    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 && isUserMessage) {
-          // 只缓存用户消息的图片
-          el.attrs.src = await this.downloadAndCacheMedia(src, 'image')
-        }
-      } else if (el.type === 'audio') {
-        const src = el.attrs.src || el.attrs.url || el.attrs.file
-        if (src && isUserMessage) {
-          // 只缓存用户消息的语音
-          el.attrs.src = await this.downloadAndCacheMedia(src, 'media')
+  private processMediaElementsAsync(elements: h[], isUserMessage: boolean = true) {
+    if (!elements) return
+
+    setImmediate(async () => {
+      try {
+        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 && isUserMessage) {
+
+              this.downloadAndCacheMedia(src, 'image').catch(e => {
+                this.logger.warn('缓存图片失败:', e)
+              })
+            }
+          } else if (el.type === 'audio') {
+            const src = el.attrs.src || el.attrs.url || el.attrs.file
+            if (src && isUserMessage) {
+
+              this.downloadAndCacheMedia(src, 'media').catch(e => {
+                this.logger.warn('缓存语音失败:', e)
+              })
+            }
+          }
+
+          if (el.children) this.processMediaElementsAsync(el.children, isUserMessage)
         }
+      } catch (error) {
+        this.logger.error('处理媒体元素失败:', error)
       }
-      // 视频和文件不再缓存，保持原始URL
-      if (el.children) await this.processMediaElements(el.children, isUserMessage)
-    }
-    return elements
+    })
   }
 
-  async broadcastMessageEvent(session: Session) {
+  private async processUserMessage(session: Session, timestamp?: number) {
     try {
-      await this.updateBotInfoToFile(session)
-      const guildName = await this.updateChannelInfoToFile(session)
-      const isDirect = session.isDirect || session.channelId?.includes('private')
+      if (!timestamp) timestamp = Date.now()
+
+      this.updateBotInfoToFile(session)
 
-      const timestamp = Date.now()
+      const guildName = this.updateChannelInfoToFile(session)
+      const isDirect = session.isDirect || session.channelId?.includes('private')
 
-      // 处理媒体缓存 - 用户消息只缓存图片和语音
       if (session.elements) {
-        await this.processMediaElements(session.elements, true)
+        this.processMediaElementsAsync(session.elements, true)
       }
       if (session.quote?.elements) {
-        await this.processMediaElements(session.quote.elements, true)
+        this.processMediaElementsAsync(session.quote.elements, true)
       }
 
-      // 处理 quote 信息
       let quoteInfo: QuoteInfo | undefined = undefined
       if (session.quote) {
         quoteInfo = {
@@ -224,7 +264,6 @@ export class MessageHandler {
         }
       }
 
-      // 从 session 中提取用户消息内容
       let content = ''
       let elements: h[] = []
 
@@ -244,7 +283,6 @@ export class MessageHandler {
         }
       }
 
-      // 创建消息信息对象
       const messageInfo: MessageInfo = {
         id: session.event?.message?.id || `msg-${timestamp}`,
         content: content || session.content || '',
@@ -288,47 +326,37 @@ export class MessageHandler {
 
       this.ctx.console.broadcast('chat-message-event', messageEvent)
     } catch (error) {
-      this.logger.error('广播消息事件失败:', error)
+      this.logger.error('处理用户消息失败:', error)
     }
   }
 
-  // 处理机器人发送的消息
-  async broadcastBotMessageEvent(session: Session) {
+  private async processBotMessage(session: Session, timestamp?: number) {
     try {
-      // 获取正确的 channelId
-      const correctChannelId = this.getCorrectChannelId(session.selfId)
+      if (!timestamp) timestamp = Date.now()
 
-      // 使用正确的 channelId，如果没有则使用 session.channelId
+      const correctChannelId = this.getCorrectChannelId(session.selfId)
       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()
+      this.updateBotInfoToFile(session)
 
-      // 机器人消息不缓存任何媒体
-      // 保持原始URL，不进行缓存处理
+      const guildName = this.updateChannelInfoToFile(session)
+      const isDirect = session.isDirect || finalChannelId?.includes('private')
 
-      // 优先使用 session.content，它包含了完整的消息内容（含标签）
       let content = session.content || ''
 
       if (!content && session.event?.message?.elements) {
         content = this.utils.extractTextContent(session.event.message.elements).trim()
       }
 
-      // 尝试从 content 中提取 quote id 并构建 quote 对象
       let quoteInfo: QuoteInfo | undefined = undefined
       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) {
-          // 如果是虚拟 ID，尝试获取其真实的 messageId
           const realId = quotedMsg.id.startsWith('bot-msg-') ? (quotedMsg as any).realId : quotedMsg.id
 
           quoteInfo = {
@@ -345,10 +373,8 @@ export class MessageHandler {
             },
             timestamp: quotedMsg.timestamp
           }
-          // 移除 content 中的 quote 标签，避免重复显示
           content = content.replace(/<quote id="[^"]+"\/>\s*/, '')
 
-          // 修正 content 中的 quote 标签为真实 ID，以便 bot.sendMessage 能够正确识别
           if (realId) {
             session.content = session.content.replace(/id="[^"]+"/, `id="${realId}"`)
           }
@@ -374,6 +400,7 @@ export class MessageHandler {
         sending: true // 标记为正在发送
       }
 
+      // 异步保存消息（不阻塞）
       await this.fileManager.addMessageToFile(messageInfo)
 
       const messageEvent = {
@@ -401,7 +428,7 @@ export class MessageHandler {
 
       this.ctx.console.broadcast('chat-bot-message-event', messageEvent)
     } catch (error) {
-      this.logger.error('广播机器人消息事件失败:', error)
+      this.logger.error('处理机器人消息失败:', error)
     }
   }
 

package/src/types.ts

@@ -1,62 +1,62 @@
-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
-}
+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/src/utils.ts

@@ -8,7 +8,6 @@ import { pathToFileURL } from 'node:url'
 export class Utils {
   constructor(private config: Config, private ctx?: Context) { }
 
-  // 检查平台是否被屏蔽
   isPlatformBlocked(platform: string): boolean {
     if (!this.config.blockedPlatforms || this.config.blockedPlatforms.length === 0) {
       return false
@@ -29,7 +28,6 @@ export class Utils {
     return false
   }
 
-  // 递归提取所有文本内容的函数
   extractTextContent(elements: any[]): string {
     let text = ''
     for (const element of elements) {
@@ -46,16 +44,13 @@ export class Utils {
     return text
   }
 
-  // 检查字符串是否为base64格式
   private isBase64(str: string): boolean {
     if (!str || typeof str !== 'string') return false
 
-    // 检查是否以data:开头的base64格式
     if (str.startsWith('data:')) {
       return str.includes('base64,')
     }
 
-    // 检查纯base64字符串（长度大于100且符合base64格式）
     if (str.length > 100) {
       const base64Regex = /^[A-Za-z0-9+/]*={0,2}$/
       return base64Regex.test(str)
@@ -64,7 +59,6 @@ export class Utils {
     return false
   }
 
-  // 持久化 base64 图片并返回本地文件 URL
   persistBase64Image(base64Data: string): string {
     if (!this.ctx || !base64Data.startsWith('data:image/')) return base64Data
 
@@ -72,17 +66,14 @@ export class Utils {
       const dir = join(this.ctx.baseDir, 'data', 'chat-patch', 'persist-images')
       if (!existsSync(dir)) mkdirSync(dir, { recursive: true })
 
-      // 生成文件名：时间戳 + 内容哈希
       const hash = createHash('md5').update(base64Data).digest('hex')
       const ext = base64Data.split(';')[0].split('/')[1] || 'png'
       const filename = `${Date.now()}_${hash}.${ext}`
       const filePath = join(dir, filename)
 
-      // 写入文件
       const base64Content = base64Data.split(',')[1]
       writeFileSync(filePath, Buffer.from(base64Content, 'base64'))
 
-      // 清理旧图片
       this.cleanupPersistImages(dir)
 
       return pathToFileURL(filePath).href
@@ -103,8 +94,6 @@ export class Utils {
     } catch (e) { }
   }
 
-  // 清理对象中的base64内容，改为持久化存储
-  // isBotMessage: 是否为机器人发送的消息
   cleanBase64Content(obj: any, isBotMessage: boolean = false): any {
     if (obj === null || obj === undefined) {
       return obj
@@ -112,7 +101,7 @@ export class Utils {
 
     if (typeof obj === 'string') {
       if (this.isBase64(obj)) {
-        // 如果是机器人消息且是非图片的Base64，直接返回占位符
+
         if (isBotMessage && !obj.startsWith('data:image/')) {
           return '[富媒体内容已省略]'
         }
@@ -128,16 +117,15 @@ export class Utils {
     if (typeof obj === 'object') {
       const cleaned: any = {}
       for (const [key, value] of Object.entries(obj)) {
-        // 检查元素类型，如果是机器人消息的非图片元素，跳过Base64处理
+
         if (isBotMessage && obj.type && !['text', 'image', 'img'].includes(obj.type)) {
-          // 对于video、audio等元素，如果src是Base64，替换为占位符
+
           if (typeof value === 'string' && (key === 'src' || key === 'url' || key === 'file') && this.isBase64(value)) {
             cleaned[key] = '[富媒体内容已省略]'
             continue
           }
         }
 
-        // 特别处理常见的base64字段
         if (typeof value === 'string' && (
           key === 'src' ||
           key === 'url' ||
@@ -145,7 +133,7 @@ export class Utils {
           key === 'data' ||
           key === 'content'
         ) && this.isBase64(value)) {
-          // 如果是机器人消息且不是图片Base64，跳过
+
           if (isBotMessage && !value.startsWith('data:image/')) {
             cleaned[key] = '[富媒体内容已省略]'
           } else {