koishi-plugin-chat-patch 5.3.0 → 5.5.0

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

@@ -5,6 +5,10 @@ export interface SatoriBootstrap {
   endpoint: string
   token: string
   basePath: string
+  blockedPlatforms: Array<{
+    platformName: string
+    exactMatch: boolean
+  }>
 }
 
 export interface MessageRecord {
@@ -22,6 +26,8 @@ export interface MessageRecord {
   content?: string
   elements?: unknown[]
   raw?: unknown
+  revoked?: boolean
+  revokedAt?: number
 }
 
 export type SelfMessageChannelType = 'group' | 'user'
@@ -45,6 +51,8 @@ export interface SelfMessageRecord {
   source: SelfMessageSource
   kind: string
   fingerprint?: string
+  revoked?: boolean
+  revokedAt?: number
 }
 
 export interface SelfMessagePayload {
@@ -64,6 +72,8 @@ export interface SelfMessagePayload {
   sequence?: number
   source?: SelfMessageSource
   kind?: string
+  revoked?: boolean
+  revokedAt?: number
 }
 
 export interface HistoryQuery {

package/src/web.ts

@@ -9,9 +9,10 @@ import type { DefaultContext, DefaultState, ParameterizedContext } from 'koa'
 import FileType from 'file-type'
 
 import { Config } from './config'
-import { ContactCacheService } from './cache'
-import { ChatDatabase } from './database'
-import { PluginLogger } from './logger'
+import { ContactCacheService } from './cache'
+import { ChatDatabase } from './database'
+import { MediaManager } from './media'
+import { PluginLogger } from './logger'
 import { ContactCacheItem, SelfMessagePayload, SelfMessageRecord } from './types'
 
 interface ViteConsoleServer {
@@ -29,11 +30,12 @@ interface ViteConsoleLike {
 
 export function registerWeb(
   ctx: Context,
-  config: Config,
-  database: ChatDatabase,
-  contactCache: ContactCacheService,
-  logger: PluginLogger,
-) {
+  config: Config,
+  database: ChatDatabase,
+  contactCache: ContactCacheService,
+  media: MediaManager,
+  logger: PluginLogger,
+) {
   const webRoot = path.resolve(__dirname, '..', 'client', 'web', 'dist')
   const webSource = path.resolve(__dirname, '..', 'client', 'web', 'src')
   const webPublic = path.resolve(__dirname, '..', 'client', 'web', 'public')
@@ -82,40 +84,27 @@ export function registerWeb(
     koa.body = ''
   }
 
-  // web 应用里仍有 /img 这类运行时绝对路径，开发模式直接由 Koishi 服务托管
-  const registerDevPublic = (pattern: string, prefix: string) => {
-    ctx.server.get(pattern, async (koa: WebContext, next: () => Promise<void>) => {
-      if (!getVite()) return next()
-      await servePublicFile(koa, prefix)
-    })
-  }
-
-  registerDevPublic('/img(.*)', 'img')
+  // web 应用里仍有 /img 这类运行时绝对路径，生产/开发模式都要由 Koishi 服务托管
+  const registerPublic = (pattern: string, prefix: string) => {
+    ctx.server.get(pattern, async (koa: WebContext) => {
+      await servePublicFile(koa, prefix)
+    })
+  }
+
+  registerPublic('/img(.*)', 'img')
 
   const toExtension = (value: string): string => {
     const ext = value.startsWith('.') ? value : `.${value}`
     return ext.toLowerCase()
   }
 
-  const 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
-  }
+  const normalizeGroupId = (value: string): string => {
+    return String(value)
+  }
 
-  const historyChannelCandidates = (channelId: string): string[] => {
-    const raw = normalizeGroupId(channelId)
-    const candidates = [channelId]
-    if (raw && raw !== channelId) candidates.push(raw)
-    const id = raw || channelId
-    if (!/^(?:group|room|chat|channel|guild|private):/i.test(channelId)) {
-      candidates.push(`group:${id}`, `private:${id}`)
-    }
-    if (id) {
-      candidates.push(` [_${id}_] `, `_${id}_`, `[${id}]`, `group:${id}`)
-    }
-    return [...new Set(candidates)]
-  }
+  const historyChannelCandidates = (channelId: string): string[] => {
+    return channelId ? [channelId] : []
+  }
 
   const mimeToExt: Record<string, string> = {
     'audio/mpeg': '.mp3',
@@ -380,7 +369,9 @@ export function registerWeb(
       channelId: String(body.channelId ?? ''),
       guildId: typeof body.guildId === 'string' ? body.guildId : undefined,
       channelType: body.channelType === 'user' ? 'user' : 'group',
-      messageId: typeof body.messageId === 'string' ? body.messageId : undefined,
+      messageId: typeof body.messageId === 'string' || typeof body.messageId === 'number'
+        ? String(body.messageId)
+        : undefined,
       content: typeof body.content === 'string' ? body.content : undefined,
       elements: Array.isArray(body.elements) ? body.elements as unknown[] : undefined,
       message: Array.isArray(body.message) ? body.message as unknown[] : undefined,
@@ -392,8 +383,12 @@ export function registerWeb(
       sequence: typeof body.sequence === 'number' && Number.isFinite(body.sequence)
         ? body.sequence
         : 0,
-      source: body.source === 'plugin' ? 'plugin' : 'webui',
-      kind: typeof body.kind === 'string' ? body.kind : 'text',
+      source: body.source === 'plugin' ? 'plugin' : 'webui',
+      kind: typeof body.kind === 'string' ? body.kind : 'text',
+      revoked: body.revoked === true,
+      revokedAt: typeof body.revokedAt === 'number' && Number.isFinite(body.revokedAt)
+        ? body.revokedAt
+        : undefined,
     }
     if (!payload.platform || !payload.selfId || !payload.channelId) {
       koa.status = 400
@@ -415,9 +410,11 @@ export function registerWeb(
       forwardContent: payload.forwardContent,
       sentAt: payload.sentAt ?? Date.now(),
       sequence: payload.sequence ?? 0,
-      source: payload.source ?? 'webui',
-      kind: payload.kind ?? 'text',
-    }
+      source: payload.source ?? 'webui',
+      kind: payload.kind ?? 'text',
+      revoked: payload.revoked,
+      revokedAt: payload.revokedAt,
+    }
     await database.upsertSelfMessage(record)
     koa.body = { ok: true, message: record }
   })
@@ -630,7 +627,7 @@ export function registerWeb(
     }
   })
 
-  ctx.server.post(`${config.basePath}/api/cache`, async (koa) => {
+  ctx.server.post(`${config.basePath}/api/cache`, async (koa) => {
     const requestBody = (koa.request as unknown as { body?: unknown }).body
     const body = (requestBody ?? {}) as Record<string, unknown>
     const platform = String(body.platform ?? '')
@@ -670,12 +667,24 @@ export function registerWeb(
         await database.setContacts(platform, selfId, normalizedType, contacts)
       }
     }
-    koa.body = {
-      contacts: await database.getContacts(platform, selfId, normalizedType),
-    }
-  })
-
-  const serveFile = async (koa: WebContext, fileName: string) => {
+    koa.body = {
+      contacts: await database.getContacts(platform, selfId, normalizedType),
+    }
+  })
+
+  ctx.server.post(`${config.basePath}/api/clear-all`, async (koa) => {
+    try {
+      await database.clearAll()
+      await media.clearAll()
+      koa.body = { ok: true }
+    } catch (error) {
+      logger.warn('清空全部缓存失败:', error)
+      koa.status = 500
+      koa.body = { ok: false, error: String(error) }
+    }
+  })
+
+  const serveFile = async (koa: WebContext, fileName: string) => {
     const fullPath = path.join(webRoot, fileName)
     if (existsSync(fullPath) && statSync(fullPath).isFile()) {
       await send(koa, path.relative(webRoot, fullPath), { root: webRoot })