koishi-plugin-chat-patch 6.1.0 → 6.1.1

package/client/web/src/function/custom-element.ts

@@ -0,0 +1,31 @@
+import h from '@satorijs/element'
+
+// 自定义消息元素：使用 Satori 元素工厂，保留命名空间扩展类型。
+const ELEMENT_TYPE_PATTERN = /^[a-z][a-z0-9_:-]*$/i
+
+type CustomElement = ReturnType<typeof h>
+
+/**
+ * 将输入的类型和内容转换为 Satori 元素。
+ * 空内容不生成元素，避免发送无意义的空消息。
+ */
+export function buildCustomElement(type: string, content: string): CustomElement | null {
+    const elementType = type.trim()
+    const elementContent = content.trim()
+    if (!ELEMENT_TYPE_PATTERN.test(elementType) || elementContent.length === 0) return null
+
+    const normalizedType = elementType.toLowerCase()
+    if (normalizedType === 'text') return h.text(content)
+    if (normalizedType === 'img' || normalizedType === 'image') return h.img(elementContent)
+    if (normalizedType === 'file') return h.file(elementContent)
+    if (normalizedType === 'video') return h.video(elementContent)
+    if (normalizedType === 'audio' || normalizedType === 'record') return h.audio(elementContent)
+    if (normalizedType === 'json' || normalizedType === 'xml') {
+        return h(normalizedType, { data: elementContent })
+    }
+    if (normalizedType === 'markdown') {
+        return h('markdown', elementContent)
+    }
+
+    return h(elementType, elementContent)
+}

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

@@ -459,12 +459,12 @@ export function parseCQ(data: any) {
 * @param preShow 是否消息预显
 * @param echo 回显的事件名
 */
-function parsePreviewMarkup(source: string): MsgItemElem[] {
-    const result: MsgItemElem[] = []
-    const tagPattern = /<(img|image|face|mface|file|audio|video|at|quote|sharp)\s+([^>]*?)\/?>/gi
-    let last = 0
-    let match: RegExpExecArray | null
-    while ((match = tagPattern.exec(source)) !== null) {
+function parsePreviewMarkup(source: string): MsgItemElem[] {
+    const result: MsgItemElem[] = []
+    const tagPattern = /<([a-z][\w:-]*)\s+([^>]*?)\/?>/gi
+    let last = 0
+    let match: RegExpExecArray | null
+    while ((match = tagPattern.exec(source)) !== null) {
         if (match.index > last) {
             result.push({ type: 'text', text: source.slice(last, match.index) })
         }
@@ -475,20 +475,28 @@ function parsePreviewMarkup(source: string): MsgItemElem[] {
         const name = attrs.match(/name\s*=\s*(?:"([^"]*)"|'([^']*)')/i)?.[1]
             ?? attrs.match(/name\s*=\s*(?:"([^"]*)"|'([^']*)')/i)?.[2]
             ?? ''
-        const id = attrs.match(/id\s*=\s*(?:"([^"]*)"|'([^']*)')/i)?.[1]
-            ?? attrs.match(/id\s*=\s*(?:"([^"]*)"|'([^']*)')/i)?.[2]
-            ?? ''
-        const tag = String(match[1] ?? '').toLowerCase()
-        if (tag === 'at') {
-            result.push({ type: 'at', qq: id, text: name || id })
-        } else if (tag === 'quote') {
-            result.push({ type: 'reply', id })
-        } else if (tag === 'sharp') {
-            result.push({ type: 'text', text: name ? `#${name}` : `#${id}` })
-        } else {
-            const type = tag === 'file'
-                ? 'file'
-                : tag === 'audio'
+        const id = attrs.match(/id\s*=\s*(?:"([^"]*)"|'([^']*)')/i)?.[1]
+            ?? attrs.match(/id\s*=\s*(?:"([^"]*)"|'([^']*)')/i)?.[2]
+            ?? ''
+        const content = attrs.match(/content\s*=\s*(?:"([^"]*)"|'([^']*)')/i)?.[1]
+            ?? attrs.match(/content\s*=\s*(?:"([^"]*)"|'([^']*)')/i)?.[2]
+            ?? ''
+        const data = attrs.match(/data\s*=\s*(?:"([^"]*)"|'([^']*)')/i)?.[1]
+            ?? attrs.match(/data\s*=\s*(?:"([^"]*)"|'([^']*)')/i)?.[2]
+            ?? ''
+        const tag = String(match[1] ?? '').toLowerCase()
+        if (tag === 'at') {
+            result.push({ type: 'at', qq: id, text: name || id })
+        } else if (tag === 'quote') {
+            result.push({ type: 'reply', id })
+        } else if (tag === 'sharp') {
+            result.push({ type: 'text', text: name ? `#${name}` : `#${id}` })
+        } else if (tag === 'text') {
+            result.push({ type: 'text', text: content })
+        } else if (['img', 'image', 'face', 'mface', 'file', 'audio', 'video'].includes(tag)) {
+            const type = tag === 'file'
+                ? 'file'
+                : tag === 'audio'
                     ? 'record'
                     : tag === 'video'
                         ? 'video'
@@ -497,9 +505,17 @@ function parsePreviewMarkup(source: string): MsgItemElem[] {
                 type,
                 file: src,
                 url: src,
-                ...(name ? { name } : {}),
-            })
-        }
+                ...(name ? { name } : {}),
+            })
+        } else {
+            result.push({
+                type: tag,
+                ...(src ? { src, file: src, url: src } : {}),
+                ...(name ? { name } : {}),
+                ...(content ? { content } : {}),
+                ...(data ? { data } : {}),
+            })
+        }
         last = match.index + match[0].length
     }
     if (last < source.length) {

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

@@ -376,15 +376,29 @@
             </div>
             <!-- 消息发送框 -->
             <div>
-                <div v-menu.prevent="_=>moreFunClick()"
-                    @click="moreFunClick(settingsStore.sysConfig.quick_send)">
-                    <font-awesome-icon v-if="tags.showMoreDetail || details.find(item => item.open)" :icon="['fas', 'minus']" />
-                    <font-awesome-icon v-else-if="settingsStore.sysConfig.quick_send == 'default'" :icon="['fas', 'plus']" />
-                    <font-awesome-icon v-else-if="settingsStore.sysConfig.quick_send == 'img'" :icon="['fas', 'image']" />
-                    <font-awesome-icon v-else-if="settingsStore.sysConfig.quick_send == 'file'" :icon="['fas', 'folder']" />
+                <div class="send-tool-buttons">
+                    <div class="send-tool-button"
+                        v-menu.prevent="_=>moreFunClick()"
+                        @click="moreFunClick(settingsStore.sysConfig.quick_send)">
+                        <font-awesome-icon v-if="tags.showMoreDetail || details.find(item => item.open)" :icon="['fas', 'minus']" />
+                        <font-awesome-icon v-else-if="settingsStore.sysConfig.quick_send == 'default'" :icon="['fas', 'plus']" />
+                        <font-awesome-icon v-else-if="settingsStore.sysConfig.quick_send == 'img'" :icon="['fas', 'image']" />
+                        <font-awesome-icon v-else-if="settingsStore.sysConfig.quick_send == 'file'" :icon="['fas', 'folder']" />
+                    </div>
+                    <div
+                        class="send-tool-button custom-element-toggle"
+                        :class="{ active: customElementMode }"
+                        :title="$t('自定义元素')"
+                        :aria-pressed="customElementMode"
+                        role="button"
+                        @click="toggleCustomElementMode">
+                        <font-awesome-icon :icon="['fas', 'code']" />
+                    </div>
                 </div>
                 <div>
-                    <form @submit="mainSubmit">
+                    <form
+                        :class="{ 'custom-element-form': customElementMode }"
+                        @submit="mainSubmit">
                         <template v-if="pendingVoice">
                             <div id="voice-pending-input" class="voice-pending" role="button"
                                 @click="cancelPendingVoice">
@@ -392,6 +406,51 @@
                                 <font-awesome-icon :icon="['fas', 'xmark']" />
                             </div>
                         </template>
+                        <template v-else-if="customElementMode">
+                            <label for="custom-element-type" class="sr-only">{{ $t('元素类型') }}</label>
+                            <input
+                                id="custom-element-type"
+                                ref="customElementTypeInput"
+                                v-model="customElementType"
+                                class="custom-element-type-input"
+                                type="text"
+                                autocomplete="off"
+                                placeholder="text / img / file"
+                                :disabled="uiStore.openSideBar || chat.info.me_info.shut_up_timestamp > 0">
+                            <template v-if="settingsStore.sysConfig.send_key === 'none'">
+                                <label for="main-input" class="sr-only">{{ $t('消息输入框') }}</label>
+                                <input
+                                    id="main-input"
+                                    ref="mainInput"
+                                    v-model="msg"
+                                    class="custom-element-content-input"
+                                    type="text"
+                                    autocomplete="off"
+                                    placeholder="URL / content"
+                                    :disabled="uiStore.openSideBar || chat.info.me_info.shut_up_timestamp > 0"
+                                    @keydown="mainAtKey"
+                                    @keyup="mainKeyUp"
+                                    @click="selectSQIn"
+                                    @input="handleInput">
+                            </template>
+                            <template v-else>
+                                <label for="main-input-ex" class="sr-only">{{ $t('消息输入框') }}</label>
+                                <textarea
+                                    id="main-input-ex"
+                                    ref="mainInput"
+                                    v-model="msg"
+                                    class="custom-element-content-input"
+                                    type="text"
+                                    placeholder="URL / content"
+                                    :disabled="uiStore.openSideBar"
+                                    @keydown="mainKey"
+                                    @keyup="mainKeyUp"
+                                    @click="selectSQIn"
+                                    @input="handleInput"
+                                    @compositionstart="handleCompositionStart"
+                                    @compositionend="handleCompositionEnd" />
+                            </template>
+                        </template>
                         <template v-else>
                         <template v-if="settingsStore.sysConfig.send_key === 'none'">
                             <label for="main-input" class="sr-only">{{ $t('消息输入框') }}</label>
@@ -557,6 +616,7 @@
 import app from '../main'
 import { i18n } from '../main'
 import SendUtil from '../function/sender'
+import { buildCustomElement } from '../function/custom-element'
 import Option, { get } from '../function/option'
 import Info from '../pages/Info.vue'
 import MsgBody from '../components/MsgBody.vue'
@@ -650,6 +710,7 @@ const msgPan = useTemplateRef<HTMLDivElement>('msgPan')
 const chatPadding = useTemplateRef<HTMLSpanElement>('chatPadding')
 const sendMore = useTemplateRef<HTMLDivElement>('sendMore')
 const mainInput = useTemplateRef<HTMLInputElement | HTMLTextAreaElement>('mainInput')
+const customElementTypeInput = useTemplateRef<HTMLInputElement>('customElementTypeInput')
 
 type ForwardAction = 'single-message' | 'individual-messages' | 'merged-messages'
 
@@ -706,6 +767,8 @@ const details = ref([
 const msgMenus = ref<any[]>([])
 const NewMsgNum = ref(0)
 const msg = ref('')
+const customElementMode = ref(false)
+const customElementType = ref('')
 const oldMsg = ref('')
 const imgCache = ref(new Map<number, string>())
 const voiceRecording = ref(false)
@@ -842,6 +905,8 @@ const chatMoveOptions: VMoveOptions<HTMLDivElement> = {
 
 function resetState() {
     NewMsgNum.value = 0
+    customElementMode.value = false
+    customElementType.value = ''
     tags.value = {
         sendTag: 'REFUSE',
         showBottomButton: false,
@@ -2871,6 +2936,44 @@ function sendMsg(echo = 'sendMsgBack') {
         return
     }
 
+    if (customElementMode.value) {
+        const customElement = buildCustomElement(
+            customElementType.value,
+            msg.value,
+        )
+        if (!customElement) {
+            new PopInfo().add(PopType.ERR, $t('请输入元素类型和内容'))
+            return
+        }
+        const parsedMsg = customElement.toString()
+        if (chat.show.temp) {
+            sendMsgRaw(
+                chat.show.id + '/' + chat.show.temp,
+                chat.show.type,
+                parsedMsg,
+                true,
+                echo,
+            )
+        } else {
+            sendMsgRaw(
+                chat.show.id,
+                chat.show.type,
+                parsedMsg,
+                true,
+                echo,
+            )
+        }
+        customElementType.value = ''
+        msg.value = ''
+        sendCache.value = []
+        imgCache.value.clear()
+        scrollBottom()
+        cancelReply()
+        scheduleResizeMainInput(undefined, true)
+        nextTick(() => customElementTypeInput.value?.focus())
+        return
+    }
+
     for (const [key, base64data] of imgCache.value) {
         sendCache.value[key] = {
             type: 'image',
@@ -3289,6 +3392,24 @@ function viewerEssImg(url: string) {
     viewerRef.value.open(new Img(url))
 }
 
+function toggleCustomElementMode() {
+    if (pendingVoice.value) return
+    customElementMode.value = !customElementMode.value
+    details.value.forEach((item) => {
+        item.open = false
+    })
+    tags.value.showMoreDetail = false
+    voiceMenuShow.value = false
+    tags.value.onAtFind = false
+    nextTick(() => {
+        const input = customElementMode.value
+            ? customElementTypeInput.value
+            : mainInput.value
+        input?.focus()
+        scheduleResizeMainInput()
+    })
+}
+
 function moreFunClick(type = 'default') {
     let hasOpen = false
     details.value.forEach((item) => {
@@ -3386,6 +3507,14 @@ function exitWin() {
         overflow: visible;
     }
 
+    .send-tool-button.custom-element-toggle.active {
+        background: var(--color-main);
+    }
+
+    .send-tool-button.custom-element-toggle.active > svg {
+        color: #fff;
+    }
+
     .voice-menu-wrap {
         position: relative;
         width: 50px;

package/lib/index.js

@@ -7938,7 +7938,35 @@ var import_node_path3 = __toESM(require("node:path"));
 var import_node_url2 = require("node:url");
 var import_koa_send = __toESM(require_koa_send());
 var import_file_type2 = __toESM(require_file_type());
+
+// src/web-error-filter.ts
+function isIgnoredWebError(error) {
+  if (error.name === "RangeError" && error.message === "Invalid string length") return true;
+  return error.code === "ECONNRESET";
+}
+__name(isIgnoredWebError, "isIgnoredWebError");
+function registerWebErrorFilter(ctx) {
+  const app = ctx.server._koa;
+  const defaultHandler = app.onerror;
+  const hasDefaultHandler = app.listeners("error").includes(defaultHandler);
+  if (hasDefaultHandler) app.off("error", defaultHandler);
+  const errorHandler = /* @__PURE__ */ __name((error) => {
+    if (isIgnoredWebError(error)) return;
+    if (hasDefaultHandler) defaultHandler.call(app, error);
+  }, "errorHandler");
+  app.on("error", errorHandler);
+  ctx.on("dispose", () => {
+    app.off("error", errorHandler);
+    if (hasDefaultHandler && !app.listeners("error").includes(defaultHandler)) {
+      app.on("error", defaultHandler);
+    }
+  });
+}
+__name(registerWebErrorFilter, "registerWebErrorFilter");
+
+// src/web.ts
 function registerWeb(ctx, config, database, contactCache, media, logger) {
+  registerWebErrorFilter(ctx);
   const webRoot = import_node_path3.default.resolve(__dirname, "..", "client", "web", "dist");
   const webSource = import_node_path3.default.resolve(__dirname, "..", "client", "web", "src");
   const webPublic = import_node_path3.default.resolve(__dirname, "..", "client", "web", "public");

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

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,7 +38,8 @@ 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')