koishi-plugin-chat-patch 5.3.1 → 5.5.1

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": "5.3.1",
+  "version": "5.5.1",
   "scripts": {
     "build:web": "npm --prefix client/web run build",
     "prepack": "npm run build:web",

package/src/cache.ts

@@ -13,9 +13,7 @@ function isUsableName(value: string, id: string): boolean {
 }
 
 function normalizeGroupId(value: string): string {
-  const raw = value.replace(/^(?:group|room|chat|channel|guild):/i, '').trim()
-  const wrapped = raw.match(/^\[_?([\s\S]+?)_?\]$/)
-  return wrapped ? wrapped[1] : raw || value
+  return String(value)
 }
 
 function isPrivateChannelType(value: unknown): boolean {
@@ -146,8 +144,6 @@ export class ContactCacheService {
     const guild = guildId && guildId !== '0' ? guildId : undefined
     const channel = channelId && channelId !== '0' ? channelId : undefined
     if (isPrivateChannelType(channelType)) return null
-    if (channelType === undefined
-      && (/^(?:private|direct):/i.test(id) || /^(?:private|direct):/i.test(channel || ''))) return null
     const rawId = id && id !== '0' ? normalizeGroupId(id) : ''
     const cacheId = rawId || guild || normalizeGroupId(channel || '') || ''
     if (!cacheId) return null

package/src/database.ts

@@ -58,10 +58,6 @@ function legacyGroupMemberKey(platform: string, selfId: string, groupId: string)
   return `gm:${platform}:${selfId}:${groupId}`
 }
 
-function isPrivateChannelId(value: unknown): boolean {
-  return typeof value === 'string' && /^(?:private|direct):/i.test(value)
-}
-
 function isPrivateChannelType(value: unknown): boolean {
   const num = Number(value)
   if (Number.isFinite(num)) return num === 1
@@ -70,16 +66,17 @@ function isPrivateChannelType(value: unknown): boolean {
 }
 
 function isUsableGroupContact(item: ContactCacheItem): boolean {
-  if (isPrivateChannelId(item.channelId)) return false
   if (typeof item.raw === 'object' && item.raw !== null) {
     const raw = item.raw as Record<string, unknown>
-    if (isPrivateChannelType(raw.channel_type)
-      || isPrivateChannelId(raw.channel_id)
-      || isPrivateChannelId(raw.channelId)) return false
+    if (isPrivateChannelType(raw.channel_type)) return false
   }
   return true
 }
 
+type CompactableLevel = Level<string, string> & {
+  compactRange(start: string, end: string): Promise<void>
+}
+
 export class ChatDatabase {
   private db: Level<string, string>
   private opened = false
@@ -106,6 +103,14 @@ export class ChatDatabase {
     this.logger.logInfo('LevelDB closed')
   }
 
+  async clearAll() {
+    // 先清空记录，再强制压缩，让旧 .ldb 文件也能被回收
+    await this.db.clear()
+    const db = this.db as unknown as CompactableLevel
+    await db.compactRange('', '\uffff')
+    this.logger.logInfo('数据库缓存已全部清空并完成压缩')
+  }
+
   async appendMessage(record: MessageRecord) {
     await this.db.put(messageKey(record), JSON.stringify(record))
     await this.trimMessages(record.platform, record.selfId, record.channelId || '')
@@ -193,6 +198,45 @@ export class ChatDatabase {
     return false
   }
 
+  async updateMessageRevoked(
+    platform: string,
+    selfId: string,
+    channelId: string,
+    messageId: string,
+    patch: { revoked: boolean; revokedAt: number },
+  ): Promise<boolean> {
+    const operations: Array<{ type: 'put'; key: string; value: string }> = []
+    for (const prefix of [messagePrefix(platform, selfId, channelId), legacyMessagePrefix(platform, selfId, channelId)]) {
+      for await (const [key, value] of this.db.iterator<string, string>({
+        gte: prefix,
+        lte: `${prefix}\uffff`,
+      })) {
+        try {
+          const parsed = JSON.parse(value) as unknown
+          if (typeof parsed !== 'object' || parsed === null) continue
+          const record = parsed as Partial<MessageRecord>
+          const raw = typeof record.raw === 'object' && record.raw !== null
+            ? record.raw as Record<string, unknown>
+            : {}
+          const rawMessage = typeof raw.message === 'object' && raw.message !== null
+            ? raw.message as Record<string, unknown>
+            : {}
+          const id = String(record.id ?? rawMessage.id ?? '')
+          if (!id || id !== messageId) continue
+          operations.push({
+            type: 'put',
+            key,
+            value: JSON.stringify({ ...parsed, ...patch }),
+          })
+        } catch {
+          // 单条解析失败不影响其他消息
+        }
+      }
+    }
+    if (operations.length) await this.db.batch(operations)
+    return operations.length > 0
+  }
+
   async findSelfForwardContent(
     platform: string,
     selfId: string,

package/src/index.ts

@@ -49,21 +49,21 @@ export async function apply(ctx: Context, config: Config) {
   const recorder = new Recorder(ctx, config, database, media, contactCache, pluginLogger)
   recorder.start()
 
-  const selfMessages = new SelfMessageRecorder(ctx, config, database, pluginLogger)
+  const selfMessages = new SelfMessageRecorder(ctx, config, database, media, pluginLogger)
   selfMessages.start()
 
   registerBootstrap(ctx, config, database, pluginLogger)
-  registerWeb(ctx, config, database, contactCache, pluginLogger)
+  registerWeb(ctx, config, database, contactCache, media, pluginLogger)
 
   ctx.console.addEntry({
     dev: path.resolve(__dirname, '../client/index.ts'),
     prod: path.resolve(__dirname, '../dist'),
   })
 
-  ctx.on('dispose', () => {
+  ctx.on('dispose', async () => {
     selfMessages.dispose()
     media.dispose()
-    void database.dispose()
+    await database.dispose()
     pluginLogger.logInfo('chat-patch 已卸载')
   })
 }

package/src/media.ts

@@ -27,6 +27,82 @@ function toLocalFilePath(value: string): string | null {
   return null
 }
 
+const MEDIA_TYPES = new Set([
+  'img',
+  'image',
+  'face',
+  'mface',
+  'audio',
+  'record',
+  'video',
+  'file',
+])
+
+function isCacheableMediaUrl(value: unknown): string {
+  const url = String(value ?? '').trim()
+  if (!url
+    || url.startsWith('data:')
+    || url.startsWith('blob:')
+    || url.startsWith('base64://')) return ''
+  return url
+}
+
+function isUrlLike(value: string): boolean {
+  return /^(?:https?:\/\/|file:\/\/|[a-z]:[\\/]|\\\\)/i.test(value)
+}
+
+function decodeMarkupValue(value: string): string {
+  return value
+    .replace(/&/g, '&')
+    .replace(/"/g, '"')
+    .replace(/'/g, "'")
+    .replace(/&lt;/g, '<')
+    .replace(/&gt;/g, '>')
+}
+
+function collectMarkupMediaUrls(markup: string, result: Set<string>) {
+  const pattern = /<(?:img|image|face|mface|audio|record|video|file)\b[^>]*?\b(?:src|url|file|href)\s*=\s*(["'])([\s\S]*?)\1/gi
+  let match: RegExpExecArray | null
+  while ((match = pattern.exec(markup)) !== null) {
+    const url = isCacheableMediaUrl(decodeMarkupValue(match[2]))
+    if (url) result.add(url)
+  }
+}
+
+function collectMediaUrls(source: unknown, result: Set<string>) {
+  if (typeof source === 'string') {
+    const direct = isCacheableMediaUrl(source)
+    if (direct && isUrlLike(direct)) result.add(direct)
+    collectMarkupMediaUrls(source, result)
+    try {
+      collectMediaUrls(JSON.parse(source) as unknown, result)
+    } catch {
+      // 普通文本或非 JSON markup 不需要二次解析
+    }
+    return
+  }
+  if (Array.isArray(source)) {
+    for (const item of source) collectMediaUrls(item, result)
+    return
+  }
+  if (typeof source !== 'object' || source === null) return
+
+  const record = source as Record<string, unknown>
+  const attrs = typeof record.attrs === 'object' && record.attrs !== null
+    ? record.attrs as Record<string, unknown>
+    : {}
+  if (MEDIA_TYPES.has(String(record.type ?? ''))) {
+    for (const key of ['src', 'url', 'file', 'href', 'path']) {
+      const url = isCacheableMediaUrl(attrs[key])
+      if (url) result.add(url)
+    }
+  }
+
+  for (const key of ['elements', 'children', 'content', 'data', 'html', 'message'] as const) {
+    collectMediaUrls(attrs[key] ?? record[key], result)
+  }
+}
+
 export class MediaManager {
   private mediaDir: string
   private uploadDir: string
@@ -109,6 +185,16 @@ export class MediaManager {
     this.cleanupTimer?.()
   }
 
+  async clearAll() {
+    const root = path.resolve(this.ctx.baseDir, 'data', 'chat-patch')
+    for (const dir of [this.mediaDir, this.uploadDir]) {
+      const resolved = path.resolve(dir)
+      if (resolved !== root && !resolved.startsWith(`${root}${path.sep}`)) continue
+      await fs.rm(resolved, { recursive: true, force: true })
+    }
+    this.logger.logInfo('媒体缓存目录已全部清空')
+  }
+
   async cacheUrl(url: string, channelId = ''): Promise<string | null> {
     try {
       const filePath = await this.resolveAndDownload(url, channelId)
@@ -122,6 +208,17 @@ export class MediaManager {
     }
   }
 
+  // 收到或发送消息时立即预缓存富媒体，避免等前端渲染时原 URL 已过期
+  async cacheMessageMedia(source: unknown, channelId = ''): Promise<string[]> {
+    const urls = new Set<string>()
+    collectMediaUrls(source, urls)
+    await Promise.allSettled([...urls].map((url) => this.cacheUrl(url, channelId)))
+    if (urls.size) {
+      this.logger.logInfo('消息媒体已预缓存:', urls.size, '个 URL')
+    }
+    return [...urls]
+  }
+
   private async resolveAndDownload(url: string, channelId: string): Promise<string | null> {
     try {
       await fs.mkdir(this.mediaDir, { recursive: true })

package/src/recorder.ts

@@ -10,9 +10,7 @@ import { PluginLogger } from './logger'
 const MESSAGE_TYPES = new Set(['message', 'message-created'])
 
 function normalizeGroupId(value: string): string {
-  const raw = value.replace(/^(?:group|room|chat|channel|guild):/i, '').trim()
-  const wrapped = raw.match(/^\[_?([\s\S]+?)_?\]$/)
-  return wrapped ? wrapped[1] : raw || value
+  return String(value)
 }
 
 export class Recorder {
@@ -27,6 +25,12 @@ export class Recorder {
 
   start() {
     this.ctx.on('internal/session', (session: Session) => {
+      if (session.type === 'message-deleted') {
+        void this.handleMessageDeleted(session).catch((error) => {
+          this.logger.warn('处理消息撤回失败:', error)
+        })
+        return
+      }
       void this.handleSession(session)
     })
   }
@@ -76,6 +80,26 @@ export class Recorder {
     })
   }
 
+  private async handleMessageDeleted(session: Session) {
+    const platform = session.platform || 'unknown'
+    if (this.isBlocked(platform)) return
+    const event = session.toJSON()
+    const rawMessage = typeof event.message === 'object' && event.message !== null
+      ? event.message as Record<string, unknown>
+      : {}
+    const messageId = session.messageId || String(rawMessage.id ?? '')
+    const channelId = String(
+      event.channel?.id
+      || event.guild?.id
+      || session.channelId
+      || '',
+    )
+    if (!messageId || !channelId) return
+    const patch = { revoked: true, revokedAt: Date.now() }
+    await this.database.updateMessageRevoked(platform, session.selfId, channelId, messageId, patch)
+    await this.database.updateSelfMessageByMessageId(platform, session.selfId, channelId, messageId, patch)
+  }
+
   private async cacheMessageContacts(event: ReturnType<Session['toJSON']>) {
     const platform = event.platform || ''
     const selfId = event.selfId || ''
@@ -89,7 +113,6 @@ export class Recorder {
     const channelType = String(channel?.type ?? '')
     const isPrivateChannel = channelType === '1'
       || ['direct', 'private'].includes(channelType.toLowerCase())
-      || (!channelType && /^private:/i.test(channelId))
     const groupId = guildId || (isPrivateChannel ? '' : normalizeGroupId(channelId)) || ''
     const userName = user?.name || user?.nick || member?.nick || member?.name || ''
     const userAvatar = user?.avatar || member?.avatar || ''
@@ -151,25 +174,11 @@ export class Recorder {
   }
 
   private async cacheMessageMedia(event: ReturnType<Session['toJSON']>) {
-    const elements = Array.isArray(event.message?.elements) ? event.message.elements : []
     const channelId = String(
       event.channel?.id
       || event.guild?.id
       || '',
     )
-    const urls: string[] = []
-    const collect = (list: unknown[]) => {
-      for (const raw of list) {
-        const element = typeof raw === 'object' && raw !== null ? raw as Record<string, unknown> : {}
-        const attrs = typeof element.attrs === 'object' && element.attrs !== null ? element.attrs as Record<string, unknown> : {}
-        if (['img', 'image', 'mface', 'audio', 'video', 'file'].includes(String(element.type))) {
-          const url = String(attrs.src ?? attrs.url ?? attrs.file ?? '')
-          if (url) urls.push(url)
-        }
-        if (Array.isArray(element.children)) collect(element.children)
-      }
-    }
-    collect(elements)
-    await Promise.allSettled(urls.map((url) => this.media.cacheUrl(url, channelId)))
+    await this.media.cacheMessageMedia(event.message, channelId)
   }
 }

package/src/self-message.ts

@@ -3,6 +3,7 @@ import { createHash, randomUUID } from 'node:crypto'
 
 import { Config } from './config'
 import { ChatDatabase } from './database'
+import { MediaManager } from './media'
 import { PluginLogger } from './logger'
 import { SelfMessageChannelType, SelfMessageRecord, SelfMessageSource } from './types'
 
@@ -14,11 +15,13 @@ type SendOptionsWithMeta = SendOptions & {
 type BotSendMethod = Bot['sendMessage']
 type BotCreateMethod = Bot['createMessage']
 type BotPrivateMethod = Bot['sendPrivateMessage']
+type BotDeleteMethod = Bot['deleteMessage']
 
 interface BotMethods {
   createMessage: BotCreateMethod
   sendMessage: BotSendMethod
   sendPrivateMessage: BotPrivateMethod
+  deleteMessage: BotDeleteMethod
 }
 
 interface SatoriElement {
@@ -38,6 +41,11 @@ function getString(value: unknown): string {
   return typeof value === 'string' ? value : ''
 }
 
+function getMessageId(value: unknown): string {
+  const raw = getObject(value).id ?? getObject(value).message_id
+  return raw == null ? '' : String(raw)
+}
+
 function getNumber(value: unknown): number {
   const num = Number(value)
   return Number.isFinite(num) ? num : 0
@@ -51,8 +59,9 @@ function getObject(value: unknown): Record<string, unknown> {
 
 function toSatoriElement(value: unknown): SatoriElement {
   const raw = getObject(value)
-  const attrs = typeof raw.attrs === 'object' && raw.attrs !== null
-    ? raw.attrs as Record<string, unknown>
+  const rawAttrs = raw.attrs ?? raw.data
+  const attrs = typeof rawAttrs === 'object' && rawAttrs !== null
+    ? rawAttrs as Record<string, unknown>
     : {}
   const children = Array.isArray(raw.children)
     ? raw.children.map(toSatoriElement)
@@ -71,10 +80,6 @@ function isForwardContainer(element: SatoriElement): boolean {
       && ('forward' in (element.attrs ?? {}) || element.attrs?.forward === true))
 }
 
-function isPrivateChannel(value: string): boolean {
-  return /^(?:private|direct):/i.test(value)
-}
-
 function toSegments(
   elements: unknown[],
   resolveI18n?: (attrs: Record<string, unknown>) => string,
@@ -85,9 +90,9 @@ function toSegments(
     const attrs = element.attrs ?? {}
     const type = getString(element.type)
     if (type === 'text') {
-      result.push({ type: 'text', text: getString(attrs.content) })
+      result.push({ type: 'text', text: getString(attrs.content) || getString(attrs.text) })
     } else if (type === 'at') {
-      const id = getString(attrs.id)
+      const id = getString(attrs.id) || getString(attrs.qq)
       const name = getString(attrs.name) || (attrs.type === 'all' ? '所有人' : id)
       result.push({ type: 'at', qq: id, text: name.startsWith('@') ? name : `@${name}` })
     } else if (type === 'img' || type === 'image') {
@@ -210,6 +215,7 @@ export class SelfMessageRecorder {
     private ctx: Context,
     private config: Config,
     private database: ChatDatabase,
+    private media: MediaManager,
     private logger: PluginLogger,
   ) {}
 
@@ -245,6 +251,7 @@ export class SelfMessageRecorder {
       createMessage: bot.createMessage,
       sendMessage: bot.sendMessage,
       sendPrivateMessage: bot.sendPrivateMessage,
+      deleteMessage: bot.deleteMessage,
     }
     this.wrapped.set(bot, methods)
 
@@ -258,7 +265,7 @@ export class SelfMessageRecorder {
       try {
         const messages = await methods.createMessage.call(bot, channelId, content, referrer, sendOptions)
         const ids = Array.isArray(messages)
-          ? messages.map((item) => getString(getObject(item).id)).filter(Boolean)
+          ? messages.map((item) => getMessageId(item)).filter((id) => id !== '')
           : []
         await this.recordFromWrapper(bot, channelId, content, ids, options, 'create', localId)
         return messages
@@ -267,6 +274,11 @@ export class SelfMessageRecorder {
       }
     }
 
+    bot.deleteMessage = async (channelId, messageId) => {
+      await methods.deleteMessage.call(bot, channelId, messageId)
+      await this.markSelfMessageRevoked(bot, channelId, messageId)
+    }
+
     bot.sendMessage = async (channelId, content, referrer, options) => {
       const sendOptions = this.prepareOptions(options)
       if (sendOptions.chatPatchId) {
@@ -275,7 +287,8 @@ export class SelfMessageRecorder {
       const localId = randomUUID()
       sendOptions.chatPatchId = localId
       try {
-        const ids = await methods.sendMessage.call(bot, channelId, content, referrer, sendOptions)
+        const ids = (await methods.sendMessage.call(bot, channelId, content, referrer, sendOptions))
+          .filter((id) => id !== '')
         await this.recordFromWrapper(bot, channelId, content, ids, options, 'send', localId)
         return ids
       } finally {
@@ -291,7 +304,8 @@ export class SelfMessageRecorder {
       const localId = randomUUID()
       sendOptions.chatPatchId = localId
       try {
-        const ids = await methods.sendPrivateMessage.call(bot, userId, content, guildId, sendOptions)
+        const ids = (await methods.sendPrivateMessage.call(bot, userId, content, guildId, sendOptions))
+          .filter((id) => id !== '')
         await this.recordFromWrapper(bot, userId, content, ids, options, 'private', localId)
         return ids
       } finally {
@@ -306,6 +320,7 @@ export class SelfMessageRecorder {
     bot.createMessage = methods.createMessage
     bot.sendMessage = methods.sendMessage
     bot.sendPrivateMessage = methods.sendPrivateMessage
+    bot.deleteMessage = methods.deleteMessage
     this.wrapped.delete(bot)
   }
 
@@ -323,6 +338,10 @@ export class SelfMessageRecorder {
     localId: string,
   ) {
     if (!channelId || this.isBlocked(bot.platform ?? '')) return
+    if (!ids.length) {
+      this.logger.warn('发送未返回消息 ID，判定为发送失败:', bot.platform, channelId)
+      return
+    }
     const source: SelfMessageSource = options?.session ? 'plugin' : 'bot'
     const record = this.buildRecord(
       bot.platform ?? '',
@@ -336,9 +355,26 @@ export class SelfMessageRecorder {
       localId,
     )
     await this.database.upsertSelfMessage(record)
+    void this.media.cacheMessageMedia(content, channelId).catch((error) => {
+      this.logger.warn('缓存机器人消息媒体失败:', error)
+    })
     this.logger.logInfo('机器人消息已记录:', record.kind, record.channelId, record.messageId || record.id)
   }
 
+  private async markSelfMessageRevoked(bot: Bot, channelId: string, messageId: string) {
+    if (!messageId || !channelId || this.isBlocked(bot.platform ?? '')) return
+    const updated = await this.database.updateSelfMessageByMessageId(
+      bot.platform ?? '',
+      bot.selfId,
+      channelId,
+      messageId,
+      { revoked: true, revokedAt: Date.now() },
+    )
+    if (!updated) {
+      this.logger.warn('撤回消息未找到本地自消息记录:', bot.platform, channelId, messageId)
+    }
+  }
+
   // 收到 send 事件时只补消息 id，避免重复记录
   private async recordSendEvent(session: Session) {
     if (session.type !== 'send') return
@@ -350,7 +386,7 @@ export class SelfMessageRecorder {
     const channelId = session.channelId || getString(eventChannel.id)
     if (this.isBlocked(platform) || !platform || !selfId || !channelId) return
 
-    const messageId = session.messageId || getString(eventMessage.id)
+    const messageId = session.messageId || getMessageId(eventMessage)
     if (messageId) {
       const updated = await this.database.updateSelfMessageByMessageId(
         platform,
@@ -376,6 +412,9 @@ export class SelfMessageRecorder {
       randomUUID(),
     )
     await this.database.upsertSelfMessage(record)
+    void this.media.cacheMessageMedia(session.content ?? '', channelId).catch((error) => {
+      this.logger.warn('缓存 send 事件媒体失败:', error)
+    })
   }
 
   private resolveI18nElement(attrs: Record<string, unknown>): string {
@@ -404,10 +443,9 @@ export class SelfMessageRecorder {
     mode: 'create' | 'send' | 'private',
     localId: string,
   ): SelfMessageRecord {
-    const normalizedChannelId = mode === 'private' && !isPrivateChannel(channelId)
-      ? `private:${channelId}`
-      : channelId
-    const channelType: SelfMessageChannelType = mode === 'private' || isPrivateChannel(normalizedChannelId)
+    const normalizedChannelId = channelId
+    // 只按调用入口判断私聊，不根据频道 ID 前缀推断
+    const channelType: SelfMessageChannelType = mode === 'private'
       ? 'user'
       : 'group'
     const elements = this.normalizeElements(content)
@@ -445,9 +483,20 @@ export class SelfMessageRecorder {
 
   private normalizeElements(content: MessageContent): unknown[] {
     try {
-      const elements = typeof content === 'string'
-        ? h.parse(content)
-        : h.toElementArray(content)
+      const normalized = typeof content === 'string'
+        ? content
+        : Array.isArray(content)
+          ? content.map((raw) => {
+            const item = getObject(raw)
+            if (typeof item.data === 'object' && item.data !== null && item.attrs === undefined) {
+              return h(getString(item.type), item.data as Record<string, unknown>)
+            }
+            return raw
+          })
+          : content
+      const elements = typeof normalized === 'string'
+        ? h.parse(normalized)
+        : h.toElementArray(normalized)
       return JSON.parse(JSON.stringify(elements)) as unknown[]
     } catch {
       return []

package/src/types.ts

@@ -26,6 +26,8 @@ export interface MessageRecord {
   content?: string
   elements?: unknown[]
   raw?: unknown
+  revoked?: boolean
+  revokedAt?: number
 }
 
 export type SelfMessageChannelType = 'group' | 'user'
@@ -49,6 +51,8 @@ export interface SelfMessageRecord {
   source: SelfMessageSource
   kind: string
   fingerprint?: string
+  revoked?: boolean
+  revokedAt?: number
 }
 
 export interface SelfMessagePayload {
@@ -68,6 +72,8 @@ export interface SelfMessagePayload {
   sequence?: number
   source?: SelfMessageSource
   kind?: string
+  revoked?: boolean
+  revokedAt?: number
 }
 
 export interface HistoryQuery {