koishi-plugin-chat-patch 5.6.0 → 6.0.0

package/client/web/dist/index.html

@@ -11,7 +11,7 @@
         <link rel="stylesheet" href="./bcui/css/style.css">
         <link rel="stylesheet" href="./bcui/css/color-light.css">
         <link rel="stylesheet" href="./css/append-light.css">
-      <script type="module" crossorigin src="./assets/index-EJ2CcODr.js"></script>
+      <script type="module" crossorigin src="./assets/index--7-eCx0r.js"></script>
       <link rel="stylesheet" crossorigin href="./assets/index-X9hFOAza.css">
     </head>
 

package/client/web/src/function/connect.ts

@@ -6,7 +6,6 @@ import {
   botKey,
   connectBackend,
   getActiveBot,
-  getBlockedPlatforms,
   getBootstrap,
   getLogins,
   request,
@@ -38,6 +37,7 @@ import type { ConnectionHistoryItem, LoginCacheElem } from './elements/system'
 import type { UserFriendElem, UserGroupElem } from './elements/information'
 
 const HISTORY_KEY = 'chat-patch:connection-history'
+const CLIENT_MESSAGE_CACHE_LIMIT = 500
 const logger = new Logger()
 const unsupportedMethods = new Set<string>()
 
@@ -45,14 +45,6 @@ function encodeKeyPart(value: string): string {
   return encodeURIComponent(value)
 }
 
-function isBlockedPlatform(platform: string): boolean {
-  return getBlockedPlatforms().some((item) => {
-    return item.exactMatch
-      ? platform === item.platformName
-      : platform.includes(item.platformName)
-  })
-}
-
 function getChannelKind(value: unknown): 'group' | 'direct' | 'unknown' {
   if (typeof value === 'number') {
     if (value === 0) return 'group'
@@ -730,6 +722,9 @@ function recordBotMessage(platform: string, selfId: string, msg: Record<string,
   const messageId = String(msg.message_id ?? '')
   if (messageId && !messages.some((item) => String(item.message_id) === messageId)) {
     messages.push(msg)
+    if (messages.length > CLIENT_MESSAGE_CACHE_LIMIT) {
+      messages.splice(0, messages.length - CLIENT_MESSAGE_CACHE_LIMIT)
+    }
     chatStore.sessionMessageCache.set(cacheKey, messages)
   }
   const currentShowId = String(chatStore.chatInfo.show.id ?? '')
@@ -900,7 +895,6 @@ export function restoreBotStateFromMessageCache(platform: string, selfId: string
 }
 
 function onSatoriEvent(event: SatoriEvent) {
-  if (isBlockedPlatform(event.platform)) return
   const oneBot = satoriEventToOneBot(event.body, String(event.platform || ''))
   if (oneBot) {
     oneBot._rawSatori = {
@@ -949,7 +943,6 @@ export function flushPendingBotEvents(platform: string, selfId: string) {
   if (!events?.length) return
   pendingBotEvents.delete(key)
   for (const event of events) {
-    if (isBlockedPlatform(event.platform)) continue
     const oneBot = satoriEventToOneBot(event.body, String(event.platform || ''))
     if (oneBot) {
       oneBot._rawSatori = {
@@ -978,7 +971,7 @@ function onSatoriReady(logins: Array<{ platform: string; selfId: string; name: s
   login.creating = false
   login.status = true
   const authStore = useAuthStore()
-  const visibleLogins = logins.filter((item) => !isBlockedPlatform(item.platform))
+  const visibleLogins = logins
   for (const item of visibleLogins) {
     if (!item.platform || !item.selfId) continue
     identityInfoCache.set(identityCacheKey('user', item.platform, item.selfId, item.selfId), {

package/client/web/src/function/satori.ts

@@ -57,17 +57,6 @@ function getObject(value: unknown): Record<string, unknown> {
   return typeof value === 'object' && value !== null ? value as Record<string, unknown> : {}
 }
 
-function isBlockedPlatform(
-  platform: string,
-  blockedPlatforms: SatoriBootstrap['blockedPlatforms'],
-): boolean {
-  return (blockedPlatforms ?? []).some((item) => {
-    return item.exactMatch
-      ? platform === item.platformName
-      : platform.includes(item.platformName)
-  })
-}
-
 async function parseJsonResponse(response: Response): Promise<unknown> {
   const text = await response.text()
   if (!response.ok) {
@@ -299,6 +288,7 @@ export function connect(
   let reconnectTimer = 0
   let retry = 0
   let disposed = false
+  let lastPongAt = 0
 
   const handleMessage = (event: MessageEvent) => {
     if (getString(event.data.source) === 'chat-patch-response') {
@@ -325,6 +315,7 @@ export function connect(
       socket = new WebSocket(wsUrl())
       socket.addEventListener('open', () => {
         retry = 0
+        lastPongAt = Date.now()
         socket?.send(JSON.stringify({
           op: 3,
           body: {
@@ -333,6 +324,10 @@ export function connect(
           },
         }))
         pingTimer = window.setInterval(() => {
+          if (Date.now() - lastPongAt > 30000) {
+            socket?.close()
+            return
+          }
           socket?.send(JSON.stringify({ op: 1, body: {} }))
         }, 10000)
         onStatus(true)
@@ -344,6 +339,7 @@ export function connect(
           const op = Number(raw.op)
           const body = getObject(raw.body)
           if (op === 4) {
+            lastPongAt = Date.now()
             const loginList = Array.isArray(body.logins) ? body.logins : []
             const seen = new Set<string>()
             const nextLogins: SatoriLogin[] = []
@@ -353,7 +349,7 @@ export function connect(
               const platform = getString(login.platform) || getString(user.platform)
               const selfId = getString(user.id) || getString(login.selfId)
               const key = [platform, selfId].map((value) => encodeURIComponent(value)).join(':')
-              if (!platform || !selfId || seen.has(key) || isBlockedPlatform(platform, bootstrap?.blockedPlatforms ?? [])) continue
+              if (!platform || !selfId || seen.has(key)) continue
               seen.add(key)
               nextLogins.push({
                 platform: getString(login.platform) || getString(user.platform),
@@ -371,8 +367,18 @@ export function connect(
             onReady(logins)
             return
           }
+          if (op === 1) {
+            lastPongAt = Date.now()
+            socket?.send(JSON.stringify({ op: 2, body: {} }))
+            return
+          }
+          if (op === 2) {
+            lastPongAt = Date.now()
+            return
+          }
           if (op === 5) return
           if (op === 0) {
+            lastPongAt = Date.now()
             sequence = Number(getObject(body).sn ?? sequence)
             localStorage.setItem('chat-patch:sn', String(sequence))
             onEvent({

package/client/web/src/function/utils/appUtil.ts

@@ -53,6 +53,13 @@ function encodeKeyPart(value: unknown): string {
     return encodeURIComponent(String(value ?? ''))
 }
 
+const HISTORY_INITIAL_LIMIT = 100
+let historyRequestId = 0
+
+function chatTargetKey(type: unknown, id: unknown, channelId: unknown): string {
+    return `${String(type ?? '')}:${String(id ?? '')}:${String(channelId ?? '')}`
+}
+
 /**
  * 滚动到目标消息（不自动加载）
  * @param seqName DOM 名（chat-xx）
@@ -113,14 +120,26 @@ export async function loadHistory(info: BaseChatInfoElem) {
     const chatStore = useChatStore()
     const settingsStore = useSettingsStore()
     const uiStore = useUIStore()
+    const requestId = ++historyRequestId
+    const targetKey = chatTargetKey(info.type, info.id, info.channel_id)
+    const isStale = () => {
+        return requestId !== historyRequestId
+            || targetKey !== chatTargetKey(
+                chatStore.chatInfo.show.type,
+                chatStore.chatInfo.show.id,
+                chatStore.chatInfo.show.channel_id,
+            )
+    }
     uiStore.nowGetHistory = false
     uiStore.historyBeforeTime = undefined
+    uiStore.canLoadHistory = true
+    uiStore.loadHistoryFail = false
     chatStore.messageList = []
     const channelId = String(info.channel_id ?? info.id ?? '')
     const cacheKey = [authStore.loginInfo.platform, authStore.loginInfo.uin, channelId].map(encodeKeyPart).join(':')
-    const cachedMessages = chatStore.sessionMessageCache.get(cacheKey)
-    if (cachedMessages?.length) {
-        chatStore.messageList = [...cachedMessages]
+    const sessionCached = chatStore.sessionMessageCache.get(cacheKey)
+    if (sessionCached?.length && !isStale()) {
+        chatStore.messageList = [...sessionCached]
     }
     // 本地有数据时立即显示，同时仍发网络请求以获取最新消息（避免遗漏）
     if (
@@ -132,17 +151,19 @@ export async function loadHistory(info: BaseChatInfoElem) {
             channelId,
             20,
         )
-        if (localMsgs.length > 0) {
+        if (localMsgs.length > 0 && !isStale()) {
             chatStore.messageList = localMsgs
         }
     }
+    if (isStale()) return
     try {
         const cachedMessages = await loadChatHistoryFromCache({
             platform: String(authStore.loginInfo.platform ?? ''),
             selfId: String(authStore.loginInfo.uin ?? ''),
             channelId,
-            limit: 500,
+            limit: HISTORY_INITIAL_LIMIT,
         })
+        if (isStale()) return
         if (cachedMessages.length > 0) {
             const mergedMap = new Map<string, any>()
             for (const msg of chatStore.messageList) {
@@ -167,7 +188,7 @@ export async function loadHistory(info: BaseChatInfoElem) {
                 }
                 return 0
             })
-            chatStore.messageList = merged.slice(-500)
+            chatStore.messageList = merged.slice(-HISTORY_INITIAL_LIMIT)
         }
     } catch (error) {
         logger.error(error as Error, '[LocalHistory] 加载聊天记录缓存失败')

package/client/web/src/pages/Chat.vue

@@ -588,7 +588,6 @@ import { v4 as uuid } from 'uuid'
 import {
 	scrollToMsg,
     downloadFile,
-    loadHistory as loadHistoryFirst,
     shouldAutoFocus,
 	vMenu,
 	vMove,
@@ -612,7 +611,6 @@ import {
 import { Logger, LogType, PopInfo, PopType } from '../function/base'
 import { Connector, loadChatHistoryFromCache, saveSentSelfMessage, sendForwardMessage } from '../function/connect'
 import {
-    BaseChatInfoElem,
     MsgItemElem,
     SQCodeElem,
     GroupMemberInfoElem,
@@ -735,6 +733,14 @@ const forwardList = ref(contactStore.userList)
 const chatImg = ref<any>(undefined)
 const trueLang = getTrueLang()
 
+const HISTORY_PAGE_SIZE = 50
+const HISTORY_INITIAL_LIMIT = 100
+
+function currentChatTargetKey(): string {
+    const show = chatStore.chatInfo.show
+    return `${String(show.type ?? '')}:${String(show.id ?? '')}:${String(show.channel_id ?? '')}`
+}
+
 function messageLocalTimeMs(item: any): number {
     const local = Number(item?.local_time ?? item?.timestamp_ms ?? item?.time_ms ?? 0)
     if (local) return local
@@ -745,6 +751,7 @@ function messageLocalTimeMs(item: any): number {
 async function refreshSelfHistory() {
     const id = chat.show.id
     if (!id || id === 0 || details.value[3].open || tags.value.showForwardPan) return
+    const targetKey = currentChatTargetKey()
     const channelId = chat.show.type === 'group'
         ? String(chat.show.channel_id ?? id)
         : String(chat.show.channel_id ?? id)
@@ -754,12 +761,12 @@ async function refreshSelfHistory() {
             platform: String(authStore.loginInfo.platform ?? ''),
             selfId: String(authStore.loginInfo.uin ?? ''),
             channelId,
-            limit: 30,
+            limit: HISTORY_INITIAL_LIMIT,
         })
     } catch {
         return
     }
-    if (!cached.length || String(chat.show.id) !== String(id)) return
+    if (!cached.length || String(chat.show.id) !== String(id) || targetKey !== currentChatTargetKey()) return
 
     const seen = new Set<string>()
     const addSeen = (item: any) => {
@@ -1178,6 +1185,8 @@ async function loadMoreHistory() {
         const firstMsg = list[0]
         const firstMsgId = firstMsg.message_id
         const firstMsgTime = Number(firstMsg?.time)
+        const targetKey = currentChatTargetKey()
+        const isStale = () => targetKey !== currentChatTargetKey()
         const cacheBeforeTime = Number(
             firstMsg?.local_time ?? firstMsg?.timestamp_ms ?? firstMsg?.time_ms ?? 0
         ) || (Number.isFinite(firstMsgTime) ? firstMsgTime * 1000 : 0)
@@ -1191,6 +1200,10 @@ async function loadMoreHistory() {
             uiStore.historyBeforeTime = undefined
         }
         uiStore.loadHistoryFail = false
+        if (isStale()) {
+            uiStore.nowGetHistory = false
+            return
+        }
 
         const channelId = String(
             chatStore.chatInfo.show.channel_id
@@ -1214,6 +1227,10 @@ async function loadMoreHistory() {
                     20,
                 )
             }
+            if (isStale()) {
+                uiStore.nowGetHistory = false
+                return
+            }
             if (localMsgs.length > 0) {
                 const existingIds = new Set(chatStore.messageList.map((m) => String(m.message_id ?? '')))
                 const addList = localMsgs.filter((m) => {
@@ -1230,14 +1247,22 @@ async function loadMoreHistory() {
                 }
             }
         }
+        if (isStale()) {
+            uiStore.nowGetHistory = false
+            return
+        }
 
         const cached = await loadChatHistoryFromCache({
             platform: String(authStore.loginInfo.platform ?? ''),
             selfId: String(authStore.loginInfo.uin ?? ''),
             channelId,
-            limit: 20,
+            limit: HISTORY_PAGE_SIZE,
             beforeTimeMs: cacheBeforeTime > 0 ? cacheBeforeTime : undefined,
         })
+        if (isStale()) {
+            uiStore.nowGetHistory = false
+            return
+        }
         const existingIds = new Set(chatStore.messageList.map((m) => String(m.message_id ?? '')))
         const addList = cached.filter((m) => {
             const msgId = String(m.message_id ?? '')
@@ -1246,7 +1271,7 @@ async function loadMoreHistory() {
         if (addList.length > 0) {
             chatStore.messageList.splice(0, 0, ...addList)
         }
-        if (cached.length < 20) {
+        if (cached.length < HISTORY_PAGE_SIZE) {
             uiStore.canLoadHistory = false
         }
         uiStore.nowGetHistory = false
@@ -2938,23 +2963,6 @@ function updateList(newLength: number, oldLength: number) {
             NewMsgNum.value = Math.abs(newLength - oldLength)
         }
     }
-    if (
-        list.length > 200 &&
-        !uiStore.nowGetHistory &&
-        !tags.value.showBottomButton
-    ) {
-        chatStore.messageList = []
-        const info = {
-            type: chat.show.type,
-            id: chat.show.id,
-            name: chat.show.name,
-            avatar: chat.show.avatar,
-            jump: chat.show.jump,
-        } as BaseChatInfoElem
-        loadHistoryFirst(info)
-        uiStore.nowGetHistory = true
-    }
-
     const pan = document.getElementById('msgPan')
     if (pan !== null) {
         const height = pan.scrollHeight
@@ -2968,7 +2976,7 @@ function updateList(newLength: number, oldLength: number) {
                     )
                 }
                 if (!uiStore.nowGetHistory) {
-                    if (!tags.value.showBottomButton) {
+                    if (shouldKeepChatAtBottom || oldLength <= 0) {
                         scrollTo(newPan.scrollHeight)
                     }
                     if (oldLength <= 0) {

package/lib/database.d.ts

@@ -11,8 +11,8 @@ export declare class ChatDatabase {
     constructor(ctx: Context, config: Config, logger: PluginLogger);
     private get db();
     initialize(): Promise<void>;
+    private loadLevelModule;
     dispose(): Promise<void>;
-    private ensureOpen;
     private releaseShared;
     clearAll(): Promise<void>;
     appendMessage(record: MessageRecord): Promise<void>;
@@ -56,6 +56,8 @@ export declare class ChatDatabase {
         type: string;
         contacts: ContactCacheItem[];
     }>>;
-    private trimMessages;
-    private trimSelfMessages;
+    private trimChannel;
+    cleanupExcess(): Promise<void>;
+    private trimRows;
+    private extractRecordTime;
 }

package/lib/gateway.d.ts

@@ -1,5 +1,4 @@
 import { Context } from 'koishi';
-import { Config } from './config';
 import { ChatDatabase } from './database';
 import { PluginLogger } from './logger';
 import { Recorder } from './recorder';
@@ -17,7 +16,6 @@ export type SatoriGatewayPayload = {
 type SatoriGatewayHandler = (payload: SatoriGatewayPayload) => void;
 export declare class SatoriGateway {
     private ctx;
-    private config;
     private database;
     private recorder;
     private logger;
@@ -30,7 +28,8 @@ export declare class SatoriGateway {
     private sequence;
     private logins;
     private online;
-    constructor(ctx: Context, config: Config, database: ChatDatabase, recorder: Recorder, logger: PluginLogger, onPayload: SatoriGatewayHandler);
+    private lastPongAt;
+    constructor(ctx: Context, database: ChatDatabase, recorder: Recorder, logger: PluginLogger, onPayload: SatoriGatewayHandler);
     start(): Promise<void>;
     dispose(): void;
     getLogins(): SatoriLoginInfo[];
@@ -40,7 +39,6 @@ export declare class SatoriGateway {
     private scheduleReconnect;
     private handleMessage;
     private normalizeLogins;
-    private isBlocked;
     private setOnline;
 }
 export {};

package/lib/index.d.ts

@@ -0,0 +1,17 @@
+import { Context } from 'koishi';
+import { Console } from '@koishijs/console';
+import { Config } from './config';
+export declare const name = "chat-patch";
+export declare const reusable = false;
+export declare const filter = false;
+export declare const inject: {
+    required: string[];
+};
+declare module 'koishi' {
+    interface Context {
+        console: Console;
+    }
+}
+export declare const usage = "\n---\n\n\u57FA\u4E8E Satori \u534F\u8BAE\u7684 Koishi \u540E\u53F0\u804A\u5929\u5BA4\u3002\n\u9700\u8981\u5728 Koishi \u4E2D\u542F\u7528 server-satori\uFF0C\u5E76\u5728\u63D2\u4EF6\u5185\u6784\u5EFA web \u5E94\u7528\u3002\n\n---\n\n\u9700\u8981\u5B89\u88C5 w-node \u63D2\u4EF6\uFF0C\u5E76\u5F00\u542F w-node\u3001market\u3001server-satori \u63D2\u4EF6\u3002\n\n---\n";
+export { Config } from './config';
+export declare function apply(ctx: Context, config: Config): Promise<void>;