koishi-plugin-chat-patch 5.6.1 → 6.1.0

package/src/gateway.ts

@@ -4,7 +4,6 @@ import {} from '@koishijs/plugin-http'
 import {} from '@koishijs/plugin-server'
 import {} from '@satorijs/plugin-server'
 
-import { Config } from './config'
 import { ChatDatabase } from './database'
 import { PluginLogger } from './logger'
 import { Recorder } from './recorder'
@@ -45,10 +44,10 @@ export class SatoriGateway {
   private sequence = 0
   private logins: SatoriLoginInfo[] = []
   private online = false
+  private lastPongAt = 0
 
   constructor(
     private ctx: Context,
-    private config: Config,
     private database: ChatDatabase,
     private recorder: Recorder,
     private logger: PluginLogger,
@@ -99,6 +98,7 @@ export class SatoriGateway {
       }
       this.retry = 0
       this.setOnline(true)
+      this.lastPongAt = Date.now()
       socket.send(JSON.stringify({
         op: Opcode.IDENTIFY,
         body: {
@@ -109,6 +109,11 @@ export class SatoriGateway {
       if (!this.pingDispose) {
         this.pingDispose = this.ctx.setInterval(() => {
           if (this.socket?.readyState === WS_OPEN) {
+            if (Date.now() - this.lastPongAt > 30000) {
+              this.logger.logInfo('Satori 心跳超时，主动重连')
+              this.socket.close()
+              return
+            }
             this.socket.send(JSON.stringify({ op: Opcode.PING, body: {} }))
           }
         }, 10000)
@@ -160,14 +165,27 @@ export class SatoriGateway {
 
     if (payload.op === Opcode.READY) {
       const body = getObject(payload.body)
+      this.lastPongAt = Date.now()
       this.logins = this.normalizeLogins(body.logins)
       this.onPayload({ kind: 'ready', logins: this.getLogins() })
       return
     }
 
+    if (payload.op === Opcode.PING) {
+      this.lastPongAt = Date.now()
+      if (this.socket?.readyState === WS_OPEN) {
+        this.socket.send(JSON.stringify({ op: Opcode.PONG, body: {} }))
+      }
+      return
+    }
+    if (payload.op === Opcode.PONG) {
+      this.lastPongAt = Date.now()
+      return
+    }
     if (payload.op !== Opcode.EVENT) return
 
     const body = getObject(payload.body)
+    this.lastPongAt = Date.now()
     const sn = getNumber(body.sn)
     if (sn) {
       this.sequence = sn
@@ -212,8 +230,6 @@ export class SatoriGateway {
       sn,
       body,
     }
-    if (this.isBlocked(platform)) return
-
     try {
       await this.recorder.handleEvent(body)
     } catch (error) {
@@ -230,7 +246,7 @@ export class SatoriGateway {
       const user = getObject(login.user)
       const platform = getString(login.platform) || getString(user.platform)
       const selfId = getString(login.self_id) || getString(login.selfId) || getString(user.id)
-      if (!platform || !selfId || this.isBlocked(platform)) continue
+      if (!platform || !selfId) continue
       result.push({
         platform,
         selfId,
@@ -243,14 +259,6 @@ export class SatoriGateway {
     return result
   }
 
-  private isBlocked(platform: string): boolean {
-    return (this.config.blockedPlatforms ?? []).some((item) => {
-      return item.exactMatch
-        ? platform === item.platformName
-        : platform.includes(item.platformName)
-    })
-  }
-
   private setOnline(online: boolean) {
     if (this.online === online) return
     this.online = online

package/src/index.ts

@@ -1,60 +1,65 @@
-import { Context } from 'koishi'
-import { Console } from '@koishijs/console'
-import path from 'node:path'
-
-import { Config } from './config'
-import { createPluginLogger } from './logger'
-import { ContactCacheService } from './cache'
-import { ChatDatabase } from './database'
+import { Context } from 'koishi'
+import { Console } from '@koishijs/console'
+import path from 'node:path'
+
+import { Config } from './config'
+import { createPluginLogger } from './logger'
+import { ContactCacheService } from './cache'
+import { ChatDatabase } from './database'
 import { Recorder } from './recorder'
 import { SatoriGateway } from './gateway'
 import { MediaManager } from './media'
 import { SelfMessageRecorder } from './self-message'
 import { registerBootstrap } from './bootstrap'
 import { registerWeb } from './web'
-
-export const name = 'chat-patch'
-export const reusable = false
-export const filter = false
+
+export const name = 'chat-patch'
+export const reusable = false
+export const filter = false
 export const inject = {
-  required: ['console', 'server', 'http', 'satori.server'],
+  required: ['console', 'server', 'http', 'satori.server', 'node'],
 }
-
-declare module 'koishi' {
-  interface Context {
-    console: Console
-  }
-}
-
-export const usage = `
----
-
-基于 Satori 协议的 Koishi 后台聊天室。
-需要在 Koishi 中启用 server-satori，并在插件内构建 web 应用。
-
----
-`
-
-export { Config } from './config'
-
-export async function apply(ctx: Context, config: Config) {
-  const pluginLogger = createPluginLogger(ctx.logger('chat-patch'), config)
-
-  const database = new ChatDatabase(ctx, config, pluginLogger)
-  await database.initialize()
-  const contactCache = new ContactCacheService(ctx, database, pluginLogger)
-
-  const media = new MediaManager(ctx, config, database, pluginLogger)
-  media.start()
-
-  const recorder = new Recorder(config, database, media, contactCache, pluginLogger)
-  const gateway = new SatoriGateway(ctx, config, database, recorder, pluginLogger, (payload) => {
+
+declare module 'koishi' {
+  interface Context {
+    console: Console
+  }
+}
+
+export const usage = `
+---
+
+基于 Satori 协议的 Koishi 后台聊天室。
+需要在 Koishi 中启用 server-satori，并在插件内构建 web 应用。
+
+---
+
+需要安装 w-node 插件，并开启 w-node、market、server-satori 插件。
+
+---
+`
+
+export { Config } from './config'
+
+export async function apply(ctx: Context, config: Config) {
+  const pluginLogger = createPluginLogger(ctx.logger('chat-patch'), config)
+
+  const database = new ChatDatabase(ctx, config, pluginLogger)
+  await database.initialize()
+  await database.cleanupExcess()
+  const contactCache = new ContactCacheService(ctx, database, pluginLogger)
+
+  const media = new MediaManager(ctx, config, database, pluginLogger)
+  media.start()
+
+  const recorder = new Recorder(database, media, contactCache, pluginLogger)
+  const gateway = new SatoriGateway(ctx, database, recorder, pluginLogger, (payload) => {
     void ctx.console.broadcast('chat-patch/event', payload).catch((error) => {
       pluginLogger.warn('推送前端事件失败:', error)
     })
   })
 
-  const selfMessages = new SelfMessageRecorder(ctx, config, database, media, pluginLogger)
+  const selfMessages = new SelfMessageRecorder(ctx, database, media, pluginLogger)
   selfMessages.start()
 
   void gateway.start().catch((error) => {
@@ -63,17 +68,17 @@ export async function apply(ctx: Context, config: Config) {
 
   registerBootstrap(ctx, config, database, pluginLogger, () => gateway.getLogins())
   registerWeb(ctx, config, database, contactCache, media, pluginLogger)
-
-  ctx.console.addEntry({
-    dev: path.resolve(__dirname, '../client/index.ts'),
-    prod: path.resolve(__dirname, '../dist'),
-  })
-
+
+  ctx.console.addEntry({
+    dev: path.resolve(__dirname, '../client/index.ts'),
+    prod: path.resolve(__dirname, '../dist'),
+  })
+
   ctx.on('dispose', async () => {
     gateway.dispose()
     selfMessages.dispose()
     media.dispose()
-    await database.dispose()
-    pluginLogger.logInfo('chat-patch 已卸载')
-  })
-}
+    await database.dispose()
+    pluginLogger.logInfo('chat-patch 已卸载')
+  })
+}

package/src/media.ts

@@ -1,8 +1,10 @@
 import { Context } from 'koishi'
 import {} from '@koishijs/plugin-server'
 import { createHash } from 'node:crypto'
-import { createReadStream, promises as fs } from 'node:fs'
+import { createReadStream, createWriteStream, promises as fs } from 'node:fs'
 import path from 'node:path'
+import { Readable } from 'node:stream'
+import { pipeline } from 'node:stream/promises'
 import { fileURLToPath } from 'node:url'
 import FileType from 'file-type'
 
@@ -103,6 +105,23 @@ function collectMediaUrls(source: unknown, result: Set<string>) {
   }
 }
 
+// 限制同时下载的媒体数量，避免一条含大量图片/视频的消息一次性吃满内存和连接
+async function forEachConcurrent<T>(
+  items: readonly T[],
+  limit: number,
+  task: (item: T) => Promise<unknown>,
+) {
+  let cursor = 0
+  const workers = Array.from({ length: Math.min(limit, items.length) }, async () => {
+    while (cursor < items.length) {
+      const current = cursor
+      cursor += 1
+      await task(items[current]).catch(() => undefined)
+    }
+  })
+  await Promise.all(workers)
+}
+
 export class MediaManager {
   private mediaDir: string
   private uploadDir: string
@@ -212,7 +231,7 @@ export class MediaManager {
   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)))
+    await forEachConcurrent([...urls], 4, (url) => this.cacheUrl(url, channelId))
     if (urls.size) {
       this.logger.logInfo('消息媒体已预缓存:', urls.size, '个 URL')
     }
@@ -256,33 +275,45 @@ export class MediaManager {
       if (!response.ok) {
         return null
       }
-      const buffer = Buffer.from(await response.arrayBuffer())
-      const ext = await this.detectExtension(url, buffer)
+      if (!response.body) return null
+      const detected = await FileType.stream(Readable.fromWeb(response.body))
+      const ext = detected.fileType?.ext
+        ? toExtension(detected.fileType.ext)
+        : (urlExt || '.bin')
       const filename = `${hash}${ext}`
       const filePath = path.join(this.mediaDir, filename)
-      await fs.writeFile(filePath, buffer)
-      this.logger.logInfo('媒体已缓存:', filename, buffer.length)
+      if (await this.exists(filePath)) {
+        return this.migrateCachedMedia(url, filePath, channelId)
+      }
+      const tempPath = path.join(this.mediaDir, `${hash}.${Date.now()}.${Math.random().toString(36).slice(2)}.tmp`)
+      try {
+        await pipeline(detected, createWriteStream(tempPath))
+        await fs.rename(tempPath, filePath)
+      } catch (error) {
+        await fs.unlink(tempPath).catch(() => undefined)
+        throw error
+      }
+      this.logger.logInfo('媒体已缓存:', filename)
       return filePath
     } catch (error) {
       return null
     }
   }
 
-  private async detectExtension(url: string, buffer: Buffer): Promise<string> {
+  private async detectExtensionFromFile(filePath: string): Promise<string> {
     try {
-      const detected = await FileType.fromBuffer(buffer)
+      const detected = await FileType.fromStream(createReadStream(filePath))
       if (detected?.ext) return toExtension(detected.ext)
     } catch (error) {
-      this.logger.logInfo('媒体类型识别失败，回退 URL 后缀:', url, error)
+      this.logger.logInfo('媒体类型识别失败，回退文件后缀:', filePath, error)
     }
-    const ext = path.extname(new URL(url).pathname)
+    const ext = path.extname(filePath).toLowerCase()
     return ext && ext !== '.bin' ? ext.toLowerCase() : '.bin'
   }
 
   private async migrateCachedMedia(url: string, filePath: string, channelId: string): Promise<string> {
     try {
-      const buffer = await fs.readFile(filePath)
-      const ext = await this.detectExtension(url, buffer)
+      const ext = await this.detectExtensionFromFile(filePath)
       const currentExt = path.extname(filePath).toLowerCase()
       if (ext === '.bin' || ext === currentExt) return filePath
 

package/src/recorder.ts

@@ -1,4 +1,3 @@
-import { Config } from './config'
 import { ContactCacheService } from './cache'
 import { ChatDatabase } from './database'
 import { MediaManager } from './media'
@@ -35,7 +34,6 @@ function isPrivateChannelType(value: unknown): boolean {
 
 export class Recorder {
   constructor(
-    private config: Config,
     private database: ChatDatabase,
     private media: MediaManager,
     private contactCache: ContactCacheService,
@@ -47,7 +45,6 @@ export class Recorder {
     const type = getString(body.type)
     const login = getObject(body.login)
     const platform = getString(body.platform) || getString(login.platform)
-    if (this.isBlocked(platform)) return false
     if (type === 'message-deleted') {
       await this.handleMessageDeleted(body)
       return true
@@ -57,14 +54,6 @@ export class Recorder {
     return true
   }
 
-  private isBlocked(platform: string): boolean {
-    return (this.config.blockedPlatforms ?? []).some((item) => {
-      return item.exactMatch
-        ? platform === item.platformName
-        : platform.includes(item.platformName)
-    })
-  }
-
   private async handleMessageCreated(body: Record<string, unknown>) {
     const login = getObject(body.login)
     const loginUser = getObject(login.user)
@@ -76,6 +65,7 @@ export class Recorder {
     const user = getObject(body.user)
     const sn = getNumber(body.sn)
     const timestamp = getNumber(body.timestamp) || Date.now()
+    const timestampMs = timestamp > 1e12 ? timestamp : timestamp * 1000
     const record: MessageRecord = {
       id: getString(message.id) || `satori-${sn}`,
       sequence: sn,
@@ -86,7 +76,7 @@ export class Recorder {
       guildId: getString(guild.id) || undefined,
       userId: getString(user.id) || undefined,
       timestamp,
-      timestampMs: timestamp,
+      timestampMs,
       receivedAt: Date.now(),
       content: getString(message.content) || getString(message.raw_message) || undefined,
       elements: Array.isArray(message.elements) ? message.elements as unknown[] : undefined,

package/src/self-message.ts

@@ -1,7 +1,6 @@
 import { Bot, Context, h, Session } from 'koishi'
 import { createHash, randomUUID } from 'node:crypto'
 
-import { Config } from './config'
 import { ChatDatabase } from './database'
 import { MediaManager } from './media'
 import { PluginLogger } from './logger'
@@ -213,7 +212,6 @@ export class SelfMessageRecorder {
 
   constructor(
     private ctx: Context,
-    private config: Config,
     private database: ChatDatabase,
     private media: MediaManager,
     private logger: PluginLogger,
@@ -236,14 +234,6 @@ export class SelfMessageRecorder {
     }
   }
 
-  private isBlocked(platform: string): boolean {
-    return (this.config.blockedPlatforms ?? []).some((item) => {
-      return item.exactMatch
-        ? platform === item.platformName
-        : platform.includes(item.platformName)
-    })
-  }
-
   // 包装三个发送入口，覆盖 Satori message.create 和插件直接发送
   private wrapBot(bot: Bot) {
     if (this.wrapped.has(bot)) return
@@ -337,7 +327,7 @@ export class SelfMessageRecorder {
     mode: 'create' | 'send' | 'private',
     localId: string,
   ) {
-    if (!channelId || this.isBlocked(bot.platform ?? '')) return
+    if (!channelId) return
     if (!ids.length) {
       this.logger.warn('发送未返回消息 ID，判定为发送失败:', bot.platform, channelId)
       return
@@ -362,7 +352,7 @@ export class SelfMessageRecorder {
   }
 
   private async markSelfMessageRevoked(bot: Bot, channelId: string, messageId: string) {
-    if (!messageId || !channelId || this.isBlocked(bot.platform ?? '')) return
+    if (!messageId || !channelId) return
     const updated = await this.database.updateSelfMessageByMessageId(
       bot.platform ?? '',
       bot.selfId,
@@ -384,7 +374,7 @@ export class SelfMessageRecorder {
     const eventChannel = getObject(event.channel)
     const eventMessage = getObject(event.message)
     const channelId = session.channelId || getString(eventChannel.id)
-    if (this.isBlocked(platform) || !platform || !selfId || !channelId) return
+    if (!platform || !selfId || !channelId) return
 
     const messageId = session.messageId || getMessageId(eventMessage)
     if (messageId) {
@@ -452,6 +442,7 @@ export class SelfMessageRecorder {
     const contentText = typeof content === 'string'
       ? content
       : h.toElementArray(content).join('')
+    const sentAt = Date.now()
     const fingerprint = createHash('sha256')
       .update([
         platform,
@@ -473,7 +464,9 @@ export class SelfMessageRecorder {
       message: toSegments(elements, (attrs) => this.resolveI18nElement(attrs)),
       forwardId: forwardId(elements),
       forwardContent: toForwardNodes(elements, (attrs) => this.resolveI18nElement(attrs)),
-      sentAt: Date.now(),
+      sentAt,
+      timestamp: Math.floor(sentAt / 1000),
+      timestampMs: sentAt,
       sequence: ++this.sequence,
       source,
       kind: detectKind(elements),

package/src/server.d.ts

@@ -1,8 +1,22 @@
 import type { DefaultContext, DefaultState, ParameterizedContext } from 'koa'
 
-type ServerContext = ParameterizedContext<DefaultState, DefaultContext>
-
-declare module '@satorijs/core' {
+type ServerContext = ParameterizedContext<DefaultState, DefaultContext>
+
+interface WNodeService {
+  import<T>(packageName: string, options?: {
+    allowInstall?: boolean
+    useRequire?: boolean
+    version?: string
+  }): Promise<T>
+}
+
+declare module 'koishi' {
+  interface Context {
+    node: WNodeService
+  }
+}
+
+declare module '@satorijs/core' {
   interface Satori {
     server: {
       url: string

package/src/types.ts

@@ -66,6 +66,8 @@ export interface SelfMessageRecord {
   forwardId?: string
   forwardContent?: unknown[]
   sentAt: number
+  timestamp?: number
+  timestampMs?: number
   sequence: number
   source: SelfMessageSource
   kind: string
@@ -88,6 +90,8 @@ export interface SelfMessagePayload {
   forwardId?: string
   forwardContent?: unknown[]
   sentAt?: number
+  timestamp?: number
+  timestampMs?: number
   sequence?: number
   source?: SelfMessageSource
   kind?: string