koishi-plugin-chat-patch 6.0.0 → 6.1.1

package/src/database.ts

@@ -7,11 +7,17 @@ import { Config } from './config'
 import { ContactCacheItem, MessageRecord, PinnedState, SelfMessageRecord } from './types'
 import { PluginLogger } from './logger'
 
-function encodeKeyPart(value: string): string {
-  return encodeURIComponent(value)
-}
-
-function decodeKeyPart(value: string): string {
+function encodeKeyPart(value: string): string {
+  return encodeURIComponent(value)
+}
+
+function normalizeTimestampMs(value: unknown): number {
+  const num = Number(value ?? 0)
+  if (!Number.isFinite(num) || num <= 0) return 0
+  return num > 1e12 ? num : num * 1000
+}
+
+function decodeKeyPart(value: string): string {
   try {
     return decodeURIComponent(value)
   } catch {
@@ -27,11 +33,11 @@ function legacyMessagePrefix(platform: string, selfId: string, channelId: string
   return `m:${platform}:${selfId}:${channelId}:`
 }
 
-function messageKey(record: MessageRecord): string {
-  // 统一用毫秒排序，前端 beforeTime 也传毫秒，避免按秒存储时分页取到同一批消息
-  const time = String(
-    record.receivedAt ?? record.timestampMs ?? Number(record.timestamp) * 1000,
-  ).padStart(16, '0')
+function messageKey(record: MessageRecord): string {
+  // 统一用毫秒排序，前端 beforeTime 也传毫秒，避免按秒存储时分页取到同一批消息
+  const time = String(
+    normalizeTimestampMs(record.timestampMs ?? record.timestamp ?? record.receivedAt),
+  ).padStart(16, '0')
   return `${messagePrefix(record.platform, record.selfId, record.channelId || '')}${time}:${encodeKeyPart(record.id || 'unknown')}`
 }
 
@@ -40,8 +46,10 @@ function selfMessagePrefix(platform: string, selfId: string, channelId: string):
   return `sm:${encodeKeyPart(platform)}:${encodeKeyPart(selfId)}:${encodeKeyPart(channelId)}:`
 }
 
-function selfMessageKey(record: SelfMessageRecord): string {
-  const time = String(record.sentAt).padStart(16, '0')
+function selfMessageKey(record: SelfMessageRecord): string {
+  const time = String(
+    normalizeTimestampMs(record.timestampMs ?? record.timestamp ?? record.sentAt),
+  ).padStart(16, '0')
   return `${selfMessagePrefix(record.platform, record.selfId, record.channelId)}${time}:${encodeKeyPart(record.id || 'unknown')}`
 }
 
@@ -932,12 +940,12 @@ export class ChatDatabase {
     this.logger.logInfo(`频道历史已裁剪 ${keys.length} 条`)
   }
 
-  private extractRecordTime(value: string): number {
-    try {
-      const parsed = JSON.parse(value) as Record<string, unknown>
-      return Number(parsed.receivedAt ?? parsed.timestampMs ?? parsed.timestamp ?? parsed.sentAt ?? 0) || 0
-    } catch {
-      return 0
-    }
+  private extractRecordTime(value: string): number {
+    try {
+      const parsed = JSON.parse(value) as Record<string, unknown>
+      return normalizeTimestampMs(parsed.timestampMs ?? parsed.timestamp ?? parsed.sentAt ?? parsed.receivedAt)
+    } catch {
+      return 0
+    }
   }
 }

package/src/recorder.ts

@@ -65,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,
@@ -75,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

@@ -442,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,
@@ -463,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/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

package/src/web-error-filter.ts

@@ -0,0 +1,30 @@
+import { Context } from 'koishi'
+import {} from '@koishijs/plugin-server'
+
+type KoaErrorListener = (error: Error) => void
+
+// 仅过滤客户端断开和超大历史响应导致的已知错误。
+function isIgnoredWebError(error: Error): boolean {
+  if (error.name === 'RangeError' && error.message === 'Invalid string length') return true
+  return (error as NodeJS.ErrnoException).code === 'ECONNRESET'
+}
+
+export function registerWebErrorFilter(ctx: Context) {
+  const app = ctx.server._koa
+  const defaultHandler = app.onerror
+  const hasDefaultHandler = app.listeners('error').includes(defaultHandler)
+  if (hasDefaultHandler) app.off('error', defaultHandler)
+
+  const errorHandler: KoaErrorListener = (error) => {
+    if (isIgnoredWebError(error)) return
+    if (hasDefaultHandler) defaultHandler.call(app, error)
+  }
+  app.on('error', errorHandler)
+
+  ctx.on('dispose', () => {
+    app.off('error', errorHandler)
+    if (hasDefaultHandler && !app.listeners('error').includes(defaultHandler)) {
+      app.on('error', defaultHandler)
+    }
+  })
+}

package/src/web.ts

@@ -15,6 +15,7 @@ import { ChatDatabase } from './database'
 import { MediaManager } from './media'
 import { PluginLogger } from './logger'
 import { ContactCacheItem, MessageRecord, SelfMessagePayload, SelfMessageRecord } from './types'
+import { registerWebErrorFilter } from './web-error-filter'
 
 interface ViteConsoleServer {
   config?: {
@@ -37,11 +38,13 @@ export function registerWeb(
   media: MediaManager,
   logger: PluginLogger,
 ) {
-  const webRoot = path.resolve(__dirname, '..', 'client', 'web', 'dist')
+  registerWebErrorFilter(ctx)
+  const webRoot = path.resolve(__dirname, '..', 'client', 'web', 'dist')
   const webSource = path.resolve(__dirname, '..', 'client', 'web', 'src')
   const webPublic = path.resolve(__dirname, '..', 'client', 'web', 'public')
-  const webIndex = path.resolve(__dirname, '..', 'client', 'web', 'index.html')
-  const uploadDir = path.resolve(ctx.baseDir, 'data', 'chat-patch', 'upload-media')
+  const webIndex = path.resolve(__dirname, '..', 'client', 'web', 'index.html')
+  const uploadDir = path.resolve(ctx.baseDir, 'data', 'chat-patch', 'upload-media')
+  const mediaDir = path.resolve(ctx.baseDir, 'data', 'chat-patch', 'media')
 
   type WebContext = Router.RouterContext<DefaultState, DefaultContext>
   const cacheType = (type: string) => type === 'user' ? 'friend' : type
@@ -106,6 +109,22 @@ export function registerWeb(
   const historyChannelCandidates = (channelId: string): string[] => {
     return channelId ? [channelId] : []
   }
+
+  const messageSortTime = (item: MessageRecord): number => {
+    const timestampMs = Number(item.timestampMs ?? 0)
+    if (timestampMs > 0) return timestampMs > 1e12 ? timestampMs : timestampMs * 1000
+    const timestamp = Number(item.timestamp ?? 0)
+    if (timestamp > 0) return timestamp * 1000
+    return Number(item.receivedAt ?? 0)
+  }
+
+  const selfMessageSortTime = (item: SelfMessageRecord): number => {
+    const timestampMs = Number(item.timestampMs ?? item.sentAt ?? 0)
+    if (timestampMs > 0) return timestampMs > 1e12 ? timestampMs : timestampMs * 1000
+    const timestamp = Number(item.timestamp ?? 0)
+    if (timestamp > 0) return timestamp * 1000
+    return item.sentAt
+  }
 
   const mimeToExt: Record<string, string> = {
     'audio/mpeg': '.mp3',
@@ -242,66 +261,68 @@ export function registerWeb(
     }
   })
 
-  ctx.server.get(`${config.basePath}/api/media`, async (koa) => {
-    const fileName = path.basename(String(koa.query.file ?? koa.query.name ?? ''))
-    if (!fileName || fileName === '.' || fileName === '..') {
-      koa.status = 400
-      koa.body = { error: 'missing media file' }
-      return
-    }
-    const filePath = path.resolve(uploadDir, fileName)
-    const root = path.resolve(uploadDir)
-    if (filePath !== root && !filePath.startsWith(`${root}${path.sep}`)) {
-      koa.status = 400
-      koa.body = { error: 'invalid media file' }
-      return
-    }
-    if (!existsSync(filePath) || !statSync(filePath).isFile()) {
-      koa.status = 404
-      koa.body = { error: 'media file not found' }
-      return
-    }
-    const size = statSync(filePath).size
-    koa.set('Accept-Ranges', 'bytes')
-    if (fileName.toLowerCase().endsWith('.webm')) {
-      koa.type = 'audio/webm'
-    } else {
-      koa.type = fileName
-    }
-    const range = koa.headers.range
-    if (range) {
-      const match = /^bytes=(\d*)-(\d*)$/.exec(String(range))
-      if (!match) {
-        koa.status = 416
-        koa.set('Content-Range', `bytes */${size}`)
-        koa.body = ''
-        return
-      }
-      let start = 0
-      let end = size - 1
-      if (match[1] === '' && match[2]) {
-        start = Math.max(0, size - Number(match[2]))
-      } else if (match[1]) {
-        start = Number(match[1])
-        end = match[2] ? Number(match[2]) : end
-      }
-      if (!Number.isFinite(start) || !Number.isFinite(end) || start < 0 || start >= size) {
-        koa.status = 416
-        koa.set('Content-Range', `bytes */${size}`)
-        koa.body = ''
-        return
-      }
-      if (end >= size) end = size - 1
-      if (end < start) end = start
-      koa.status = 206
-      koa.set('Content-Range', `bytes ${start}-${end}/${size}`)
-      koa.set('Content-Length', String(end - start + 1))
-      koa.body = createReadStream(filePath, { start, end })
-      return
-    }
-    koa.set('Content-Length', String(size))
-    koa.body = createReadStream(filePath)
-  })
+  const sendLocalFile = async (koa: WebContext, filePath: string) => {
+    const size = statSync(filePath).size
+    const fileName = path.basename(filePath)
+    koa.set('Accept-Ranges', 'bytes')
+    if (fileName.toLowerCase().endsWith('.webm')) {
+      koa.type = 'audio/webm'
+    } else {
+      koa.type = fileName
+    }
+    const range = koa.headers.range
+    if (range) {
+      const match = /^bytes=(\d*)-(\d*)$/.exec(String(range))
+      if (!match) {
+        koa.status = 416
+        koa.set('Content-Range', `bytes */${size}`)
+        koa.body = ''
+        return
+      }
+      let start = 0
+      let end = size - 1
+      if (match[1] === '' && match[2]) {
+        start = Math.max(0, size - Number(match[2]))
+      } else if (match[1]) {
+        start = Number(match[1])
+        end = match[2] ? Number(match[2]) : end
+      }
+      if (!Number.isFinite(start) || !Number.isFinite(end) || start < 0 || start >= size) {
+        koa.status = 416
+        koa.set('Content-Range', `bytes */${size}`)
+        koa.body = ''
+        return
+      }
+      if (end >= size) end = size - 1
+      if (end < start) end = start
+      koa.status = 206
+      koa.set('Content-Range', `bytes ${start}-${end}/${size}`)
+      koa.set('Content-Length', String(end - start + 1))
+      koa.body = createReadStream(filePath, { start, end })
+      return
+    }
+    koa.set('Content-Length', String(size))
+    koa.body = createReadStream(filePath)
+  }
+
+  ctx.server.get(`${config.basePath}/api/media`, async (koa) => {
+    const fileName = path.basename(String(koa.query.file ?? koa.query.name ?? ''))
+    if (!fileName || fileName === '.' || fileName === '..') {
+      koa.status = 400
+      koa.body = { error: 'missing media file' }
+      return
+    }
+    for (const root of [uploadDir, mediaDir]) {
+      const filePath = path.resolve(root, fileName)
+      if (filePath !== root && filePath.startsWith(`${root}${path.sep}`)
+        && existsSync(filePath) && statSync(filePath).isFile()) {
+        await sendLocalFile(koa, filePath)
+        return
+      }
+    }
+    koa.status = 404
+    koa.body = { error: 'media file not found' }
+  })
 
   ctx.server.get(`${config.basePath}/api/cache/all`, async (koa) => {
     const entries = await database.getAllContacts()
@@ -362,13 +383,13 @@ export function registerWeb(
       selfMessages = await querySelfMessages(candidate)
       if (selfMessages.length) break
     }
-    // 统一按本地收到时间排序，避免平台时间不准导致顺序颠倒
-    messages.sort((a, b) => {
-      const timeA = Number(a?.receivedAt ?? a?.timestampMs ?? a?.timestamp ?? 0)
-      const timeB = Number(b?.receivedAt ?? b?.timestampMs ?? b?.timestamp ?? 0)
-      return timeA - timeB
+    // 统一按本地收到时间排序，避免平台时间不准导致顺序颠倒
+    messages.sort((a, b) => {
+      const timeA = messageSortTime(a)
+      const timeB = messageSortTime(b)
+      return timeA - timeB
     })
-    selfMessages.sort((a, b) => a.sentAt - b.sentAt)
+    selfMessages.sort((a, b) => selfMessageSortTime(a) - selfMessageSortTime(b))
     // 合并两条记录流后只返回 limit 条，保证前端分页/结束判断不会因自消息被放大
     const combined: Array<{
       kind: 'message' | 'self'
@@ -378,12 +399,12 @@ export function registerWeb(
     for (const item of messages) {
       combined.push({
         kind: 'message',
-        time: Number(item?.receivedAt ?? item?.timestampMs ?? item?.timestamp ?? 0),
+        time: messageSortTime(item),
         record: item,
       })
     }
     for (const item of selfMessages) {
-      combined.push({ kind: 'self', time: item.sentAt, record: item })
+      combined.push({ kind: 'self', time: selfMessageSortTime(item), record: item })
     }
     combined.sort((a, b) => a.time - b.time)
     const capped = combined.slice(-limit)
@@ -416,7 +437,7 @@ export function registerWeb(
         : await database.listSelfMessages(platform, selfId, candidate, limit)
       if (messages.length) break
     }
-    messages.sort((a, b) => a.sentAt - b.sentAt)
+    messages.sort((a, b) => selfMessageSortTime(a) - selfMessageSortTime(b))
     koa.body = { messages }
   })
 
@@ -438,9 +459,15 @@ export function registerWeb(
       message: Array.isArray(body.message) ? body.message as unknown[] : undefined,
       forwardId: typeof body.forwardId === 'string' ? body.forwardId : undefined,
       forwardContent: Array.isArray(body.forwardContent) ? body.forwardContent as unknown[] : undefined,
-      sentAt: typeof body.sentAt === 'number' && Number.isFinite(body.sentAt)
-        ? body.sentAt
-        : Date.now(),
+      sentAt: typeof body.sentAt === 'number' && Number.isFinite(body.sentAt)
+        ? body.sentAt
+        : Date.now(),
+      timestamp: typeof body.timestamp === 'number' && Number.isFinite(body.timestamp)
+        ? body.timestamp
+        : undefined,
+      timestampMs: typeof body.timestampMs === 'number' && Number.isFinite(body.timestampMs)
+        ? body.timestampMs
+        : undefined,
       sequence: typeof body.sequence === 'number' && Number.isFinite(body.sequence)
         ? body.sequence
         : 0,
@@ -456,7 +483,8 @@ export function registerWeb(
       koa.body = { error: 'missing self-message params' }
       return
     }
-    const record: SelfMessageRecord = {
+    const sentAt = payload.sentAt ?? Date.now()
+    const record: SelfMessageRecord = {
       id: payload.id || `web-${Date.now()}-${Math.random().toString(36).slice(2)}`,
       platform: payload.platform,
       selfId: payload.selfId,
@@ -469,7 +497,9 @@ export function registerWeb(
       message: payload.message,
       forwardId: payload.forwardId,
       forwardContent: payload.forwardContent,
-      sentAt: payload.sentAt ?? Date.now(),
+      sentAt,
+      timestamp: payload.timestamp ?? Math.floor(sentAt / 1000),
+      timestampMs: payload.timestampMs ?? sentAt,
       sequence: payload.sequence ?? 0,
       source: payload.source ?? 'webui',
       kind: payload.kind ?? 'text',