fux: #574

refactor:优化WebUI后端代码格式(无新功能添加)

LICENSE

@@ -1,201 +1,19 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+Limited Redistribution License for NapCat
 
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+Copyright © 2024 Mlikiowa
 
-   1. Definitions.
+1. Usage and Reproduction:
+   - Unauthorized use, reproduction, modification, or distribution of this code is prohibited without explicit permission from the main author of the NapCat repository.
    
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
+2. Redistribution:
+   - Redistribution of this code is permitted, provided that the full text of this license is included, and the source and copyright information is clearly stated.
+   - Minor modifications and extensions are allowed for redistribution purposes, but the modified code must not be publicly released.
 
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
+3. Non-Commercial Use:
+   - This code is not to be used for any commercial purposes.
 
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
+4. Additional Permissions:
+   - Any rights not explicitly addressed in this license must be requested from and granted by the main author of the NapCat repository.
 
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+5. Disclaimer:
+   - This code is provided "as is," without any express or implied warranties, including but not limited to the implied warranties of merchantability and fitness for a particular purpose. In no event shall the author be liable for any damages or other liability arising from, out of, or in connection with the use or distribution of this code.

README.md

@@ -34,7 +34,7 @@ NapCatQQ 是现代化的基于 NTQQ 的 Bot 协议端实现
 
 
 ## 回家旅途
-[QQ Group](https://qm.qq.com/q/NWP25OeV0c)
+[QQ Group](https://qm.qq.com/q/I6LU87a0Yq)
 
 ## 感谢他们
 感谢 [Lagrange](https://github.com/LagrangeDev/Lagrange.Core) 对本项目的大力支持 参考部分代码 已获授权
@@ -45,12 +45,8 @@ NapCatQQ 是现代化的基于 NTQQ 的 Bot 协议端实现
 
 ---
 
-## 延缓Native模块与NapCat对新版QQ适配
-为未来持续与高效的使用Native模块 模块代码转为完全非Git仓库的本地保存源码 并进行相关重构
-
-同时为了保证稳定 NapCat 本体通常会在3 Week+的周期进行新版本适配
-
-因此此时推荐使用release指定版本
+## 特殊感谢
+[LLOneBot](https://github.com/LLOneBot/LLOneBot) 相关的开发曾参与本项目
 
 ## 开源附加
 

manifest.json

@@ -4,7 +4,7 @@
   "name": "NapCatQQ",
   "slug": "NapCat.Framework",
   "description": "高性能的 OneBot 11 协议实现",
-  "version": "4.1.12",
+  "version": "4.2.5",
   "icon": "./logo.png",
   "authors": [
     {

napcat.webui/index.html

@@ -1,13 +1,13 @@
 <!doctype html>
 <html lang="en">
-  <head>
+<head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="./vite.svg" />
+    <link rel="icon" type="image/svg+xml" href="./logo_webui.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>NapCat WebUI</title>
-  </head>
-  <body>
-    <div id="app"></div>
-    <script type="module" src="./src/main.ts"></script>
-  </body>
+</head>
+<body>
+<div id="app"></div>
+<script type="module" src="./src/main.ts"></script>
+</body>
 </html>

napcat.webui/package.json

@@ -14,7 +14,7 @@
     "qrcode": "^1.5.4",
     "tdesign-icons-vue-next": "^0.3.3",
     "tdesign-vue-next": "^1.10.3",
-    "vue": "^3.5.12",
+    "vue": "^3.5.13",
     "vue-router": "^4.4.5"
   },
   "devDependencies": {

napcat.webui/src/App.vue

@@ -1,7 +1,112 @@
 <template>
-    <div id="app">
+    <div id="app" theme-mode="dark">
         <router-view />
     </div>
+    <div v-if="show">
+        <t-sticky-tool shape="round" placement="right-bottom" :offset="[-50, 10]" @click="changeTheme">
+            <t-sticky-item label="浅色" popup="切换浅色模式">
+                <template #icon><sunny-icon /></template>
+            </t-sticky-item>
+            <t-sticky-item label="深色" popup="切换深色模式">
+                <template #icon><mode-dark-icon /></template>
+            </t-sticky-item>
+            <t-sticky-item label="自动" popup="跟随系统">
+                <template #icon><control-platform-icon /></template>
+            </t-sticky-item>
+        </t-sticky-tool>
+    </div>
 </template>
 
-<script setup lang="ts"></script>
+<script setup lang="ts">
+import { onBeforeUnmount, onMounted, onUnmounted, ref } from 'vue';
+import { ControlPlatformIcon, ModeDarkIcon, SunnyIcon } from 'tdesign-icons-vue-next';
+const smallScreen = window.matchMedia('(max-width: 768px)');
+interface Item {
+    label: string;
+    popup: string;
+}
+
+interface Context {
+    item: Item;
+}
+enum ThemeMode {
+    Dark = 'dark',
+    Light = 'light',
+    Auto = 'auto',
+}
+const themeLabelMap: Record<string, ThemeMode> = {
+    "浅色": ThemeMode.Light,
+    "深色": ThemeMode.Dark,
+    "自动": ThemeMode.Auto,
+};
+const show = ref<boolean>(true);
+const createSetThemeAttributeFunction = () => {
+    let mediaQueryForAutoTheme: MediaQueryList | null = null;
+    return (mode: ThemeMode | null) => {
+        const element = document.documentElement;
+        if (mode === ThemeMode.Dark) {
+            element.setAttribute('theme-mode', ThemeMode.Dark);
+        } else if (mode === ThemeMode.Light) {
+            element.removeAttribute('theme-mode');
+        } else if (mode === ThemeMode.Auto) {
+            mediaQueryForAutoTheme = window.matchMedia('(prefers-color-scheme: dark)');
+            const handleMediaChange = (e: MediaQueryListEvent) => {
+                if (e.matches) {
+                    element.setAttribute('theme-mode', ThemeMode.Dark);
+                } else {
+                    element.removeAttribute('theme-mode');
+                }
+            };
+            mediaQueryForAutoTheme.addEventListener('change', handleMediaChange);
+            const event = new Event('change');
+            Object.defineProperty(event, 'matches', {
+                value: mediaQueryForAutoTheme.matches,
+                writable: false,
+            });
+            mediaQueryForAutoTheme.dispatchEvent(event);
+            onBeforeUnmount(() => {
+                if (mediaQueryForAutoTheme) {
+                    mediaQueryForAutoTheme.removeEventListener('change', handleMediaChange);
+                }
+            });
+        }
+    };
+};
+
+const setThemeAttribute = createSetThemeAttributeFunction();
+
+const getStoredTheme = (): ThemeMode | null => {
+    return localStorage.getItem('theme') as ThemeMode | null;
+};
+
+const initTheme = () => {
+    const storedTheme = getStoredTheme();
+    if (storedTheme === null) {
+        setThemeAttribute(ThemeMode.Auto);
+    } else {
+        setThemeAttribute(storedTheme);
+    }
+};
+
+const changeTheme = (context: Context) => {
+    const themeLabel = themeLabelMap[context.item.label] as ThemeMode;
+    console.log(themeLabel);
+    setThemeAttribute(themeLabel);
+    localStorage.setItem('theme', themeLabel);
+};
+const haddingFbars = () => {
+    show.value = !smallScreen.matches;
+    if (smallScreen.matches) {
+        localStorage.setItem('theme', 'auto');
+    }
+};
+onMounted(() => {
+    initTheme();
+    haddingFbars();
+    window.addEventListener('resize', haddingFbars);
+});
+onUnmounted(() => {
+    window.removeEventListener('resize', haddingFbars);
+});
+</script>
+<style scoped></style>

napcat.webui/src/backend/shell.ts

@@ -74,6 +74,26 @@ export class QQLoginManager {
         }
         return false;
     }
+    public async checkQQLoginStatusWithQrcode(): Promise<{ qrcodeurl: string; isLogin: string } | undefined> {
+        try {
+            const QQLoginResponse = await fetch(`${this.apiPrefix}/QQLogin/CheckLoginStatus`, {
+                method: 'POST',
+                headers: {
+                    Authorization: 'Bearer ' + this.retCredential,
+                    'Content-Type': 'application/json',
+                },
+            });
+            if (QQLoginResponse.status == 200) {
+                const QQLoginResponseJson = await QQLoginResponse.json();
+                if (QQLoginResponseJson.code == 0) {
+                    return QQLoginResponseJson.data;
+                }
+            }
+        } catch (error) {
+            console.error('Error checking QQ login status:', error);
+        }
+        return undefined;
+    }
 
     public async checkWebUiLogined(): Promise<boolean> {
         try {

napcat.webui/src/components/Dashboard.vue

@@ -1,16 +1,18 @@
 <template>
-    <div class="dashboard-container">
-        <SidebarMenu :menu-items="menuItems" class="sidebar-menu" />
-        <div class="content">
-            <router-view />
+    <t-layout class="dashboard-container">
+        <div ref="menuRef">
+            <SidebarMenu :menu-items="menuItems" class="sidebar-menu" />
         </div>
-    </div>
+        <t-layout>
+            <router-view />
+        </t-layout>
+    </t-layout>
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue';
+import { onMounted, ref } from 'vue';
 import SidebarMenu from './webui/Nav.vue';
-
+import emitter from '@/ts/event-bus';
 interface MenuItem {
     value: string;
     icon: string;
@@ -25,6 +27,14 @@ const menuItems = ref<MenuItem[]>([
     { value: 'item5', icon: 'system-log', label: '日志查看', route: '/dashboard/log-view' },
     { value: 'item6', icon: 'info-circle', label: '关于我们', route: '/dashboard/about-us' },
 ]);
+const menuRef = ref<HTMLDivElement | null>(null);
+emitter.on('sendMenu', (event) => {
+    emitter.emit('sendWidth', menuRef.value?.offsetWidth);
+    localStorage.setItem('menuWidth', menuRef.value?.offsetWidth?.toString() || '0');
+});
+onMounted(() => {
+    localStorage.setItem('menuWidth', menuRef.value?.offsetWidth?.toString() || '0');
+});
 </script>
 
 <style scoped>
@@ -32,6 +42,7 @@ const menuItems = ref<MenuItem[]>([
     display: flex;
     flex-direction: row;
     height: 100vh;
+    width: 100%;
 }
 
 .sidebar-menu {
@@ -39,14 +50,6 @@ const menuItems = ref<MenuItem[]>([
     z-index: 2;
 }
 
-.content {
-    flex: 1;
-    /* padding: 20px; */
-    overflow: auto;
-    position: relative;
-    z-index: 1;
-}
-
 @media (max-width: 768px) {
     .content {
         padding: 10px;

napcat.webui/src/components/QQLogin.vue

@@ -1,36 +1,43 @@
 <template>
-    <div class="login-container">
-        <h2 class="sotheby-font">QQ Login</h2>
-        <div class="login-methods">
-            <t-button
-                id="quick-login"
-                class="login-method"
-                :class="{ active: loginMethod === 'quick' }"
-                @click="loginMethod = 'quick'"
-                >Quick Login</t-button
-            >
-            <t-button
-                id="qrcode-login"
-                class="login-method"
-                :class="{ active: loginMethod === 'qrcode' }"
-                @click="loginMethod = 'qrcode'"
-                >QR Code</t-button
-            >
+    <t-card class="layout">
+        <div class="login-container">
+            <h2 class="sotheby-font">QQ Login</h2>
+            <div class="login-methods">
+                <t-tooltip content="快速登录">
+                    <t-button
+                        id="quick-login"
+                        class="login-method"
+                        :class="{ active: loginMethod === 'quick' }"
+                        @click="loginMethod = 'quick'"
+                        >Quick Login</t-button
+                    >
+                </t-tooltip>
+                <t-tooltip content="二维码登录">
+                    <t-button
+                        id="qrcode-login"
+                        class="login-method"
+                        :class="{ active: loginMethod === 'qrcode' }"
+                        @click="loginMethod = 'qrcode'"
+                        >QR Code</t-button
+                    >
+                </t-tooltip>
+            </div>
+            <div v-show="loginMethod === 'quick'" id="quick-login-dropdown" class="login-form">
+                <t-select
+                    id="quick-login-select"
+                    v-model="selectedAccount"
+                    placeholder="Select Account"
+                    @change="selectAccount"
+                >
+                    <t-option v-for="account in quickLoginList" :key="account" :value="account">{{ account }}</t-option>
+                </t-select>
+            </div>
+            <div v-show="loginMethod === 'qrcode'" id="qrcode" class="qrcode">
+                <canvas ref="qrcodeCanvas"></canvas>
+            </div>
         </div>
-        <div v-show="loginMethod === 'quick'" id="quick-login-dropdown" class="login-form">
-            <t-select
-                id="quick-login-select"
-                v-model="selectedAccount"
-                placeholder="Select Account"
-                @change="selectAccount"
-            >
-                <t-option v-for="account in quickLoginList" :key="account" :value="account">{{ account }}</t-option>
-            </t-select>
-        </div>
-        <div v-show="loginMethod === 'qrcode'" id="qrcode" class="qrcode">
-            <canvas ref="qrcodeCanvas"></canvas>
-        </div>
-    </div>
+        <t-footer class="footer">Power By NapCat.WebUi</t-footer>
+    </t-card>
 </template>
 
 <script setup lang="ts">
@@ -47,10 +54,13 @@ const selectedAccount = ref<string>('');
 const qrcodeCanvas = ref<HTMLCanvasElement | null>(null);
 const qqLoginManager = new QQLoginManager(localStorage.getItem('auth') || '');
 let heartBeatTimer: number | null = null;
-
+let qrcodeUrl: string = '';
 const selectAccount = async (accountName: string): Promise<void> => {
     const { result, errMsg } = await qqLoginManager.setQuickLogin(accountName);
     if (result) {
+        if (heartBeatTimer) {
+            clearInterval(heartBeatTimer);
+        }
         await MessagePlugin.success('登录成功即将跳转');
         await router.push({ path: '/dashboard/basic-info' });
     } else {
@@ -73,19 +83,27 @@ const generateQrCode = (data: string, canvas: HTMLCanvasElement | null): void =>
 };
 
 const HeartBeat = async (): Promise<void> => {
-    const isLogined = await qqLoginManager.checkQQLoginStatus();
-    if (isLogined) {
+    const isLogined = await qqLoginManager.checkQQLoginStatusWithQrcode();
+    if (isLogined?.isLogin) {
         if (heartBeatTimer) {
             clearInterval(heartBeatTimer);
         }
+        // //判断是否已经调转
+        // if (router.currentRoute.value.path !== '/dashboard/basic-info') {
+        //     return;
+        // }
+        await MessagePlugin.success('登录成功即将跳转');
         await router.push({ path: '/dashboard/basic-info' });
+    } else if (isLogined?.qrcodeurl && qrcodeUrl !== isLogined.qrcodeurl) {
+        qrcodeUrl = isLogined.qrcodeurl;
+        generateQrCode(qrcodeUrl, qrcodeCanvas.value);
     }
 };
 
 const InitPages = async (): Promise<void> => {
     quickLoginList.value = await qqLoginManager.getQQQuickLoginList();
-    const qrcodeData = await qqLoginManager.getQQLoginQrcode();
-    generateQrCode(qrcodeData, qrcodeCanvas.value);
+    qrcodeUrl = await qqLoginManager.getQQLoginQrcode();
+    generateQrCode(qrcodeUrl, qrcodeCanvas.value);
     heartBeatTimer = window.setInterval(HeartBeat, 3000);
 };
 
@@ -95,14 +113,16 @@ onMounted(() => {
 </script>
 
 <style scoped>
+.layout {
+    height: 100vh;
+}
 .login-container {
     padding: 20px;
     border-radius: 5px;
-    background-color: white;
     max-width: 400px;
     min-width: 300px;
     position: relative;
-    margin: 0 auto;
+    margin: 50px auto;
 }
 
 @media (max-width: 600px) {
@@ -161,7 +181,5 @@ onMounted(() => {
     bottom: 20px;
     left: 0;
     right: 0;
-    width: 100%;
-    background-color: white;
 }
 </style>

napcat.webui/src/components/WebUiLogin.vue

@@ -1,20 +1,22 @@
 <template>
-    <div class="login-container">
-        <h2 class="sotheby-font">WebUi Login</h2>
-        <t-form ref="form" :data="formData" colon :label-width="0" @submit="onSubmit">
-            <t-form-item name="password">
-                <t-input v-model="formData.token" type="password" clearable placeholder="请输入Token">
-                    <template #prefix-icon>
-                        <lock-on-icon />
-                    </template>
-                </t-input>
-            </t-form-item>
-            <t-form-item>
-                <t-button theme="primary" type="submit" block>登录</t-button>
-            </t-form-item>
-        </t-form>
-    </div>
-    <div class="footer">Power By NapCat.WebUi</div>
+    <t-card class="layout">
+        <div class="login-container">
+            <h2 class="sotheby-font">WebUi Login</h2>
+            <t-form ref="form" :data="formData" colon :label-width="0" @submit="onSubmit">
+                <t-form-item name="password">
+                    <t-input v-model="formData.token" type="password" clearable placeholder="请输入Token">
+                        <template #prefix-icon>
+                            <lock-on-icon />
+                        </template>
+                    </t-input>
+                </t-form-item>
+                <t-form-item>
+                    <t-button theme="primary" type="submit" block>登录</t-button>
+                </t-form-item>
+            </t-form>
+        </div>
+        <t-footer class="footer">Power By NapCat.WebUi</t-footer>
+    </t-card>
 </template>
 
 <script setup lang="ts">
@@ -94,14 +96,16 @@ const onSubmit = async ({ validateResult }: { validateResult: boolean }) => {
 </script>
 
 <style scoped>
+.layout {
+    height: 100vh;
+}
 .login-container {
     padding: 20px;
     border-radius: 5px;
-    background-color: white;
     max-width: 400px;
     min-width: 300px;
     position: relative;
-    margin: 0 auto;
+    margin: 50px auto;
 }
 
 @media (max-width: 600px) {
@@ -145,7 +149,5 @@ const onSubmit = async ({ validateResult }: { validateResult: boolean }) => {
     bottom: 20px;
     left: 0;
     right: 0;
-    width: 100%;
-    background-color: white;
 }
 </style>

napcat.webui/src/components/webui/Nav.vue

@@ -1,16 +1,31 @@
 <template>
     <t-menu theme="light" default-value="2-1" :collapsed="collapsed" class="sidebar-menu">
-        <template #logo> </template>
+        <template #logo>
+            <div class="logo">
+                <img class="logo-img" :width="collapsed ? 35 : 'auto'" src="@/assets/logo_webui.png" alt="logo" />
+                <div class="logo-textBox">
+                    <div class="logo-text">{{ collapsed ? '' : 'NapCat' }}</div>
+                </div>
+            </div>
+        </template>
         <router-link v-for="item in menuItems" :key="item.value" :to="item.route">
-            <t-menu-item :value="item.value" :disabled="item.disabled" class="menu-item">
-                <template #icon>
-                    <t-icon :name="item.icon" />
-                </template>
-                {{ item.label }}
-            </t-menu-item>
+            <t-tooltip :disabled="!collapsed" :content="item.label" placement="right">
+                <t-menu-item :value="item.value" :disabled="item.disabled" class="menu-item">
+                    <template #icon>
+                        <t-icon :name="item.icon" />
+                    </template>
+                    {{ item.label }}
+                </t-menu-item>
+            </t-tooltip>
         </router-link>
         <template #operations>
-            <t-button class="t-demo-collapse-btn" variant="text" shape="square" @click="changeCollapsed">
+            <t-button
+                :disabled="disBtn"
+                class="t-demo-collapse-btn"
+                variant="text"
+                shape="square"
+                @click="changeCollapsed"
+            >
                 <template #icon><t-icon :name="iconName" /></template>
             </t-button>
         </template>
@@ -18,7 +33,8 @@
 </template>
 
 <script setup lang="ts">
-import { ref, defineProps } from 'vue';
+import { ref, defineProps, onMounted, watch } from 'vue';
+import emitter from '@/ts/event-bus';
 
 type MenuItem = {
     value: string;
@@ -31,15 +47,39 @@ type MenuItem = {
 defineProps<{
     menuItems: MenuItem[];
 }>();
-
 const collapsed = ref<boolean>(localStorage.getItem('sidebar-collapsed') === 'true');
 const iconName = ref<string>(collapsed.value ? 'menu-unfold' : 'menu-fold');
+const disBtn = ref<boolean>(false);
 
 const changeCollapsed = (): void => {
     collapsed.value = !collapsed.value;
     iconName.value = collapsed.value ? 'menu-unfold' : 'menu-fold';
     localStorage.setItem('sidebar-collapsed', collapsed.value.toString());
 };
+watch(collapsed, (newValue, oldValue) => {
+    setTimeout(() => {
+        emitter.emit('sendMenu', collapsed.value);
+    }, 300);
+});
+onMounted(() => {
+    const mediaQuery = window.matchMedia('(max-width: 800px)');
+    const handleMediaChange = (e: MediaQueryListEvent) => {
+        disBtn.value = e.matches;
+        if (e.matches) {
+            collapsed.value = e.matches;
+        }
+    };
+    mediaQuery.addEventListener('change', handleMediaChange);
+    const event = new Event('change');
+    Object.defineProperty(event, 'matches', {
+        value: mediaQuery.matches,
+        writable: false,
+    });
+    mediaQuery.dispatchEvent(event);
+    return () => {
+        mediaQuery.removeEventListener('change', handleMediaChange);
+    };
+});
 </script>
 
 <style scoped>
@@ -57,12 +97,28 @@ const changeCollapsed = (): void => {
         width: 100px; /* 移动端侧边栏宽度 */
     }
 }
-
+.logo {
+    display: flex;
+    width: auto;
+    height: 100%;
+}
+.logo-img {
+    object-fit: contain;
+    margin-top: 8px;
+    margin-bottom: 8px;
+}
+.logo-textBox {
+    display: flex;
+    align-items: center;
+    margin-left: 10px;
+}
 .logo-text {
     display: block;
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
+    font-size: 22px;
+    font-family: Sotheby, Helvetica, monospace;
 }
 
 .menu-item {

napcat.webui/src/main.ts

@@ -19,6 +19,10 @@ import {
     List as TList,
     Alert as TAlert,
     Tag as TTag,
+    Descriptions as TDescriptionsProps,
+    DescriptionsItem as TDescriptionsItem,
+    Collapse as TCollapse,
+    CollapsePanel as TCollapsePanel,
     ListItem as TListItem,
     Tabs as TTabs,
     TabPanel as TTabPanel,
@@ -27,10 +31,18 @@ import {
     Popup as TPopup,
     Dialog as TDialog,
     Switch as TSwitch,
+    Tooltip as Tooltip,
+    StickyTool as TStickyTool,
+    StickyItem as TStickyItem,
+    Layout as TLayout,
+    Content as TContent,
+    Footer as TFooter,
+    Aside as TAside,
+    Popconfirm as Tpopconfirm,
+    Empty as TEmpty,
 } from 'tdesign-vue-next';
 import { router } from './router';
 import 'tdesign-vue-next/es/style/index.css';
-
 const app = createApp(App);
 app.use(router);
 app.use(TButton);
@@ -51,6 +63,10 @@ app.use(TLink);
 app.use(TList);
 app.use(TAlert);
 app.use(TTag);
+app.use(TDescriptionsProps);
+app.use(TDescriptionsItem);
+app.use(TCollapse);
+app.use(TCollapsePanel);
 app.use(TListItem);
 app.use(TTabs);
 app.use(TTabPanel);
@@ -59,4 +75,13 @@ app.use(TCheckbox);
 app.use(TPopup);
 app.use(TDialog);
 app.use(TSwitch);
+app.use(Tooltip);
+app.use(TStickyTool);
+app.use(TStickyItem);
+app.use(TLayout);
+app.use(TContent);
+app.use(TFooter);
+app.use(TAside);
+app.use(Tpopconfirm);
+app.use(TEmpty);
 app.mount('#app');

napcat.webui/src/pages/NetWork.vue

@@ -1,122 +1,300 @@
 <template>
-    <t-space class="full-space">
-        <template v-if="clientPanelData.length > 0">
-            <t-tabs
-                v-model="activeTab"
-                :addable="true"
-                theme="card"
-                @add="showAddTabDialog"
-                @remove="removeTab"
-                class="full-tabs"
-            >
-                <t-tab-panel
-                    v-for="(config, idx) in clientPanelData"
-                    :key="idx"
-                    :label="config.name"
-                    :removable="true"
-                    :value="idx"
-                    class="full-tab-panel"
-                >
-                    <component :is="resolveDynamicComponent(getComponent(config.key))" :config="config.data" />
-                    <div class="button-container">
-                        <t-button @click="saveConfig" style="width: 100px; height: 40px">保存</t-button>
+    <div ref="headerBox" class="title">
+        <t-divider content="网络配置" align="left" />
+        <t-divider align="right">
+            <t-button @click="addConfig()">
+                <template #icon><add-icon /></template>
+                添加配置</t-button>
+        </t-divider>
+    </div>
+    <div v-if="loadPage" ref="setting" class="setting">
+        <t-tabs ref="tabsRef" :style="{ width: tabsWidth + 'px' }" default-value="all" @change="selectType">
+            <t-tab-panel value="all" label="全部"></t-tab-panel>
+            <t-tab-panel value="httpServers" label="HTTP 服务器"></t-tab-panel>
+            <t-tab-panel value="httpClients" label="HTTP 客户端"></t-tab-panel>
+            <t-tab-panel value="websocketServers" label="WebSocket 服务器"></t-tab-panel>
+            <t-tab-panel value="websocketClients" label="WebSocket 客户端"></t-tab-panel>
+        </t-tabs>
+    </div>
+    <div v-if="loadPage" class="card-box" :style="{ width: tabsWidth + 'px' }">
+        <div class="setting-box" :style="{ maxHeight: cardHeight + 'px' }" v-if="cardConfig.length > 0">
+            <div v-for="(item, index) in cardConfig" :key="index">
+                <t-card :title="item.name" :description="item.type" :style="{ width: cardWidth + 'px' }"
+                    :header-bordered="true" class="setting-card">
+                    <template #actions>
+                        <t-space>
+                            <edit2-icon size="20px" @click="editConfig(item)"></edit2-icon>
+                            <t-popconfirm theme="danger" content="确认删除" @confirm="delConfig(item)">
+                                <delete-icon size="20px"></delete-icon>
+                            </t-popconfirm>
+                        </t-space>
+                    </template>
+                    <div class="setting-content">
+                        <t-card class="card-address" :style="{
+                            borderLeft: '7px solid ' + (item.enable ?
+                                'var(--td-success-color)' :
+                                'var(--td-error-color)')
+                        }">
+                                <div class="local-box" v-if="item.host&&item.port">
+                                    <server-filled-icon class="local-icon" size="20px"></server-filled-icon>
+                                    <strong class="local">{{ item.host }}:{{ item.port }}</strong>
+                                    <copy-icon class="copy-icon"  size="20px" @click="copyText(item.host + ':' + item.port)"></copy-icon>
+                                </div>
+                                <div  class="local-box" v-if="item.url">
+                                    <server-filled-icon class="local-icon" size="20px"></server-filled-icon>
+                                    <strong  class="local" >{{ item.url }}</strong>
+                                    <copy-icon class="copy-icon"  size="20px" @click="copyText(item.url)"></copy-icon>
+                                </div>
+                        </t-card>
+                        <t-collapse :default-value="[0]" expand-mutex style="margin-top:10px;" class="info-coll">
+                            <t-collapse-panel header="基础信息">
+                                <t-descriptions size="small" :layout="infoOneCol ? 'vertical' : 'horizontal'"
+                                    class="setting-base-info">
+                                    <t-descriptions-item v-if="item.token" label="连接密钥">
+                                        <div v-if="mediumScreen.matches||largeScreen.matches" class="token-view">
+                                            <span>{{ showToken ? item.token : '******' }}</span>
+                                            <browse-icon class="browse-icon" v-if="showToken" size="18px"
+                                                @click="showToken = false"></browse-icon>
+                                            <browse-off-icon class="browse-icon" v-else size="18px"
+                                                @click="showToken = true"></browse-off-icon>
+                                        </div>
+                                        <div v-else>
+                                            <t-popup :showArrow="true" trigger="click">
+                                                <t-tag theme="primary">点击查看</t-tag>
+                                                <template #content>
+                                                    <div @click="copyText(item.token)">{{item.token}}</div>
+                                                </template>
+                                            </t-popup>
+                                        </div>
+                                    </t-descriptions-item>
+                                    <t-descriptions-item label="消息格式">{{ item.messagePostFormat }}</t-descriptions-item>
+                                </t-descriptions>
+                            </t-collapse-panel>
+                            <t-collapse-panel header="状态信息">
+                                <t-descriptions size="small" :layout="infoOneCol ? 'vertical' : 'horizontal'"
+                                    class="setting-base-info">
+                                    <t-descriptions-item v-if="item.hasOwnProperty('debug')" label="调试日志">
+                                        <t-tag class="tag-item" :theme="item.debug ? 'success' : 'danger'">
+                                            {{ item.debug ? '开启' : '关闭' }}</t-tag>
+                                    </t-descriptions-item>
+                                    <t-descriptions-item v-if="item.hasOwnProperty('enableWebsocket')"
+                                        label="Websocket 功能">
+                                        <t-tag class="tag-item" :theme="item.enableWebsocket ? 'success' : 'danger'">
+                                            {{ item.enableWebsocket ? '启用' : '禁用' }}</t-tag>
+                                    </t-descriptions-item>
+                                    <t-descriptions-item v-if="item.hasOwnProperty('enableCors')" label="跨域放行">
+                                        <t-tag class="tag-item" :theme="item.enableCors ? 'success' : 'danger'">
+                                            {{ item.enableCors ? '开启' : '关闭' }}</t-tag>
+                                    </t-descriptions-item>
+                                    <t-descriptions-item v-if="item.hasOwnProperty('enableForcePushEvent')"
+                                        label="上报自身消息">
+                                        <t-tag class="tag-item" :theme="item.reportSelfMessage ? 'success' : 'danger'">
+                                            {{ item.reportSelfMessage ? '开启' : '关闭' }}</t-tag>
+                                    </t-descriptions-item>
+                                    <t-descriptions-item v-if="item.hasOwnProperty('enableForcePushEvent')"
+                                        label="强制推送事件">
+                                        <t-tag class="tag-item"
+                                            :theme="item.enableForcePushEvent ? 'success' : 'danger'">
+                                            {{ item.enableForcePushEvent ? '开启' : '关闭' }}</t-tag>
+                                    </t-descriptions-item>
+                                </t-descriptions>
+                            </t-collapse-panel>
+                        </t-collapse>
                     </div>
-                </t-tab-panel>
-            </t-tabs>
-        </template>
-        <template v-else>
-            <EmptyStateComponent :showAddTabDialog="showAddTabDialog" />
-        </template>
-        <t-dialog
-            v-model:visible="isDialogVisible"
-            header="添加网络配置"
-            @close="isDialogVisible = false"
-            @confirm="addTab"
-        >
-            <t-form ref="form" :model="newTab">
-                <t-form-item :rules="[{ required: true, message: '请输入名称' }]" label="名称" name="name">
+                </t-card>
+            </div>
+            <div style="height: 20vh"></div>
+        </div>
+        <t-card  v-else>
+            <t-empty class="card-none" title="暂无网络配置"> </t-empty>
+        </t-card>
+    </div>
+    <t-dialog v-model:visible="visibleBody" :header="dialogTitle" :destroy-on-close="true"
+        :show-in-attached-element="true" placement="center" :on-confirm="saveConfig" class=".t-dialog__ctx .t-dialog--defaul">
+        <div slot="body" class="dialog-body" >
+            <t-form ref="form" :data="newTab" labelAlign="left" :model="newTab">
+                <t-form-item style="text-align: left" :rules="[{ required: true, message: '请输入名称', trigger: 'blur' }]"
+                    label="名称" name="name">
                     <t-input v-model="newTab.name" />
                 </t-form-item>
-                <t-form-item :rules="[{ required: true, message: '请选择类型' }]" label="类型" name="type">
-                    <t-select v-model="newTab.type">
+                <t-form-item style="text-align: left" :rules="[{ required: true, message: '请选择类型', trigger: 'change' }]"
+                    label="类型" name="type">
+                    <t-select v-model="newTab.type" @change="onloadDefault">
                         <t-option value="httpServers">HTTP 服务器</t-option>
                         <t-option value="httpClients">HTTP 客户端</t-option>
                         <t-option value="websocketServers">WebSocket 服务器</t-option>
                         <t-option value="websocketClients">WebSocket 客户端</t-option>
                     </t-select>
                 </t-form-item>
+                <div>
+                    <component :is="resolveDynamicComponent(getComponent(newTab.type as ComponentKey))"
+                        :config="newTab.data" />
+                </div>
             </t-form>
-        </t-dialog>
-    </t-space>
+        </div>
+    </t-dialog>
 </template>
 
 <script setup lang="ts">
-import { ref, resolveDynamicComponent, nextTick, Ref, onMounted } from 'vue';
-import { MessagePlugin } from 'tdesign-vue-next';
+import { AddIcon, DeleteIcon, Edit2Icon, ServerFilledIcon, CopyIcon, BrowseOffIcon, BrowseIcon } from 'tdesign-icons-vue-next';
+import { onMounted, onUnmounted, ref, resolveDynamicComponent } from 'vue';
+import emitter from '@/ts/event-bus';
 import {
-    httpServerDefaultConfigs,
-    httpClientDefaultConfigs,
-    websocketServerDefaultConfigs,
-    websocketClientDefaultConfigs,
-    HttpClientConfig,
-    HttpServerConfig,
-    WebsocketClientConfig,
-    WebsocketServerConfig,
+    mergeNetworkDefaultConfig,
+    mergeOneBotConfigs,
     NetworkConfig,
     OneBotConfig,
-    mergeOneBotConfigs,
 } from '../../../src/onebot/config/config';
-import { QQLoginManager } from '@/backend/shell';
 import HttpServerComponent from '@/pages/network/HttpServerComponent.vue';
 import HttpClientComponent from '@/pages/network/HttpClientComponent.vue';
 import WebsocketServerComponent from '@/pages/network/WebsocketServerComponent.vue';
 import WebsocketClientComponent from '@/pages/network/WebsocketClientComponent.vue';
-import EmptyStateComponent from '@/pages/network/EmptyStateComponent.vue';
+import { MessagePlugin } from 'tdesign-vue-next';
+import { QQLoginManager } from '@/backend/shell';
 
-type ConfigKey = 'httpServers' | 'httpClients' | 'websocketServers' | 'websocketClients';
-type ConfigUnion = HttpClientConfig | HttpServerConfig | WebsocketServerConfig | WebsocketClientConfig;
-type ComponentUnion =
+const showToken = ref<boolean>(false);
+const infoOneCol = ref<boolean>(true);
+const tabsWidth = ref<number>(0);
+const menuWidth = ref<number>(0);
+const cardWidth = ref<number>(0);
+const cardHeight = ref<number>(0);
+const mediumScreen = window.matchMedia('(min-width: 768px) and (max-width: 1024px)');
+const largeScreen = window.matchMedia('(min-width: 1025px)');
+const headerBox = ref<HTMLDivElement | null>(null);
+const setting = ref<HTMLDivElement | null>(null);
+const loadPage = ref<boolean>(false);
+const visibleBody = ref<boolean>(false);
+const newTab = ref<{ name: string; data: any; type: string }>({ name: '', data: {}, type: '' });
+const dialogTitle = ref<string>('');
+
+type ComponentKey = keyof typeof mergeNetworkDefaultConfig;
+
+const componentMap: Record<
+    ComponentKey,
     | typeof HttpServerComponent
     | typeof HttpClientComponent
     | typeof WebsocketServerComponent
-    | typeof WebsocketClientComponent;
-
-const componentMap: Record<ConfigKey, ComponentUnion> = {
+    | typeof WebsocketClientComponent
+> = {
     httpServers: HttpServerComponent,
     httpClients: HttpClientComponent,
     websocketServers: WebsocketServerComponent,
     websocketClients: WebsocketClientComponent,
 };
 
-const defaultConfigMap: Record<ConfigKey, ConfigUnion> = {
-    httpServers: httpServerDefaultConfigs,
-    httpClients: httpClientDefaultConfigs,
-    websocketServers: websocketServerDefaultConfigs,
-    websocketClients: websocketClientDefaultConfigs,
+//操作类型
+const operateType = ref<string>('');
+//配置项索引
+const configIndex = ref<number>(0);
+//保存时所用数据
+const networkConfig: NetworkConfig & { [key: string]: any; } = {
+    websocketClients: [],
+    websocketServers: [],
+    httpClients: [],
+    httpServers: [],
 };
 
-interface ConfigMap {
-    httpServers: HttpServerConfig;
-    httpClients: HttpClientConfig;
-    websocketServers: WebsocketServerConfig;
-    websocketClients: WebsocketClientConfig;
-}
-
-interface ClientPanel<K extends ConfigKey = ConfigKey> {
-    name: string;
-    key: K;
-    data: ConfigMap[K];
-}
-
-const activeTab = ref<number>(0);
-const isDialogVisible = ref(false);
-const newTab = ref<{ name: string; type: ConfigKey }>({ name: '', type: 'httpServers' });
-const clientPanelData: Ref<ClientPanel[]> = ref([]);
-
-const getComponent = (type: ConfigKey) => {
+//挂载的数据
+const WebConfg = ref(
+    new Map<string, Array<null>>([
+        ['all', []],
+        ['httpServers', []],
+        ['httpClients', []],
+        ['websocketServers', []],
+        ['websocketClients', []],
+    ])
+);
+const typeCh: Record<ComponentKey, string> = {
+    httpServers: 'HTTP 服务器',
+    httpClients: 'HTTP 客户端',
+    websocketServers: 'WebSocket 服务器',
+    websocketClients: 'WebSocket 客户端',
+};
+const cardConfig = ref<any>([]);
+const getComponent = (type: ComponentKey) => {
     return componentMap[type];
 };
+const getKeyByValue = (obj: typeof typeCh, value: string): string | undefined => {
+    return Object.entries(obj).find(([_, v]) => v === value)?.[0];
+};
 
+const addConfig = () => {
+    dialogTitle.value = '添加配置';
+    newTab.value = { name: '', data: {}, type: '' };
+    operateType.value = 'add';
+    visibleBody.value = true;
+};
+
+const editConfig = (item: any) => {
+    dialogTitle.value = '修改配置';
+    const type = getKeyByValue(typeCh, item.type);
+    if (type) {
+        newTab.value = { name: item.name, data: item, type: type };
+    }
+    operateType.value = 'edit';
+    configIndex.value = networkConfig[newTab.value.type].findIndex((obj: any) => obj.name === item.name);
+    visibleBody.value = true;
+};
+const delConfig = (item: any) => {
+    const type = getKeyByValue(typeCh, item.type);
+    if (type) {
+        newTab.value = { name: item.name, data: item, type: type };
+    }
+    configIndex.value = configIndex.value = networkConfig[newTab.value.type].findIndex(
+        (obj: any) => obj.name === item.name
+    );
+    operateType.value = 'delete';
+    saveConfig();
+};
+
+const selectType = (key: ComponentKey) => {
+    cardConfig.value = WebConfg.value.get(key);
+};
+
+const onloadDefault = (key: ComponentKey) => {
+    console.log(key);
+    newTab.value.data = structuredClone(mergeNetworkDefaultConfig[key]);
+};
+//检测重名
+const checkName = (name: string) => {
+    const allConfigs = WebConfg.value.get('all')?.findIndex((obj: any) => obj.name === name);
+    if (newTab.value.name === '' || newTab.value.type === '') {
+        MessagePlugin.error('请填写完整信息');
+        return false;
+    } else if (allConfigs === -1 || newTab.value.data.name === name) {
+        return true;
+    } else {
+        MessagePlugin.error('名称已存在');
+        return false;
+    }
+};
+//保存
+const saveConfig = async () => {
+    if (operateType.value == 'add') {
+        if (!checkName(newTab.value.name)) return;
+        newTab.value.data.name = newTab.value.name;
+        networkConfig[newTab.value.type].push(newTab.value.data);
+    } else if (operateType.value == 'edit') {
+        if (!checkName(newTab.value.name)) return;
+        newTab.value.data.name = newTab.value.name;
+        networkConfig[newTab.value.type][configIndex.value] = newTab.value.data;
+    } else if (operateType.value == 'delete') {
+        networkConfig[newTab.value.type].splice(configIndex.value, 1);
+    }
+    const userConfig = await getOB11Config();
+    if (!userConfig) return;
+    userConfig.network = networkConfig;
+    const success = await setOB11Config(userConfig);
+    if (success) {
+        operateType.value = '';
+        configIndex.value = 0;
+        MessagePlugin.success('配置保存成功');
+        await loadConfig();
+        visibleBody.value = false;
+    } else {
+        MessagePlugin.error('配置保存失败');
+    }
+};
 const getOB11Config = async (): Promise<OneBotConfig | undefined> => {
     const storedCredential = localStorage.getItem('auth');
     if (!storedCredential) {
@@ -137,27 +315,27 @@ const setOB11Config = async (config: OneBotConfig): Promise<boolean> => {
     return await loginManager.SetOB11Config(config);
 };
 
-const addToPanel = <K extends ConfigKey>(configs: ConfigMap[K][], key: K) => {
-    configs.forEach((config) => clientPanelData.value.push({ name: config.name, data: config, key }));
-};
-
-const addConfigDataToPanel = (data: NetworkConfig) => {
-    (Object.keys(data) as ConfigKey[]).forEach((key) => {
-        addToPanel(data[key], key);
-    });
-};
-
-const parsePanelData = (): NetworkConfig => {
-    const result: NetworkConfig = {
-        httpServers: [],
-        httpClients: [],
-        websocketServers: [],
-        websocketClients: [],
-    };
-    clientPanelData.value.forEach((panel) => {
-        (result[panel.key] as Array<typeof panel.data>).push(panel.data);
-    });
-    return result;
+//获取卡片数据
+const getAllData = (data: NetworkConfig) => {
+    cardConfig.value = [];
+    WebConfg.value.set('all', []);
+    for (const key in data) {
+        const configs = data[key as keyof NetworkConfig];
+        if (key in mergeNetworkDefaultConfig) {
+            networkConfig[key] = [...configs];
+            const newConfigsArray = configs.map((config: any) => ({
+                ...config,
+                type: typeCh[key as ComponentKey],
+            }));
+            WebConfg.value.set(key, newConfigsArray);
+            const allConfigs = WebConfg.value.get('all');
+            if (allConfigs) {
+                const newAllConfigs = [...allConfigs, ...newConfigsArray];
+                WebConfg.value.set('all', newAllConfigs);
+            }
+            cardConfig.value = WebConfg.value.get('all');
+        }
+    }
 };
 
 const loadConfig = async () => {
@@ -165,85 +343,198 @@ const loadConfig = async () => {
         const userConfig = await getOB11Config();
         if (!userConfig) return;
         const mergedConfig = mergeOneBotConfigs(userConfig);
-        addConfigDataToPanel(mergedConfig.network);
+        getAllData(mergedConfig.network);
     } catch (error) {
         console.error('Error loading config:', error);
     }
 };
 
-const saveConfig = async () => {
-    const config = parsePanelData();
-    const userConfig = await getOB11Config();
-    if (!userConfig) {
-        await MessagePlugin.error('无法获取配置！');
-        return;
-    }
-    userConfig.network = config;
-    const success = await setOB11Config(userConfig);
-    if (success) {
-        await MessagePlugin.success('配置保存成功');
+const copyText = async (text: string) => {
+    const input = document.createElement('input');
+    input.value = text;
+    document.body.appendChild(input);
+    input.select();
+    await navigator.clipboard.writeText(text);
+    document.body.removeChild(input);
+    MessagePlugin.success('复制成功');
+};
+
+const handleResize = () => {
+    // 得根据卡片宽度改，懒得改了；先不管了
+    // if(window.innerWidth < 540) {
+    //     infoOneCol.value= true
+    // } else {
+    //     infoOneCol.value= false
+    // }
+    tabsWidth.value = window.innerWidth - 41 - menuWidth.value;
+    if (mediumScreen.matches) {
+        cardWidth.value = (tabsWidth.value - 20) / 2;
+    } else if (largeScreen.matches) {
+        cardWidth.value = (tabsWidth.value - 40) / 3;
     } else {
-        await MessagePlugin.error('配置保存失败');
+        cardWidth.value = tabsWidth.value;
     }
+    loadPage.value = true;
+    setTimeout(() => {
+        cardHeight.value = window.innerHeight - (headerBox.value?.offsetHeight ?? 0) - (setting.value?.offsetHeight ?? 0) - 21;
+    }, 300);
 };
-
-const showAddTabDialog = () => {
-    newTab.value = { name: '', type: 'httpServers' };
-    isDialogVisible.value = true;
-};
-
-const addTab = async () => {
-    const { name, type } = newTab.value;
-    if (clientPanelData.value.some((panel) => panel.name === name)) {
-        await MessagePlugin.error('选项卡名称已存在');
-        return;
+emitter.on('sendWidth', (width) => {
+    if (typeof width === 'number' && !isNaN(width)) {
+        menuWidth.value = width;
+        handleResize();
     }
-    const defaultConfig = structuredClone(defaultConfigMap[type]);
-    defaultConfig.name = name;
-    clientPanelData.value.push({ name, data: defaultConfig, key: type });
-    isDialogVisible.value = false;
-    await nextTick();
-    activeTab.value = clientPanelData.value.length - 1;
-    await MessagePlugin.success('选项卡添加成功');
-};
-
-const removeTab = async (payload: { value: string; index: number; e: PointerEvent }) => {
-    clientPanelData.value.splice(payload.index, 1);
-    activeTab.value = Math.max(0, activeTab.value - 1);
-    await saveConfig();
-};
-
+});
 onMounted(() => {
     loadConfig();
+    const cachedWidth = localStorage.getItem('menuWidth');
+    if (cachedWidth) {
+        menuWidth.value = parseInt(cachedWidth);
+        setTimeout(() => {
+            handleResize();
+        }, 300);
+    }
+    window.addEventListener('resize', handleResize);
+});
+onUnmounted(() => {
+    window.removeEventListener('resize', handleResize);
 });
 </script>
 
 <style scoped>
-.full-space {
-    width: 100%;
-    height: 100%;
+.title {
+    padding: 20px 20px 0 20px;
     display: flex;
-    flex-direction: column;
-    align-items: flex-start;
-    justify-content: flex-start;
+    justify-content: space-between;
 }
 
-.full-tabs {
-    width: 100%;
-    height: 100%;
-    display: flex;
-    flex-direction: column;
+.setting {
+    margin: 0 20px;
 }
 
-.full-tab-panel {
+.setting-box {
+    display: grid;
+    grid-template-columns: 1fr 1fr 1fr;
+    gap: 20px;
+    overflow-y: auto;
+}
+
+.setting-card {
+    width: 100%;
+    text-align: left;
+}
+
+.setting-content {
+    width: 100%;
+}
+
+.card-address svg {
+    fill: var(--td-brand-color);
+    cursor: pointer;
+}
+
+.local-box {
+    display: flex;
+    margin-top: 2px;
+}
+.local-icon{
     flex: 1;
-    display: flex;
-    flex-direction: column;
+}
+.local {
+    flex: 6;
+    margin: 0 10px 0 10px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
 
-.button-container {
+
+.copy-icon {
+    flex: 1;
+    cursor: pointer;
+    flex-direction: row;
+}
+
+
+.token-view {
     display: flex;
-    justify-content: center;
-    margin-top: 20px;
+    align-items: center;
+}
+
+.token-view span {
+    flex: 5;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+.browse-icon{
+    flex: 2;
+}
+:global(.t-dialog__ctx .t-dialog--defaul) {
+    margin: 0 20px;
+}
+@media (max-width: 1024px) {
+    .setting-box {
+        grid-template-columns: 1fr 1fr;
+    }
+}
+
+@media (max-width: 786px) {
+    .setting-box {
+        grid-template-columns: 1fr;
+    }
+
+}
+
+.card-box {
+    margin: 10px 20px 0 20px;
+}
+
+.card-none {
+    line-height: 400px !important;
+}
+
+
+.dialog-body {
+    max-height: 60vh;
+    overflow-y: auto;
+}
+
+::-webkit-scrollbar {
+    width: 0;
+    background: transparent;
+}
+</style>
+<style>
+.setting-card .t-card__title {
+    text-align: left !important;
+}
+
+.setting-card .t-card__description {
+    margin-bottom: 0;
+    font-size: 12px;
+}
+
+.card-address .t-card__body {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+}
+
+.setting-base-info .t-descriptions__header {
+    font-size: 15px;
+    margin-bottom: 0;
+}
+
+.setting-base-info .t-descriptions__label {
+    padding: 0 var(--td-comp-paddingLR-l) !important;
+}
+
+.setting-base-info tr>td:last-child {
+    text-align: right;
+}
+
+.info-coll .t-collapse-panel__wrapper .t-collapse-panel__content {
+    padding: var(--td-comp-paddingTB-m) var(--td-comp-paddingLR-l);
 }
 </style>

napcat.webui/src/pages/OtherConfig.vue

@@ -1,22 +1,27 @@
 <template>
-    <div>
+    <div class="title">
         <t-divider content="其余配置" align="left" />
     </div>
-    <div class="other-config-container">
-        <div class="other-config">
-            <t-form ref="form" :model="otherConfig" class="form">
-                <t-form-item label="音乐签名地址" name="musicSignUrl" class="form-item">
-                    <t-input v-model="otherConfig.musicSignUrl" />
-                </t-form-item>
-                <t-form-item label="启用本地文件到URL" name="enableLocalFile2Url" class="form-item">
-                    <t-switch v-model="otherConfig.enableLocalFile2Url" />
-                </t-form-item>
-            </t-form>
-            <div class="button-container">
-                <t-button @click="saveConfig">保存</t-button>
+    <t-card class="card">
+        <div class="other-config-container">
+            <div class="other-config">
+                <t-form ref="form" :model="otherConfig" :label-align="labelAlign" label-width="auto" colon>
+                    <t-form-item label="音乐签名地址" name="musicSignUrl" class="form-item">
+                        <t-input v-model="otherConfig.musicSignUrl" />
+                    </t-form-item>
+                    <t-form-item label="启用本地文件到URL" name="enableLocalFile2Url" class="form-item">
+                        <t-switch v-model="otherConfig.enableLocalFile2Url" />
+                    </t-form-item>
+                    <t-form-item label="启用上报解析合并消息" name="parseMultMsg" class="form-item">
+                        <t-switch v-model="otherConfig.parseMultMsg" />
+                    </t-form-item>
+                </t-form>
+                <div class="button-container">
+                    <t-button @click="saveConfig">保存</t-button>
+                </div>
             </div>
         </div>
-    </div>
+    </t-card>
 </template>
 
 <script setup lang="ts">
@@ -28,8 +33,10 @@ import { QQLoginManager } from '@/backend/shell';
 const otherConfig = ref<Partial<OneBotConfig>>({
     musicSignUrl: '',
     enableLocalFile2Url: false,
+    parseMultMsg: true
 });
 
+const labelAlign = ref<string>();
 const getOB11Config = async (): Promise<OneBotConfig | undefined> => {
     const storedCredential = localStorage.getItem('auth');
     if (!storedCredential) {
@@ -56,6 +63,7 @@ const loadConfig = async () => {
         if (userConfig) {
             otherConfig.value.musicSignUrl = userConfig.musicSignUrl;
             otherConfig.value.enableLocalFile2Url = userConfig.enableLocalFile2Url;
+            otherConfig.value.parseMultMsg = userConfig.parseMultMsg;
         }
     } catch (error) {
         console.error('Error loading config:', error);
@@ -68,6 +76,7 @@ const saveConfig = async () => {
         if (userConfig) {
             userConfig.musicSignUrl = otherConfig.value.musicSignUrl || '';
             userConfig.enableLocalFile2Url = otherConfig.value.enableLocalFile2Url ?? false;
+            userConfig.parseMultMsg = otherConfig.value.parseMultMsg ?? true;
             const success = await setOB11Config(userConfig);
             if (success) {
                 MessagePlugin.success('配置保存成功');
@@ -80,55 +89,60 @@ const saveConfig = async () => {
         MessagePlugin.error('配置保存失败');
     }
 };
-
 onMounted(() => {
     loadConfig();
+    const mediaQuery = window.matchMedia('(max-width: 768px)');
+    const handleMediaChange = (e: MediaQueryListEvent) => {
+        if (e.matches) {
+            labelAlign.value = 'top';
+        } else {
+            labelAlign.value = 'left';
+        }
+    };
+    mediaQuery.addEventListener('change', handleMediaChange);
+    const event = new Event('change');
+    Object.defineProperty(event, 'matches', {
+        value: mediaQuery.matches,
+        writable: false,
+    });
+    mediaQuery.dispatchEvent(event);
+    return () => {
+        mediaQuery.removeEventListener('change', handleMediaChange);
+    };
 });
 </script>
 
 <style scoped>
+.title {
+    padding: 20px 20px 0 20px;
+}
+.card {
+    margin: 0 20px;
+    padding-top: 20px;
+    padding-bottom: 20px;
+}
 .other-config-container {
     display: flex;
     justify-content: center;
     align-items: flex-start;
-    padding: 20px;
     box-sizing: border-box;
 }
 
 .other-config {
     width: 100%;
-    max-width: 600px;
-    background: #fff;
-    padding: 20px;
+    max-width: 500px;
+
     border-radius: 8px;
 }
 
-.form {
-    display: flex;
-    flex-direction: column;
-}
-
 .form-item {
-    display: flex;
-    flex-direction: column;
     margin-bottom: 20px;
+    text-align: left;
 }
 
 .button-container {
     display: flex;
     justify-content: center;
-}
-
-@media (min-width: 768px) {
-    .form-item {
-        flex-direction: row;
-        align-items: center;
-    }
-
-    .form-item t-input,
-    .form-item t-switch {
-        flex: 1;
-        margin-left: 20px;
-    }
+    margin-top: 20px;
 }
 </style>

napcat.webui/src/pages/network/EmptyStateComponent.vue

@@ -1,22 +0,0 @@
-<template>
-    <div class="empty-state">
-        <p>当前没有网络配置</p>
-        <t-button @click="showAddTabDialog">添加网络配置</t-button>
-    </div>
-</template>
-
-<script setup lang="ts">
-import { defineProps } from 'vue';
-defineProps<{ showAddTabDialog: () => void }>();
-</script>
-
-<style scoped>
-.empty-state {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    height: 100%;
-    text-align: center;
-}
-</style>

napcat.webui/src/pages/network/HttpClientComponent.vue

@@ -1,28 +1,25 @@
 <template>
-    <div class="container">
-        <div class="form-container">
-            <h3>HTTP Client 配置</h3>
-            <t-form>
-                <t-form-item label="启用">
-                    <t-checkbox v-model="config.enable" />
-                </t-form-item>
-                <t-form-item label="URL">
-                    <t-input v-model="config.url" />
-                </t-form-item>
-                <t-form-item label="消息格式">
-                    <t-select v-model="config.messagePostFormat" :options="messageFormatOptions" />
-                </t-form-item>
-                <t-form-item label="报告自身消息">
-                    <t-checkbox v-model="config.reportSelfMessage" />
-                </t-form-item>
-                <t-form-item label="Token">
-                    <t-input v-model="config.token" />
-                </t-form-item>
-                <t-form-item label="调试模式">
-                    <t-checkbox v-model="config.debug" />
-                </t-form-item>
-            </t-form>
-        </div>
+    <div>
+        <t-form labelAlign="left">
+            <t-form-item label="启用">
+                <t-checkbox v-model="config.enable" />
+            </t-form-item>
+            <t-form-item label="URL">
+                <t-input v-model="config.url" />
+            </t-form-item>
+            <t-form-item label="消息格式">
+                <t-select v-model="config.messagePostFormat" :options="messageFormatOptions" />
+            </t-form-item>
+            <t-form-item label="报告自身消息">
+                <t-checkbox v-model="config.reportSelfMessage" />
+            </t-form-item>
+            <t-form-item label="Token">
+                <t-input v-model="config.token" />
+            </t-form-item>
+            <t-form-item label="调试模式">
+                <t-checkbox v-model="config.debug" />
+            </t-form-item>
+        </t-form>
     </div>
 </template>
 
@@ -49,20 +46,4 @@ watch(
 );
 </script>
 
-<style scoped>
-.container {
-    display: flex;
-    justify-content: center;
-    align-items: flex-start;
-    padding: 20px;
-    box-sizing: border-box;
-}
-
-.form-container {
-    width: 100%;
-    max-width: 600px;
-    background: #fff;
-    padding: 20px;
-    border-radius: 8px;
-}
-</style>
+<style scoped></style>

napcat.webui/src/pages/network/HttpServerComponent.vue

@@ -1,34 +1,31 @@
 <template>
-    <div class="container">
-        <div class="form-container">
-            <h3>HTTP Server 配置</h3>
-            <t-form>
-                <t-form-item label="启用">
-                    <t-checkbox v-model="config.enable" />
-                </t-form-item>
-                <t-form-item label="端口">
-                    <t-input v-model.number="config.port" type="number" />
-                </t-form-item>
-                <t-form-item label="主机">
-                    <t-input v-model="config.host" type="text" />
-                </t-form-item>
-                <t-form-item label="启用 CORS">
-                    <t-checkbox v-model="config.enableCors" />
-                </t-form-item>
-                <t-form-item label="启用 WS">
-                    <t-checkbox v-model="config.enableWebsocket" />
-                </t-form-item>
-                <t-form-item label="消息格式">
-                    <t-select v-model="config.messagePostFormat" :options="messageFormatOptions" />
-                </t-form-item>
-                <t-form-item label="Token">
-                    <t-input v-model="config.token" type="text" />
-                </t-form-item>
-                <t-form-item label="调试模式">
-                    <t-checkbox v-model="config.debug" />
-                </t-form-item>
-            </t-form>
-        </div>
+    <div>
+        <t-form labelAlign="left">
+            <t-form-item label="启用">
+                <t-checkbox v-model="config.enable" />
+            </t-form-item>
+            <t-form-item label="端口">
+                <t-input v-model.number="config.port" type="number" />
+            </t-form-item>
+            <t-form-item label="主机">
+                <t-input v-model="config.host" type="text" />
+            </t-form-item>
+            <t-form-item label="启用 CORS">
+                <t-checkbox v-model="config.enableCors" />
+            </t-form-item>
+            <t-form-item label="启用 WS">
+                <t-checkbox v-model="config.enableWebsocket" />
+            </t-form-item>
+            <t-form-item label="消息格式">
+                <t-select v-model="config.messagePostFormat" :options="messageFormatOptions" />
+            </t-form-item>
+            <t-form-item label="Token">
+                <t-input v-model="config.token" type="text" />
+            </t-form-item>
+            <t-form-item label="调试模式">
+                <t-checkbox v-model="config.debug" />
+            </t-form-item>
+        </t-form>
     </div>
 </template>
 
@@ -55,20 +52,4 @@ watch(
 );
 </script>
 
-<style scoped>
-.container {
-    display: flex;
-    justify-content: center;
-    align-items: flex-start;
-    padding: 20px;
-    box-sizing: border-box;
-}
-
-.form-container {
-    width: 100%;
-    max-width: 600px;
-    background: #fff;
-    padding: 20px;
-    border-radius: 8px;
-}
-</style>
+<style scoped></style>

napcat.webui/src/pages/network/WebsocketClientComponent.vue

@@ -1,31 +1,28 @@
 <template>
-    <div class="container">
-        <div class="form-container">
-            <h3>WebSocket Client 配置</h3>
-            <t-form>
-                <t-form-item label="启用">
-                    <t-checkbox v-model="config.enable" />
-                </t-form-item>
-                <t-form-item label="URL">
-                    <t-input v-model="config.url" />
-                </t-form-item>
-                <t-form-item label="消息格式">
-                    <t-select v-model="config.messagePostFormat" :options="messageFormatOptions" />
-                </t-form-item>
-                <t-form-item label="报告自身消息">
-                    <t-checkbox v-model="config.reportSelfMessage" />
-                </t-form-item>
-                <t-form-item label="Token">
-                    <t-input v-model="config.token" />
-                </t-form-item>
-                <t-form-item label="调试模式">
-                    <t-checkbox v-model="config.debug" />
-                </t-form-item>
-                <t-form-item label="心跳间隔">
-                    <t-input v-model.number="config.heartInterval" type="number" />
-                </t-form-item>
-            </t-form>
-        </div>
+    <div>
+        <t-form labelAlign="left">
+            <t-form-item label="启用">
+                <t-checkbox v-model="config.enable" />
+            </t-form-item>
+            <t-form-item label="URL">
+                <t-input v-model="config.url" />
+            </t-form-item>
+            <t-form-item label="消息格式">
+                <t-select v-model="config.messagePostFormat" :options="messageFormatOptions" />
+            </t-form-item>
+            <t-form-item label="报告自身消息">
+                <t-checkbox v-model="config.reportSelfMessage" />
+            </t-form-item>
+            <t-form-item label="Token">
+                <t-input v-model="config.token" />
+            </t-form-item>
+            <t-form-item label="调试模式">
+                <t-checkbox v-model="config.debug" />
+            </t-form-item>
+            <t-form-item label="心跳间隔">
+                <t-input v-model.number="config.heartInterval" type="number" />
+            </t-form-item>
+        </t-form>
     </div>
 </template>
 
@@ -52,20 +49,4 @@ watch(
 );
 </script>
 
-<style scoped>
-.container {
-    display: flex;
-    justify-content: center;
-    align-items: flex-start;
-    padding: 20px;
-    box-sizing: border-box;
-}
-
-.form-container {
-    width: 100%;
-    max-width: 600px;
-    background: #fff;
-    padding: 20px;
-    border-radius: 8px;
-}
-</style>
+<style scoped></style>

napcat.webui/src/pages/network/WebsocketServerComponent.vue

@@ -1,37 +1,34 @@
 <template>
-    <div class="container">
-        <div class="form-container">
-            <h3>WebSocket Server 配置</h3>
-            <t-form>
-                <t-form-item label="启用">
-                    <t-checkbox v-model="config.enable" />
-                </t-form-item>
-                <t-form-item label="主机">
-                    <t-input v-model="config.host" />
-                </t-form-item>
-                <t-form-item label="端口">
-                    <t-input v-model.number="config.port" type="number" />
-                </t-form-item>
-                <t-form-item label="消息格式">
-                    <t-select v-model="config.messagePostFormat" :options="messageFormatOptions" />
-                </t-form-item>
-                <t-form-item label="上报自身消息">
-                    <t-checkbox v-model="config.reportSelfMessage" />
-                </t-form-item>
-                <t-form-item label="Token">
-                    <t-input v-model="config.token" />
-                </t-form-item>
-                <t-form-item label="强制推送事件">
-                    <t-checkbox v-model="config.enableForcePushEvent" />
-                </t-form-item>
-                <t-form-item label="调试模式">
-                    <t-checkbox v-model="config.debug" />
-                </t-form-item>
-                <t-form-item label="心跳间隔">
-                    <t-input v-model.number="config.heartInterval" type="number" />
-                </t-form-item>
-            </t-form>
-        </div>
+    <div>
+        <t-form labelAlign="left">
+            <t-form-item label="启用">
+                <t-checkbox v-model="config.enable" />
+            </t-form-item>
+            <t-form-item label="主机">
+                <t-input v-model="config.host" />
+            </t-form-item>
+            <t-form-item label="端口">
+                <t-input v-model.number="config.port" type="number" />
+            </t-form-item>
+            <t-form-item label="消息格式">
+                <t-select v-model="config.messagePostFormat" :options="messageFormatOptions" />
+            </t-form-item>
+            <t-form-item label="上报自身消息">
+                <t-checkbox v-model="config.reportSelfMessage" />
+            </t-form-item>
+            <t-form-item label="Token">
+                <t-input v-model="config.token" />
+            </t-form-item>
+            <t-form-item label="强制推送事件">
+                <t-checkbox v-model="config.enableForcePushEvent" />
+            </t-form-item>
+            <t-form-item label="调试模式">
+                <t-checkbox v-model="config.debug" />
+            </t-form-item>
+            <t-form-item label="心跳间隔">
+                <t-input v-model.number="config.heartInterval" type="number" />
+            </t-form-item>
+        </t-form>
     </div>
 </template>
 
@@ -58,20 +55,4 @@ watch(
 );
 </script>
 
-<style scoped>
-.container {
-    display: flex;
-    justify-content: center;
-    align-items: flex-start;
-    padding: 20px;
-    box-sizing: border-box;
-}
-
-.form-container {
-    width: 100%;
-    max-width: 600px;
-    background: #fff;
-    padding: 20px;
-    border-radius: 8px;
-}
-</style>
+<style scoped></style>

napcat.webui/src/ts/event-bus.ts

@@ -0,0 +1,3 @@
+import mitt from 'mitt';
+const emitter = mitt();
+export default emitter;

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.1.12",
+  "version": "4.2.5",
   "scripts": {
     "build:framework": "npm run build:webui && vite build --mode framework || exit 1",
     "build:shell": "npm run build:webui && vite build --mode shell || exit 1",
@@ -44,7 +44,7 @@
     "json-schema-to-ts": "^3.1.1",
     "typescript": "^5.3.3",
     "typescript-eslint": "^8.13.0",
-    "vite": "^5.2.6",
+    "vite": "^6.0.1",
     "vite-plugin-cp": "^4.0.8",
     "vite-tsconfig-paths": "^5.1.0",
     "winston": "^3.17.0"
@@ -52,9 +52,9 @@
   "dependencies": {
     "express": "^5.0.0",
     "fluent-ffmpeg": "^2.1.2",
+    "piscina": "^4.7.0",
     "qrcode-terminal": "^0.12.0",
     "silk-wasm": "^3.6.1",
-    "ws": "^8.18.0",
-    "piscina": "^4.7.0"
+    "ws": "^8.18.0"
   }
 }

src/common/file.ts

@@ -19,14 +19,6 @@ type Uri2LocalRes = {
     path: string
 }
 
-export function isGIF(path: string) {
-    const buffer = Buffer.alloc(4);
-    const fd = fs.openSync(path, 'r');
-    fs.readSync(fd, buffer, 0, 4, 0);
-    fs.closeSync(fd);
-    return buffer.toString() === 'GIF8';
-}
-
 // 定义一个异步函数来检查文件是否存在
 export function checkFileExist(path: string, timeout: number = 3000): Promise<void> {
     return new Promise((resolve, reject) => {
@@ -190,7 +182,6 @@ export enum FileUriType {
 }
 
 export async function checkUriType(Uri: string) {
-
     const LocalFileRet = await solveProblem((uri: string) => {
         if (fs.existsSync(uri)) {
             return { Uri: uri, Type: FileUriType.Local };
@@ -199,22 +190,26 @@ export async function checkUriType(Uri: string) {
     }, Uri);
     if (LocalFileRet) return LocalFileRet;
     const OtherFileRet = await solveProblem((uri: string) => {
-        //再判断是否是Http
-        if (uri.startsWith('http://') || uri.startsWith('https://')) {
+        // 再判断是否是Http
+        if (uri.startsWith('http:') || uri.startsWith('https:')) {
             return { Uri: uri, Type: FileUriType.Remote };
         }
-        //再判断是否是Base64
-        if (uri.startsWith('base64://')) {
+        // 再判断是否是Base64
+        if (uri.startsWith('base64:')) {
             return { Uri: uri, Type: FileUriType.Base64 };
         }
-        if (uri.startsWith('file://')) {
-            let filePath: string;
-            const pathname = decodeURIComponent(new URL(uri).pathname + new URL(uri).hash);
-            if (process.platform === 'win32') {
-                filePath = pathname.slice(1);
-            } else {
-                filePath = pathname;
+        // 默认file://
+        if (uri.startsWith('file:')) {
+            // 兼容file:///
+            // file:///C:/1.jpg
+            if (uri.startsWith('file:///') && process.platform === 'win32') {
+                const filePath: string = uri.slice(8);
+                return { Uri: filePath, Type: FileUriType.Local };
             }
+            // 处理默认规范
+            // file://C:\1.jpg
+            // file:///test/1.jpg
+            const filePath: string = uri.slice(7);
 
             return { Uri: filePath, Type: FileUriType.Local };
         }
@@ -230,14 +225,16 @@ export async function checkUriType(Uri: string) {
 
 export async function uri2local(dir: string, uri: string, filename: string | undefined = undefined): Promise<Uri2LocalRes> {
     const { Uri: HandledUri, Type: UriType } = await checkUriType(uri);
+
     //解析失败
     const tempName = randomUUID();
     if (!filename) filename = randomUUID();
-    //解析Http和Https协议
 
+    //解析Http和Https协议
     if (UriType == FileUriType.Unknown) {
         return { success: false, errMsg: `未知文件类型, uri= ${uri}`, fileName: '', ext: '', path: '' };
     }
+
     //解析File协议和本地文件
     if (UriType == FileUriType.Local) {
         const fileExt = path.extname(HandledUri);
@@ -249,8 +246,8 @@ export async function uri2local(dir: string, uri: string, filename: string | und
         fs.copyFileSync(HandledUri, filePath);
         return { success: true, errMsg: '', fileName: filename, ext: fileExt, path: filePath };
     }
-    //接下来都要有文件名
 
+    //接下来都要有文件名
     if (UriType == FileUriType.Remote) {
         const pathInfo = path.parse(decodeURIComponent(new URL(HandledUri).pathname));
         if (pathInfo.name) {
@@ -268,6 +265,7 @@ export async function uri2local(dir: string, uri: string, filename: string | und
         fs.writeFileSync(filePath, buffer, { flag: 'wx' });
         return { success: true, errMsg: '', fileName: filename, ext: fileExt, path: filePath };
     }
+
     //解析Base64
     if (UriType == FileUriType.Base64) {
         const base64 = HandledUri.replace(/^base64:\/\//, '');

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '4.1.12';
+export const napCatVersion = '4.2.5';

src/core/adapters/NodeIDependsAdapter.ts

@@ -1,4 +1,4 @@
-import { MsfChangeReasonType, MsfStatusType } from "../types/adapter";
+import { MsfChangeReasonType, MsfStatusType } from "@/core/types/adapter";
 
 export class NodeIDependsAdapter {
     onMSFStatusChange(statusType: MsfStatusType, changeReasonType: MsfChangeReasonType) {

src/core/apis/file.ts

@@ -20,13 +20,14 @@ import { InstanceContext, NapCatCore, SearchResultItem } from '@/core';
 import * as fileType from 'file-type';
 import imageSize from 'image-size';
 import { ISizeCalculationResult } from 'image-size/dist/types/interface';
-import { RkeyManager } from '../helper/rkey';
-import { calculateFileMD5, isGIF } from '@/common/file';
+import { RkeyManager } from '@/core/helper/rkey';
+import { calculateFileMD5 } from '@/common/file';
 import pathLib from 'node:path';
 import { defaultVideoThumbB64, getVideoInfo } from '@/common/video';
 import ffmpeg from 'fluent-ffmpeg';
 import { encodeSilk } from '@/common/audio';
-import { MessageContext } from '@/onebot/api';
+import { SendMessageContext } from '@/onebot/api';
+import { getFileTypeForSendType } from '../helper/msg';
 
 export class NTQQFileApi {
     context: InstanceContext;
@@ -40,7 +41,7 @@ export class NTQQFileApi {
         this.rkeyManager = new RkeyManager([
             'https://rkey.napneko.icu/rkeys'
         ],
-            this.context.logger
+        this.context.logger
         );
     }
 
@@ -90,7 +91,7 @@ export class NTQQFileApi {
         };
     }
 
-    async createValidSendFileElement(context: MessageContext, filePath: string, fileName: string = '', folderId: string = '',): Promise<SendFileElement> {
+    async createValidSendFileElement(context: SendMessageContext, filePath: string, fileName: string = '', folderId: string = '',): Promise<SendFileElement> {
         const {
             fileName: _fileName,
             path,
@@ -112,7 +113,7 @@ export class NTQQFileApi {
         };
     }
 
-    async createValidSendPicElement(context: MessageContext, picPath: string, summary: string = '', subType: PicSubType = 0): Promise<SendPicElement> {
+    async createValidSendPicElement(context: SendMessageContext, picPath: string, summary: string = '', subType: PicSubType = 0): Promise<SendPicElement> {
         const { md5, fileName, path, fileSize } = await this.core.apis.FileApi.uploadFile(picPath, ElementType.PIC, subType);
         if (fileSize === 0) {
             throw new Error('文件异常，大小为0');
@@ -130,7 +131,7 @@ export class NTQQFileApi {
                 fileName: fileName,
                 sourcePath: path,
                 original: true,
-                picType: isGIF(picPath) ? PicType.NEWPIC_GIF : PicType.NEWPIC_JPEG,
+                picType: await getFileTypeForSendType(picPath),
                 picSubType: subType,
                 fileUuid: '',
                 fileSubId: '',
@@ -140,7 +141,7 @@ export class NTQQFileApi {
         };
     }
 
-    async createValidSendVideoElement(context: MessageContext, filePath: string, fileName: string = '', diyThumbPath: string = ''): Promise<SendVideoElement> {
+    async createValidSendVideoElement(context: SendMessageContext, filePath: string, fileName: string = '', diyThumbPath: string = ''): Promise<SendVideoElement> {
         const logger = this.core.context.logger;
         let videoInfo = {
             width: 1920,
@@ -306,18 +307,18 @@ export class NTQQFileApi {
                     element.elementType === ElementType.FILE
                 ) {
                     switch (element.elementType) {
-                        case ElementType.PIC:
+                    case ElementType.PIC:
                             element.picElement!.sourcePath = elementResults[elementIndex];
-                            break;
-                        case ElementType.VIDEO:
+                        break;
+                    case ElementType.VIDEO:
                             element.videoElement!.filePath = elementResults[elementIndex];
-                            break;
-                        case ElementType.PTT:
+                        break;
+                    case ElementType.PTT:
                             element.pttElement!.filePath = elementResults[elementIndex];
-                            break;
-                        case ElementType.FILE:
+                        break;
+                    case ElementType.FILE:
                             element.fileElement!.filePath = elementResults[elementIndex];
-                            break;
+                        break;
                     }
                     elementIndex++;
                 }

src/core/apis/user.ts

@@ -18,30 +18,19 @@ export class NTQQUserApi {
     async getStatusByUid(uid: string) {
         return this.context.session.getProfileService().getStatus(uid);
     }
-    async getProfileLike(uid: string, start: number, count: number) {
+    // 默认获取自己的 type = 2 获取别人 type = 1
+    async getProfileLike(uid: string, start: number, count: number, type: number = 2) {
         return this.context.session.getProfileLikeService().getBuddyProfileLike({
             friendUids: [uid],
             basic: 1,
             vote: 1,
             favorite: 0,
             userProfile: 1,
-            type: 2,
+            type: type,
             start: start,
             limit: count,
         });
     }
-    async fetchOtherProfileLike(uid: string) {
-        return this.context.session.getProfileLikeService().getBuddyProfileLike({
-            friendUids: [uid],
-            basic: 1,
-            vote: 1,
-            favorite: 0,
-            userProfile: 0,
-            type: 1,
-            start: 0,
-            limit: 20,
-        });
-    }
     async setLongNick(longNick: string) {
         return this.context.session.getProfileService().setLongNick(longNick);
     }

src/core/external/appid.json

@@ -86,5 +86,17 @@
     "6.9.59-29456": {
         "appid": 537249961,
         "qua": "V1_MAC_NQ_6.9.59_29456_GW_B"
+    },
+    "9.9.16-29927": {
+        "appid": 537255812,
+        "qua": "V1_WIN_NQ_9.9.16_29927_GW_B"
+    },
+    "3.2.13-29927": {
+        "appid": 537255847,
+        "qua": "V1_LNX_NQ_3.2.13_29927_GW_B"
+    },
+    "6.9.61-29927": {
+        "appid": 537255836,
+        "qua": "V1_MAC_NQ_6.9.61_29927_GW_B"
     }
 }

src/core/external/offset.json

@@ -82,5 +82,25 @@
     "6.9.59-29456-arm64": {
         "send": "4005FE8",
         "recv": "4008800"
+    },
+    "9.9.16-29927-x64": {
+        "send": "3869C50",
+        "recv": "386E084"
+    },
+    "3.2.13-29927-x64": {
+        "send": "A1913A0",
+        "recv": "A194CA0"
+    },
+    "3.2.13-29927-arm64": {
+        "send": "6F1C7E0",
+        "recv": "6F20018"
+    },
+    "6.9.61-29927-x64": {
+        "send": "44FCC60",
+        "recv": "44FF4CC"
+    },
+    "6.9.61-29927-arm64": {
+        "send": "4038740",
+        "recv": "403AF58"
     }
 }

src/core/helper/msg.ts

@@ -0,0 +1,14 @@
+import * as fileType from 'file-type';
+import { PicType } from '../types';
+export async function getFileTypeForSendType(picPath: string): Promise<PicType> {
+    const fileTypeResult = (await fileType.fileTypeFromFile(picPath))?.ext ?? 'jpg';
+    const picTypeMap: { [key: string]: PicType } = {
+        //'webp': PicType.NEWPIC_WEBP,
+        'gif': PicType.NEWPIC_GIF,
+        // 'png': PicType.NEWPIC_APNG,
+        // 'jpg': PicType.NEWPIC_JPEG,
+        // 'jpeg': PicType.NEWPIC_JPEG,
+        // 'bmp': PicType.NEWPIC_BMP,
+    };
+    return picTypeMap[fileTypeResult] ?? PicType.NEWPIC_JPEG;
+}

src/core/listeners/NodeIKernelMsgListener.ts

@@ -255,7 +255,7 @@ export class NodeIKernelMsgListener {
 
     }
 
-    onMsgRecall(i2: unknown, str: unknown, j2: unknown): any {
+    onMsgRecall(chatType: ChatType, uid: string, msgSeq: string): any {
 
     }
 

src/core/packet/message/element.ts

@@ -14,6 +14,8 @@ import {
     GroupFileExtra
 } from "@/core/packet/transformer/proto";
 import {
+    BaseEmojiType,
+    FaceType,
     NTMsgAtType,
     PicType,
     SendArkElement,
@@ -162,7 +164,7 @@ export class PacketMsgFaceElement extends IPacketMsgElement<SendFaceElement> {
     constructor(element: SendFaceElement) {
         super(element);
         this.faceId = element.faceElement.faceIndex;
-        this.isLargeFace = element.faceElement.faceType === 3;
+        this.isLargeFace = element.faceElement.faceType === FaceType.AniSticke;
     }
 
     buildElement(): NapProtoEncodeStructType<typeof Elem>[] {

src/core/packet/transformer/proto/message/message.ts

@@ -54,6 +54,16 @@ export const PushMsg = {
     generalFlag: ProtoField(9, ScalarType.INT32, true),
 };
 
+export const GroupChange = {
+    groupUin: ProtoField(1, ScalarType.UINT32),
+    flag: ProtoField(2, ScalarType.UINT32),
+    memberUid: ProtoField(3, ScalarType.STRING, true),
+    decreaseType: ProtoField(4, ScalarType.UINT32),
+    operatorUid: ProtoField(5, ScalarType.STRING, true),
+    increaseType: ProtoField(6, ScalarType.UINT32),
+    field7: ProtoField(7, ScalarType.BYTES, true),
+};
+
 export const PushMsgBody = {
     responseHead: ProtoField(1, () => ResponseHead),
     contentHead: ProtoField(2, () => ContentHead),

src/core/services/NodeIKernelBaseEmojiService.ts

@@ -0,0 +1,17 @@
+import { DownloadBaseEmojiByIdReq, DownloadBaseEmojiByUrlReq, GetBaseEmojiPathReq, PullSysEmojisReq } from '../types';
+
+export interface NodeIKernelBaseEmojiService {
+    removeKernelBaseEmojiListener(listenerId: number): void;
+
+    addKernelBaseEmojiListener(listener: unknown): number;
+
+    isBaseEmojiPathExist(args: Array<string>): unknown;
+
+    fetchFullSysEmojis(pullSysEmojisReq: PullSysEmojisReq): unknown;
+
+    getBaseEmojiPathByIds(getBaseEmojiPathReqs: Array<GetBaseEmojiPathReq>): unknown;
+
+    downloadBaseEmojiByIdWithUrl(downloadBaseEmojiByUrlReq: DownloadBaseEmojiByUrlReq): unknown;
+
+    downloadBaseEmojiById(downloadBaseEmojiByIdReq: DownloadBaseEmojiByIdReq): unknown;
+}

src/core/services/NodeIKernelBuddyService.ts

@@ -1,6 +1,6 @@
 import { GeneralCallResult } from '@/core/services/common';
 import { NodeIKernelBuddyListener } from '@/core/listeners';
-import { BuddyListReqType } from '../types/user';
+import { BuddyListReqType } from '@/core/types/user';
 
 export interface NodeIKernelBuddyService {
     getBuddyListV2(callFrom: string, reqType: BuddyListReqType): Promise<GeneralCallResult & {

src/core/services/NodeIKernelMsgService.ts

@@ -1,7 +1,7 @@
 import { ElementType, MessageElement, Peer, RawMessage, SendMessageElement } from '@/core/types';
 import { NodeIKernelMsgListener } from '@/core/listeners/NodeIKernelMsgListener';
 import { GeneralCallResult } from '@/core/services/common';
-import { MsgReqType, QueryMsgsParams, TmpChatInfoApi } from '../types/msg';
+import { MsgReqType, QueryMsgsParams, TmpChatInfoApi } from '@/core/types/msg';
 
 export interface NodeIKernelMsgService {
 

src/core/services/NodeIKernelRecentContactService.ts

@@ -1,7 +1,7 @@
 import { ChatType, Peer } from '@/core/types';
-import { NodeIKernelRecentContactListener } from '../listeners/NodeIKernelRecentContactListener';
-import { GeneralCallResult } from './common';
-import { FSABRecentContactParams } from '../types/contact';
+import { NodeIKernelRecentContactListener } from '@/core/listeners/NodeIKernelRecentContactListener';
+import { GeneralCallResult } from '@/core/services/common';
+import { FSABRecentContactParams } from '@/core/types/contact';
 
 export interface NodeIKernelRecentContactService {
     setGuildDisplayStatus(...args: unknown[]): unknown; // 2 arguments

src/core/services/NodeIO3MiscService.ts

@@ -1,4 +1,4 @@
-import { NodeIO3MiscListener } from "../listeners/NodeIO3MiscListener";
+import { NodeIO3MiscListener } from "@/core/listeners/NodeIO3MiscListener";
 
 export interface NodeIO3MiscService {
     get(): NodeIO3MiscService;

src/core/types/adapter.ts

@@ -1,11 +1,11 @@
 export enum MsfStatusType {
-    KUNKNOWN,
-    KDISCONNECTED,
-    KCONNECTED
+    KUNKNOWN = 0,
+    KDISCONNECTED = 1,
+    KCONNECTED = 2
 }
 export enum MsfChangeReasonType {
-    KUNKNOWN,
-    KUSERLOGININ,
-    KUSERLOGINOUT,
-    KAUTO
+    KUNKNOWN = 0,
+    KUSERLOGININ = 1,
+    KUSERLOGINOUT = 2,
+    KAUTO = 3
 }

src/core/types/element.ts

@@ -1,4 +1,4 @@
-import { ElementType, FaceType, MessageElement, NTGrayTipElementSubTypeV2, PicSubType, PicType, TipAioOpGrayTipElement, TipGroupElement, NTVideoType } from "./msg";
+import { ElementType, MessageElement, NTGrayTipElementSubTypeV2, PicSubType, PicType, TipAioOpGrayTipElement, TipGroupElement, NTVideoType, FaceType } from "./msg";
 
 type ElementFullBase = Omit<MessageElement, 'elementType' | 'elementId' | 'extBufForUI'>;
 
@@ -40,17 +40,18 @@ export interface FaceElement {
     surpriseId?: string;
     randomType?: number;
 }
+export interface GrayTipRovokeElement {
+    operatorRole: string;
+    operatorUid: string;
+    operatorNick: string;
+    operatorRemark: string;
+    operatorMemRemark?: string;
+    wording: string;  // 自定义的撤回提示语
+}
 
 export interface GrayTipElement {
     subElementType: NTGrayTipElementSubTypeV2;
-    revokeElement: {
-        operatorRole: string;
-        operatorUid: string;
-        operatorNick: string;
-        operatorRemark: string;
-        operatorMemRemark?: string;
-        wording: string;  // 自定义的撤回提示语
-    };
+    revokeElement: GrayTipRovokeElement;
     aioOpGrayTipElement: TipAioOpGrayTipElement;
     groupElement: TipGroupElement;
     xmlElement: {
@@ -253,7 +254,7 @@ export interface FaceBubbleElement {
     faceFlag: number;
     content: string;
     oldVersionStr: string;
-    faceType: number;
+    faceType: FaceType;
     others: string;
     yellowFaceInfo: {
         index: number;

src/core/types/emoji.ts

@@ -0,0 +1,54 @@
+export enum PullMomentType {
+    REINSTALL = 0,
+    RESTART_FIRST_AIO = 1,
+    LOGIN_APP = 2,
+    SINGEL_PULL_NOTIFY = 3,
+    TRIGGER_SPECIFIC_EMOJI_RANDOM_RESULT = 4
+}
+
+export interface PullSysEmojisReq {
+    fetchAdvaceSource: boolean;
+    fetchBaseSource: boolean;
+    pullMoment: PullMomentType;
+    pullType: number;
+    refresh: boolean;
+    thresholdValue: number;
+}
+
+export enum BaseEmojiType {
+    NORMAL_EMOJI = 0,
+    SUPER_EMOJI = 1,
+    RANDOM_SUPER_EMOJI = 2,
+    CHAIN_SUPER_EMOJI = 3,
+    EMOJI_EMOJI = 4
+}
+
+export interface GetBaseEmojiPathReq {
+    emojiId: string;
+    type: BaseEmojiType;
+}
+export enum EmojiPanelCategory {
+    OTHER_PANEL = 0,
+    NORMAL_PANEL = 1,
+    SUPER_PANEL = 2,
+    RED_HEART_PANEL = 3
+}
+
+export interface DownloadBaseEmojiInfo {
+    baseResDownloadUrl: string;
+    advancedResDownloadUrl: string;
+}
+
+export interface DownloadBaseEmojiByUrlReq {
+    emojiId: string;
+    groupName: string;
+    panelCategory: EmojiPanelCategory;
+    downloadInfo: DownloadBaseEmojiInfo;
+}
+
+export interface DownloadBaseEmojiByIdReq {
+    emojiId: string;
+    groupName: string;
+    panelCategory: EmojiPanelCategory;
+    qzoneCode: string;
+}

src/core/types/graytip.ts

@@ -0,0 +1,74 @@
+export enum JsonGrayBusiId {
+    AIO_AV_C2C_NOTICE = 2021,
+    AIO_AV_GROUP_NOTICE = 2022,
+    AIO_C2C_DONT_DISTURB = 2100,
+    AIO_CRM_FLAGS_TIPS = 2050,
+    AIO_GROUP_ESSENCE_MSG_TIP = 2401,
+    AIO_NUDGE_CUSTOM_GUIDE = 2041,
+    AIO_PUSH_GUIDE_GRAY_TIPS = 2701,
+    AIO_RECALL_MSGCUSTOM_WORDINGGUIDE = 2000,
+    AIO_ROBOT_SAFETY_TIP = 2201,
+    AIO_ZPLAN_EMOTICON_GUIDE = 2301,
+    AIO_ZPLAN_SCENE_LINKAGE = 2302,
+    AIO_ZPLAN_SEND_MEME = 2300,
+    DISBAND_DISCUSSION_GRAY_TIP_ID = 2603,
+    FILE_SENDING_SIZE_4GB_LIMIT = 3003,
+    GROUP_AIO_CONFIGURABLE_GRAY_TIPS = 2407,
+    GROUP_AIO_HOME_SCHOOL_WELCOME_GRAY_TIP_ID = 2404,
+    GROUP_AIO_MSG_FREQUENCY_GRAY_TIP_ID = 2406,
+    GROUP_AIO_SHUTUP_GRAY_TIP_ID = 2402,
+    GROUP_AIO_TEMPORARY_GRAY_TIP_ID = 2405,
+    GROUP_AIO_UNREAD_MSG_AI_SUMMARY = 2408,
+    GROUP_AIO_UPLOAD_PERMISSIONS_GRAY_TIP_ID = 2403,
+    LITE_ACTION = 86,
+    ONLINE_FILE_CANCEL_RECV_ON_RECVING = 4,
+    ONLINE_FILE_GO_OFFLINE = 11,
+    ONLINE_FILE_GO_OFFLINE_ALL = 12,
+    ONLINE_FILE_RECV_BY_MOBILE = 13,
+    ONLINE_FILE_RECV_ERROR = 10,
+    ONLINE_FILE_REFUSE_ALL_RECV = 7,
+    ONLINE_FILE_REFUSE_ALL_RECV_ON_RECVING = 8,
+    ONLINE_FILE_REFUSE_RECV = 3,
+    ONLINE_FILE_SEND_ERROR = 9,
+    ONLINE_FILE_STOP_ALL_SEND = 5,
+    ONLINE_FILE_STOP_ALL_SEND_ON_SENDING = 6,
+    ONLINE_FILE_STOP_SEND = 1,
+    ONLINE_FILE_STOP_SEND_ON_SENDING = 2,
+    ONLINE_GROUP_HOME_WORK = 51,
+    PTT_AUTO_CHANGE_GUIDE = 2060,
+    QCIRCLE_SHOW_FULE_TIPS = 2601,
+    QWALLET_GRAY_TIP_ID = 2602,
+    RED_BAG = 81,
+    RELATION_C2C_GROUP_AIO_SETUP_GROUP_AND_REMARK = 1005,
+    RELATION_C2C_LOVER_BONUS = 1003,
+    RELATION_C2C_MEMBER_ADD = 1017,
+    RELATION_C2C_REACTIVE_DEGRADE_MSG = 1019,
+    RELATION_C2C_REACTIVE_UPGRADE_MSG = 1018,
+    RELATION_C2C_SAY_HELLO = 1004,
+    RELATION_CHAIN_BLACKED = 1000,
+    RELATION_CHAIN_MATCH_FRIEND = 1007,
+    RELATION_CREATE_GROUP_GRAY_TIP_ID = 1009,
+    RELATION_EMOJIEGG_SHOW = 1001,
+    RELATION_EMOJIEGG_WILL_DEGRADE = 1002,
+    RELATION_FRIEND_CLONE_INFO = 1006,
+    RELATION_GROUP_BATCH_ADD_FRIEND = 1020,
+    RELATION_GROUP_MEMBER_ADD = 1022,
+    RELATION_GROUP_MEMBER_ADD_WITH_MODIFY_NAME = 1015,
+    RELATION_GROUP_MEMBER_ADD_WITH_WELCOME = 1016,
+    RELATION_GROUP_MEMBER_RECOMMEND = 1021,
+    RELATION_GROUP_SHUT_UP = 1014,
+    RELATION_LIMIT_TMP_CONVERSATION_SET = 1011,
+    RELATION_NEARBY_GOTO_VERIFY = 1008,
+    RELATION_ONEWAY_FRIEND_GRAY_TIP_ID = 1012,
+    RELATION_ONEWAY_FRIEND_NEW_GRAY_TIP_ID = 1013,
+    RELATION_YQT = 1010,
+    TROOP_ADD_FRIEND_ACTIVE = 19264,
+    TROOP_ADD_FRIEND_HOT_CHAT = 19265,
+    TROOP_ADD_FRIEND_NEW_MEMBER = 19267,
+    TROOP_ADD_FRIEND_REPLY_OR_AT = 19266,
+    TROOP_BREAK_ICE = 10405,
+    TROOP_FLAME_IGNITED = 19273,
+    UI_RESERVE_100000_110000 = 100000,
+    VAS_FILE_UPLOAD_OVER_1G = 3002,
+    VAS_FILE_UPLOAD_OVER_LIMIT = 3001,
+}

src/core/types/group.ts

@@ -63,16 +63,16 @@ export interface KickMemberV2Req {
 
 // 数据来源类型
 export enum DataSource {
-    LOCAL,
-    REMOTE
+    LOCAL = 0,
+    REMOTE = 1
 }
 
 // 群列表更新类型
 export enum GroupListUpdateType {
-    REFRESHALL,
-    GETALL,
-    MODIFIED,
-    REMOVE
+    REFRESHALL = 0,
+    GETALL = 1,
+    MODIFIED = 2,
+    REMOVE = 3
 }
 
 export interface GroupMemberCache {

src/core/types/index.ts

@@ -8,3 +8,5 @@ export * from './webapi';
 export * from './sign';
 export * from './element';
 export * from './constant';
+export * from './graytip';
+export * from './emoji';

src/core/types/msg.ts

@@ -1,6 +1,10 @@
 import { NTGroupMemberRole } from '@/core';
 import { ActionBarElement, ArkElement, AvRecordElement, CalendarElement, FaceBubbleElement, FaceElement, FileElement, GiphyElement, GrayTipElement, MarketFaceElement, PicElement, PttElement, RecommendedMsgElement, ReplyElement, ShareLocationElement, StructLongMsgElement, TaskTopMsgElement, TextElement, TofuRecordElement, VideoElement, YoloGameResultElement } from './element';
 
+/*
+ * 2024/11/22 Refactor Mlikiowa
+ */
+
 /**
  * 表示对等方的信息
  */
@@ -127,7 +131,7 @@ export enum PicSubType {
     KRELATED = 7
 }
 /**
- * 消息@类型枚举
+ * 消息AT类型枚举
  */
 export enum NTMsgAtType {
     ATTYPEALL = 1,
@@ -260,16 +264,6 @@ export enum NTGrayTipElementSubTypeV2 {
     GRAYTIP_ELEMENT_SUBTYPE_XMLMSG = 12,
 }
 
-/**
- * 表情类型枚举
- */
-export enum FaceType {
-    normal = 1, // 小黄脸
-    normal2 = 2, // 新小黄脸
-    dice = 3,  // 骰子
-    poke = 5  // 拍一拍
-}
-
 /**
  * Poke 类型枚举
  */
@@ -288,8 +282,8 @@ export enum PokeType {
  * 表情索引枚举
  */
 export enum FaceIndex {
-    dice = 358,
-    rps = 359
+    DICE = 358,
+    RPS = 359
 }
 
 /**
@@ -389,12 +383,39 @@ export enum MemberAddShowType {
     K_YOU_INVITE_OTHER = 7,
 }
 
+/**
+ * 群提示元素成员角色枚举
+ */
+export enum NTGroupGrayElementRole {
+    KOTHER = 0,
+    KMEMBER = 1,
+    KADMIN = 2
+}
+
+/**
+ * 群灰色提示成员接口
+ * */
+
+export interface NTGroupGrayMember {
+    serialVersionUID: string;
+    uid: string;
+    name: string;
+}
+/**
+ * 群灰色提示邀请者和被邀请者接口
+ * 
+ * */
+export interface NTGroupGrayInviterAndInvite {
+    invited: NTGroupGrayMember;
+    inviter: NTGroupGrayMember;
+    serialVersionUID: string;
+}
 /**
  * 群提示元素接口
  */
 export interface TipGroupElement {
     type: TipGroupElementType;
-    role: 0;
+    role: NTGroupGrayElementRole;
     groupName: string;
     memberUid: string;
     memberNick: string;
@@ -405,13 +426,13 @@ export interface TipGroupElement {
     createGroup: null;
     memberAdd?: {
         showType: MemberAddShowType;
-        otherAdd: null;
-        otherAddByOtherQRCode: null;
-        otherAddByYourQRCode: null;
-        youAddByOtherQRCode: null;
-        otherInviteOther: null;
-        otherInviteYou: null;
-        youInviteOther: null
+        otherAdd: NTGroupGrayMember;
+        otherAddByOtherQRCode: NTGroupGrayInviterAndInvite;
+        otherAddByYourQRCode: NTGroupGrayMember;
+        youAddByOtherQRCode: NTGroupGrayMember;
+        otherInviteOther: NTGroupGrayInviterAndInvite;
+        otherInviteYou: NTGroupGrayMember;
+        youInviteOther: NTGroupGrayMember;
     };
     shutUp?: {
         curTime: string;
@@ -533,3 +554,15 @@ export interface MsgReqType {
     includeDeleteMsg: boolean,
     extraCnt: number
 }
+
+/**
+ * 表情类型枚举
+ */
+export enum FaceType {
+    Unknown = 0,
+    OldFace = 1, // 老表情
+    Normal = 2, // 常规表情
+    AniSticke = 3,  // 动画贴纸
+    Lottie = 4,// 新格式表情
+    Poke = 5  // 可变Poke
+}

src/core/types/notify.ts

@@ -1,20 +1,20 @@
 export enum GroupNotifyMsgType {
-    UN_SPECIFIED,
-    INVITED_BY_MEMBER,
-    REFUSE_INVITED,
-    REFUSED_BY_ADMINI_STRATOR,
-    AGREED_TOJOIN_DIRECT,// 有人接受了邀请入群
-    INVITED_NEED_ADMINI_STRATOR_PASS,
-    AGREED_TO_JOIN_BY_ADMINI_STRATOR,
-    REQUEST_JOIN_NEED_ADMINI_STRATOR_PASS,
-    SET_ADMIN,
-    KICK_MEMBER_NOTIFY_ADMIN,
-    KICK_MEMBER_NOTIFY_KICKED,
-    MEMBER_LEAVE_NOTIFY_ADMIN,// 主动退出
-    CANCEL_ADMIN_NOTIFY_CANCELED,
-    CANCEL_ADMIN_NOTIFY_ADMIN,// 其他人取消管理员
-    TRANSFER_GROUP_NOTIFY_OLDOWNER,
-    TRANSFER_GROUP_NOTIFY_ADMIN
+    UN_SPECIFIED = 0,
+    INVITED_BY_MEMBER = 1,
+    REFUSE_INVITED = 2,
+    REFUSED_BY_ADMINI_STRATOR = 3,
+    AGREED_TOJOIN_DIRECT = 4,// 有人接受了邀请入群
+    INVITED_NEED_ADMINI_STRATOR_PASS = 5,
+    AGREED_TO_JOIN_BY_ADMINI_STRATOR = 6,
+    REQUEST_JOIN_NEED_ADMINI_STRATOR_PASS = 7,
+    SET_ADMIN = 8,
+    KICK_MEMBER_NOTIFY_ADMIN = 9,
+    KICK_MEMBER_NOTIFY_KICKED = 10,
+    MEMBER_LEAVE_NOTIFY_ADMIN = 11,// 主动退出
+    CANCEL_ADMIN_NOTIFY_CANCELED = 12,
+    CANCEL_ADMIN_NOTIFY_ADMIN = 13,// 其他人取消管理员
+    TRANSFER_GROUP_NOTIFY_OLDOWNER = 14,
+    TRANSFER_GROUP_NOTIFY_ADMIN = 15
 }
 
 export interface GroupNotifies {
@@ -24,24 +24,24 @@ export interface GroupNotifies {
 }
 
 export enum GroupNotifyMsgStatus {
-    KINIT,//初始化
-    KUNHANDLE,//未处理
-    KAGREED,//同意
-    KREFUSED,//拒绝
-    KIGNORED//忽略
+    KINIT = 0,//初始化
+    KUNHANDLE = 1,//未处理
+    KAGREED = 2,//同意
+    KREFUSED = 3,//拒绝
+    KIGNORED = 4//忽略
 }
 
 export enum GroupInviteStatus {
-    INIT,
-    WAIT_TO_APPROVE,
-    JOINED,
-    REFUSED_BY_ADMINI_STRATOR
+    INIT = 0,
+    WAIT_TO_APPROVE = 1,
+    JOINED = 2,
+    REFUSED_BY_ADMINI_STRATOR = 3
 }
 
 export enum GroupInviteType {
-    BYBUDDY,
-    BYGROUPMEMBER,
-    BYDISCUSSMEMBER
+    BYBUDDY = 0,
+    BYGROUPMEMBER = 1,
+    BYDISCUSSMEMBER = 2
 }
 export interface ShutUpGroupHonor {
     [key: string]: number;
@@ -116,20 +116,20 @@ export enum NTGroupRequestOperateTypes {
 }
 
 export enum BuddyReqType {
-    KMEINITIATOR,
-    KPEERINITIATOR,
-    KMEAGREED,
-    KMEAGREEDANDADDED,
-    KPEERAGREED,
-    KPEERAGREEDANDADDED,
-    KPEERREFUSED,
-    KMEREFUSED,
-    KMEIGNORED,
-    KMEAGREEANYONE,
-    KMESETQUESTION,
-    KMEAGREEANDADDFAILED,
-    KMSGINFO,
-    KMEINITIATORWAITPEERCONFIRM
+    KMEINITIATOR = 0,
+    KPEERINITIATOR = 1,
+    KMEAGREED = 2,
+    KMEAGREEDANDADDED = 3,
+    KPEERAGREED = 4,
+    KPEERAGREEDANDADDED = 5,
+    KPEERREFUSED = 6,
+    KMEREFUSED = 7,
+    KMEIGNORED = 8,
+    KMEAGREEANYONE = 9,
+    KMESETQUESTION = 10,
+    KMEAGREEANDADDFAILED = 11,
+    KMSGINFO = 12,
+    KMEINITIATORWAITPEERCONFIRM = 13
 }
 
 export interface FriendRequest {

src/core/types/user.ts

@@ -322,8 +322,8 @@ export type Friend = User;
 
 // 业务键枚举
 export enum BizKey {
-    KPRIVILEGEICON,
-    KPHOTOWALL
+    KPRIVILEGEICON = 0,
+    KPHOTOWALL = 1
 }
 
 // 根据UIN获取用户详细信息
@@ -347,9 +347,9 @@ export enum UserDetailSource {
 
 // 个人资料业务类型枚举
 export enum ProfileBizType {
-    KALL,
-    KBASEEXTEND,
-    KVAS,
-    KQZONE,
-    KOTHER
+    KALL = 0,
+    KBASEEXTEND = 1,
+    KVAS = 2,
+    KQZONE = 3,
+    KOTHER = 4
 }

src/onebot/action/OneBotAction.ts

@@ -1,7 +1,6 @@
 import { ActionName, BaseCheckResult } from './router';
 import Ajv, { ErrorObject, ValidateFunction } from 'ajv';
 import { NapCatCore } from '@/core';
-import { isNull } from '@/common/helper';
 import { NapCatOneBot11Adapter, OB11Return } from '@/onebot';
 
 export class OB11Response {
@@ -66,7 +65,7 @@ export abstract class OneBotAction<PayloadType, ReturnDataType> {
             return OB11Response.ok(resData);
         } catch (e: any) {
             this.core.context.logger.logError('发生错误', e);
-            return OB11Response.error(e?.toString() || e?.stack?.toString() || '未知错误，可能操作超时', 200);
+            return OB11Response.error((e as Error).message.toString() || e?.stack?.toString() || '未知错误，可能操作超时', 200);
         }
     }
 
@@ -80,7 +79,7 @@ export abstract class OneBotAction<PayloadType, ReturnDataType> {
             return OB11Response.ok(resData, echo);
         } catch (e: any) {
             this.core.context.logger.logError('发生错误', e);
-            return OB11Response.error(e.toString() || e.stack?.toString(), 1200, echo);
+            return OB11Response.error((e as Error).message.toString() || e.stack?.toString(), 1200, echo);
         }
     }
 

src/onebot/action/extends/GetProfileLike.ts

@@ -1,18 +1,31 @@
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
+import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 
-interface Payload {
-    start: number,
-    count: number
-}
+const SchemaData = {
+    type: 'object',
+    properties: {
+        user_id: { type: ['number', 'string'] },
+        start: { type: ['number', 'string'] },
+        count: { type: ['number', 'string'] },
+        type: { type: ['number', 'string'] },
+    },
+} as const satisfies JSONSchema;
+
+type Payload = FromSchema<typeof SchemaData>;
 
 export class GetProfileLike extends OneBotAction<Payload, any> {
     actionName = ActionName.GetProfileLike;
-
+    payloadSchema = SchemaData;
     async _handle(payload: Payload) {
         const start = payload.start ? Number(payload.start) : 0;
         const count = payload.count ? Number(payload.count) : 10;
-        const ret = await this.core.apis.UserApi.getProfileLike(this.core.selfInfo.uid, start, count);
+        const type = payload.count ? Number(payload.count) : 2;
+        const user_uid =
+            this.core.selfInfo.uin === payload.user_id || !payload.user_id ?
+                this.core.selfInfo.uid :
+                await this.core.apis.UserApi.getUidByUinV2(payload.user_id.toString());
+        const ret = await this.core.apis.UserApi.getProfileLike(user_uid ?? this.core.selfInfo.uid, start, count, type);
         const listdata = ret.info.userLikeInfos[0].voteInfo.userInfos;
         for (const item of listdata) {
             item.uin = parseInt((await this.core.apis.UserApi.getUinByUidV2(item.uid)) || '');

src/onebot/action/extends/SetGroupSign.ts

@@ -1,4 +1,4 @@
-import { GetPacketStatusDepends } from '../packet/GetPacketStatus';
+import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
 import { ActionName } from '@/onebot/action/router';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 

src/onebot/action/go-cqhttp/GetForwardMsg.ts

@@ -41,7 +41,7 @@ export class GoCQHTTPGetForwardMsgAction extends OneBotAction<Payload, any> {
             for (const msgdata of message.message) {
                 if ((msgdata as OB11MessageData).type === OB11MessageDataType.forward) {
                     const newNode = this.createTemplateNode(message);
-                    newNode.data.message = await this.parseForward((msgdata as OB11MessageForward).data.content);
+                    newNode.data.message = await this.parseForward((msgdata as OB11MessageForward).data.content ?? []);
 
                     templateNode.data.message.push(newNode);
                 } else {

src/onebot/action/go-cqhttp/SendForwardMsg.ts

@@ -1,5 +1,5 @@
-import SendMsg, { normalize } from '../msg/SendMsg';
-import { OB11PostSendMsg } from '../../types';
+import SendMsg, { normalize } from '@/onebot/action/msg/SendMsg';
+import { OB11PostSendMsg } from '@/onebot/types';
 import { ActionName } from '@/onebot/action/router';
 
 // 未验证

src/onebot/action/go-cqhttp/UploadPrivateFile.ts

@@ -5,7 +5,7 @@ import fs from 'fs';
 import { uri2local } from '@/common/file';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 import { MessageContext } from '@/onebot/api';
-import { ContextMode, createContext } from '../msg/SendMsg';
+import { ContextMode, createContext } from '@/onebot/action/msg/SendMsg';
 
 const SchemaData = {
     type: 'object',

src/onebot/action/group/SendGroupMsg.ts

@@ -1,6 +1,6 @@
-import SendMsg, { ContextMode } from '../msg/SendMsg';
-import { ActionName, BaseCheckResult } from '../router';
-import { OB11PostSendMsg } from '../../types';
+import SendMsg, { ContextMode } from '@/onebot/action/msg/SendMsg';
+import { ActionName, BaseCheckResult } from '@/onebot/action/router';
+import { OB11PostSendMsg } from '@/onebot/types';
 
 // 未检测参数
 class SendGroupMsg extends SendMsg {

src/onebot/action/msg/SendPrivateMsg.ts

@@ -1,6 +1,6 @@
 import SendMsg, { ContextMode } from './SendMsg';
-import { ActionName, BaseCheckResult } from '../router';
-import { OB11PostSendMsg } from '../../types';
+import { ActionName, BaseCheckResult } from '@/onebot/action/router';
+import { OB11PostSendMsg } from '@/onebot/types';
 
 // 未检测参数
 class SendPrivateMsg extends SendMsg {

src/onebot/action/packet/GetPacketStatus.ts

@@ -1,5 +1,5 @@
 import { OneBotAction } from '@/onebot/action/OneBotAction';
-import { ActionName, BaseCheckResult } from '../router';
+import { ActionName, BaseCheckResult } from '@/onebot/action/router';
 
 
 export abstract class GetPacketStatusDepends<PT, RT> extends OneBotAction<PT, RT> {

src/onebot/api/friend.ts

@@ -1,7 +1,6 @@
 import { GrayTipElement, NapCatCore } from '@/core';
-
 import { NapCatOneBot11Adapter } from '@/onebot';
-import { OB11FriendPokeEvent } from '../event/notice/OB11PokeEvent';
+import { OB11FriendPokeEvent } from '@/onebot/event/notice/OB11PokeEvent';
 
 export class OneBotFriendApi {
     obContext: NapCatOneBot11Adapter;

src/onebot/api/group.ts

@@ -1,26 +1,31 @@
 import {
     ChatType,
+    FileElement,
     GrayTipElement,
+    InstanceContext,
+    JsonGrayBusiId,
+    MessageElement,
     NapCatCore,
     NTGrayTipElementSubTypeV2,
+    NTMsgType,
     RawMessage,
+    TipGroupElement,
     TipGroupElementType,
 } from '@/core';
 import { NapCatOneBot11Adapter } from '@/onebot';
-import { OB11GroupBanEvent } from '../event/notice/OB11GroupBanEvent';
-import { OB11GroupIncreaseEvent } from '../event/notice/OB11GroupIncreaseEvent';
-import { OB11GroupDecreaseEvent } from '../event/notice/OB11GroupDecreaseEvent';
+import { OB11GroupBanEvent } from '@/onebot/event/notice/OB11GroupBanEvent';
+import { OB11GroupIncreaseEvent } from '@/onebot/event/notice/OB11GroupIncreaseEvent';
+import { OB11GroupDecreaseEvent } from '@/onebot/event/notice/OB11GroupDecreaseEvent';
 import fastXmlParser from 'fast-xml-parser';
-import { OB11GroupMsgEmojiLikeEvent } from '../event/notice/OB11MsgEmojiLikeEvent';
+import { OB11GroupMsgEmojiLikeEvent } from '@/onebot/event/notice/OB11MsgEmojiLikeEvent';
 import { MessageUnique } from '@/common/message-unique';
 import { OB11GroupCardEvent } from '@/onebot/event/notice/OB11GroupCardEvent';
-import { OB11GroupUploadNoticeEvent } from '@/onebot/event/notice/OB11GroupUploadNoticeEvent';
 import { OB11GroupPokeEvent } from '@/onebot/event/notice/OB11PokeEvent';
 import { OB11GroupEssenceEvent } from '@/onebot/event/notice/OB11GroupEssenceEvent';
 import { OB11GroupTitleEvent } from '@/onebot/event/notice/OB11GroupTitleEvent';
-import { FileNapCatOneBotUUID } from '@/common/helper';
+import { OB11GroupUploadNoticeEvent } from '../event/notice/OB11GroupUploadNoticeEvent';
 import { pathToFileURL } from 'node:url';
-
+import { FileNapCatOneBotUUID } from '@/common/helper';
 
 export class OneBotGroupApi {
     obContext: NapCatOneBot11Adapter;
@@ -31,137 +36,6 @@ export class OneBotGroupApi {
         this.core = core;
     }
 
-    async parseGroupEvent(msg: RawMessage) {
-        const logger = this.core.context.logger;
-        if (msg.chatType !== ChatType.KCHATTYPEGROUP) {
-            return;
-        }
-        //log("group msg", msg);
-        if (msg.senderUin && msg.senderUin !== '0') {
-            const member = await this.core.apis.GroupApi.getGroupMember(msg.peerUid, msg.senderUin);
-            if (member && member.cardName !== msg.sendMemberName) {
-                const newCardName = msg.sendMemberName ?? '';
-                const event = new OB11GroupCardEvent(this.core, parseInt(msg.peerUid), parseInt(msg.senderUin), newCardName, member.cardName);
-                member.cardName = newCardName;
-                return event;
-            }
-        }
-
-        for (const element of msg.elements) {
-            if (element.grayTipElement?.groupElement) {
-                const groupElement = element.grayTipElement.groupElement;
-                if (groupElement.type == TipGroupElementType.KMEMBERADD) {
-                    const MemberIncreaseEvent = await this.obContext.apis.GroupApi.parseGroupMemberIncreaseEvent(msg.peerUid, element.grayTipElement);
-                    if (MemberIncreaseEvent) return MemberIncreaseEvent;
-                } else if (groupElement.type === TipGroupElementType.KSHUTUP) {
-                    const BanEvent = await this.obContext.apis.GroupApi.parseGroupBanEvent(msg.peerUid, element.grayTipElement);
-                    if (BanEvent) return BanEvent;
-                } else if (groupElement.type == TipGroupElementType.KQUITTE) {
-                    this.core.apis.GroupApi.quitGroup(msg.peerUid).then();
-                    try {
-                        const KickEvent = await this.obContext.apis.GroupApi.parseGroupKickEvent(msg.peerUid, element.grayTipElement);
-                        if (KickEvent) return KickEvent;
-                    } catch (e) {
-                        return new OB11GroupDecreaseEvent(
-                            this.core,
-                            parseInt(msg.peerUid),
-                            parseInt(this.core.selfInfo.uin),
-                            0,
-                            'leave',
-                        );
-                    }
-                }
-            } else if (element.fileElement) {
-                return new OB11GroupUploadNoticeEvent(
-                    this.core,
-                    parseInt(msg.peerUid), parseInt(msg.senderUin || ''),
-                    {
-                        id: FileNapCatOneBotUUID.encode({
-                            chatType: ChatType.KCHATTYPEGROUP,
-                            peerUid: msg.peerUid,
-                        }, msg.msgId, element.elementId, element.fileElement.fileUuid, "." + element.fileElement.fileName),
-                        url: pathToFileURL(element.fileElement.filePath).href,
-                        name: element.fileElement.fileName,
-                        size: parseInt(element.fileElement.fileSize),
-                        busid: element.fileElement.fileBizId ?? 0,
-                    },
-                );
-            }
-            if (element.grayTipElement) {
-                if (element.grayTipElement.xmlElement?.templId === '10382') {
-                    const emojiLikeEvent = await this.obContext.apis.GroupApi.parseGroupEmojiLikeEventByGrayTip(msg.peerUid, element.grayTipElement);
-                    if (emojiLikeEvent) return emojiLikeEvent;
-                }
-                if (element.grayTipElement.subElementType == NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_XMLMSG) {
-                    const GroupIncreaseEvent = await this.obContext.apis.GroupApi.parseGroupIncreaseEvent(msg.peerUid, element.grayTipElement);
-                    if (GroupIncreaseEvent) return GroupIncreaseEvent;
-                }
-
-                else if (element.grayTipElement.subElementType == NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_JSON) {
-                    const json = JSON.parse(element.grayTipElement.jsonGrayTipElement.jsonStr);
-                    if (element.grayTipElement.jsonGrayTipElement.busiId == 1061) {
-                        //判断业务类型
-                        //Poke事件
-                        const pokedetail: any[] = json.items;
-                        //筛选item带有uid的元素
-                        const poke_uid = pokedetail.filter(item => item.uid);
-                        if (poke_uid.length == 2) {
-                            return new OB11GroupPokeEvent(
-                                this.core,
-                                parseInt(msg.peerUid),
-                                +await this.core.apis.UserApi.getUinByUidV2(poke_uid[0].uid),
-                                +await this.core.apis.UserApi.getUinByUidV2(poke_uid[1].uid),
-                                pokedetail,
-                            );
-                        }
-                    }
-                    if (element.grayTipElement.jsonGrayTipElement.busiId == 2401) {
-                        const searchParams = new URL(json.items[0].jp).searchParams;
-                        const msgSeq = searchParams.get('msgSeq')!;
-                        const Group = searchParams.get('groupCode');
-                        if (!Group) return;
-                        // const businessId = searchParams.get('businessid');
-                        const Peer = {
-                            guildId: '',
-                            chatType: ChatType.KCHATTYPEGROUP,
-                            peerUid: Group,
-                        };
-                        const msgData = await this.core.apis.MsgApi.getMsgsBySeqAndCount(Peer, msgSeq.toString(), 1, true, true);
-                        const msgList = (await this.core.apis.WebApi.getGroupEssenceMsgAll(Group)).flatMap((e) => e.data.msg_list);
-                        const realMsg = msgList.find((e) => e.msg_seq.toString() == msgSeq);
-                        return new OB11GroupEssenceEvent(
-                            this.core,
-                            parseInt(msg.peerUid),
-                            MessageUnique.getShortIdByMsgId(msgData.msgList[0].msgId)!,
-                            parseInt(msgData.msgList[0].senderUin),
-                            parseInt(realMsg?.add_digest_uin ?? '0'),
-                        );
-                        // 获取MsgSeq+Peer可获取具体消息
-                    }
-                    if (element.grayTipElement.jsonGrayTipElement.busiId == 2407) {
-                        const type = json.items[json.items.length - 1]?.txt;
-                        if (type === "头衔") {
-                            const memberUin = json.items[1].param[0];
-                            const title = json.items[3].txt;
-                            logger.logDebug('收到群成员新头衔消息', json);
-                            return new OB11GroupTitleEvent(
-                                this.core,
-                                parseInt(msg.peerUid),
-                                parseInt(memberUin),
-                                title,
-                            );
-                        } else if (type === "移出") {
-                            logger.logDebug('收到机器人被踢消息', json);
-                            return;
-                        } else {
-                            logger.logWarn('收到未知的灰条消息', json);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
     async parseGroupBanEvent(GroupCode: string, grayTipElement: GrayTipElement) {
         const groupElement = grayTipElement?.groupElement;
         if (!groupElement?.shutUp) return undefined;
@@ -192,66 +66,66 @@ export class OneBotGroupApi {
         return undefined;
     }
 
-    async parseGroupIncreaseEvent(GroupCode: string, grayTipElement: GrayTipElement) {
-        this.core.context.logger.logDebug('收到新人被邀请进群消息', grayTipElement);
-        const xmlElement = grayTipElement.xmlElement;
-        if (xmlElement?.content) {
-            const regex = /jp="(\d+)"/g;
+    // async parseGroupIncreaseEvent(GroupCode: string, grayTipElement: GrayTipElement) {
+    //     this.core.context.logger.logDebug('收到新人被邀请进群消息', grayTipElement);
+    //     const xmlElement = grayTipElement.xmlElement;
+    //     if (xmlElement?.content) {
+    //         const regex = /jp="(\d+)"/g;
 
-            const matches = [];
-            let match = null;
+    //         const matches = [];
+    //         let match = null;
 
-            while ((match = regex.exec(xmlElement.content)) !== null) {
-                matches.push(match[1]);
-            }
-            if (matches.length === 2) {
-                const [inviter, invitee] = matches;
-                return new OB11GroupIncreaseEvent(
-                    this.core,
-                    parseInt(GroupCode),
-                    parseInt(invitee),
-                    parseInt(inviter),
-                    'invite',
-                );
-            }
-        }
-        return undefined;
-    }
+    //         while ((match = regex.exec(xmlElement.content)) !== null) {
+    //             matches.push(match[1]);
+    //         }
+    //         if (matches.length === 2) {
+    //             const [inviter, invitee] = matches;
+    //             return new OB11GroupIncreaseEvent(
+    //                 this.core,
+    //                 parseInt(GroupCode),
+    //                 parseInt(invitee),
+    //                 parseInt(inviter),
+    //                 'invite',
+    //             );
+    //         }
+    //     }
+    //     return undefined;
+    // }
 
-    async parseGroupMemberIncreaseEvent(GroupCode: string, grayTipElement: GrayTipElement) {
-        const groupElement = grayTipElement?.groupElement;
-        if (!groupElement) return undefined;
-        const member = await this.core.apis.UserApi.getUserDetailInfo(groupElement.memberUid);
-        const memberUin = member?.uin;
-        const adminMember = await this.core.apis.GroupApi.getGroupMember(GroupCode, groupElement.adminUid);
-        if (memberUin) {
-            const operatorUin = adminMember?.uin ?? memberUin;
-            return new OB11GroupIncreaseEvent(
-                this.core,
-                parseInt(GroupCode),
-                parseInt(memberUin),
-                parseInt(operatorUin),
-            );
-        } else {
-            return undefined;
-        }
-    }
+    // async parseGroupMemberIncreaseEvent(GroupCode: string, grayTipElement: GrayTipElement) {
+    //     const groupElement = grayTipElement?.groupElement;
+    //     if (!groupElement) return undefined;
+    //     const member = await this.core.apis.UserApi.getUserDetailInfo(groupElement.memberUid);
+    //     const memberUin = member?.uin;
+    //     const adminMember = await this.core.apis.GroupApi.getGroupMember(GroupCode, groupElement.adminUid);
+    //     if (memberUin) {
+    //         const operatorUin = adminMember?.uin ?? memberUin;
+    //         return new OB11GroupIncreaseEvent(
+    //             this.core,
+    //             parseInt(GroupCode),
+    //             parseInt(memberUin),
+    //             parseInt(operatorUin),
+    //         );
+    //     } else {
+    //         return undefined;
+    //     }
+    // }
 
-    async parseGroupKickEvent(GroupCode: string, grayTipElement: GrayTipElement) {
-        const groupElement = grayTipElement?.groupElement;
-        if (!groupElement) return undefined;
-        const adminUin = (await this.core.apis.GroupApi.getGroupMember(GroupCode, groupElement.adminUid))?.uin ?? (await this.core.apis.UserApi.getUidByUinV2(groupElement.adminUid));
-        if (adminUin) {
-            return new OB11GroupDecreaseEvent(
-                this.core,
-                parseInt(GroupCode),
-                parseInt(this.core.selfInfo.uin),
-                parseInt(adminUin),
-                'kick_me',
-            );
-        }
-        return undefined;
-    }
+    // async parseGroupKickEvent(GroupCode: string, grayTipElement: GrayTipElement) {
+    //     const groupElement = grayTipElement?.groupElement;
+    //     if (!groupElement) return undefined;
+    //     const adminUin = (await this.core.apis.GroupApi.getGroupMember(GroupCode, groupElement.adminUid))?.uin ?? (await this.core.apis.UserApi.getUidByUinV2(groupElement.adminUid));
+    //     if (adminUin) {
+    //         return new OB11GroupDecreaseEvent(
+    //             this.core,
+    //             parseInt(GroupCode),
+    //             parseInt(this.core.selfInfo.uin),
+    //             parseInt(adminUin),
+    //             'kick_me',
+    //         );
+    //     }
+    //     return undefined;
+    // }
 
     async parseGroupEmojiLikeEventByGrayTip(
         groupCode: string,
@@ -299,4 +173,150 @@ export class OneBotGroupApi {
             }],
         );
     }
+
+    async parseCardChangedEvent(msg: RawMessage) {
+        if (msg.senderUin && msg.senderUin !== '0') {
+            const member = await this.core.apis.GroupApi.getGroupMember(msg.peerUid, msg.senderUin);
+            if (member && member.cardName !== msg.sendMemberName) {
+                const newCardName = msg.sendMemberName ?? '';
+                const event = new OB11GroupCardEvent(this.core, parseInt(msg.peerUid), parseInt(msg.senderUin), newCardName, member.cardName);
+                member.cardName = newCardName;
+                return event;
+            }
+        }
+        return undefined;
+    }
+
+    // async parseGroupElement(msg: RawMessage, groupElement: TipGroupElement, elementWrapper: GrayTipElement) {
+    //     if (groupElement.type == TipGroupElementType.KMEMBERADD) {
+    //         const MemberIncreaseEvent = await this.obContext.apis.GroupApi.parseGroupMemberIncreaseEvent(msg.peerUid, elementWrapper);
+    //         if (MemberIncreaseEvent) return MemberIncreaseEvent;
+    //     } else if (groupElement.type === TipGroupElementType.KSHUTUP) {
+    //         const BanEvent = await this.obContext.apis.GroupApi.parseGroupBanEvent(msg.peerUid, elementWrapper);
+    //         if (BanEvent) return BanEvent;
+    //     } else if (groupElement.type == TipGroupElementType.KQUITTE) {
+    //         this.core.apis.GroupApi.quitGroup(msg.peerUid).then();
+    //         try {
+    //             const KickEvent = await this.obContext.apis.GroupApi.parseGroupKickEvent(msg.peerUid, elementWrapper);
+    //             if (KickEvent) return KickEvent;
+    //         } catch (e) {
+    //             return new OB11GroupDecreaseEvent(
+    //                 this.core,
+    //                 parseInt(msg.peerUid),
+    //                 parseInt(this.core.selfInfo.uin),
+    //                 0,
+    //                 'leave',
+    //             );
+    //         }
+    //     }
+    //     return undefined;
+    // }
+
+    async parsePaiYiPai(msg: RawMessage, jsonStr: string) {
+        const json = JSON.parse(jsonStr);
+
+        //判断业务类型
+        //Poke事件
+        const pokedetail: any[] = json.items;
+        //筛选item带有uid的元素
+        const poke_uid = pokedetail.filter(item => item.uid);
+        if (poke_uid.length == 2) {
+            return new OB11GroupPokeEvent(
+                this.core,
+                parseInt(msg.peerUid),
+                +await this.core.apis.UserApi.getUinByUidV2(poke_uid[0].uid),
+                +await this.core.apis.UserApi.getUinByUidV2(poke_uid[1].uid),
+                pokedetail,
+            );
+        }
+        return undefined;
+    }
+
+    async parseOtherJsonEvent(msg: RawMessage, jsonStr: string, context: InstanceContext) {
+        const json = JSON.parse(jsonStr);
+        const type = json.items[json.items.length - 1]?.txt;
+        if (type === "头衔") {
+            const memberUin = json.items[1].param[0];
+            const title = json.items[3].txt;
+            context.logger.logDebug('收到群成员新头衔消息', json);
+            return new OB11GroupTitleEvent(
+                this.core,
+                parseInt(msg.peerUid),
+                parseInt(memberUin),
+                title,
+            );
+        } else if (type === "移出") {
+            context.logger.logDebug('收到机器人被踢消息', json);
+            return;
+        } else {
+            context.logger.logWarn('收到未知的灰条消息', json);
+        }
+    }
+
+    async parseEssenceMsg(msg: RawMessage, jsonStr: string) {
+        const json = JSON.parse(jsonStr);
+        const searchParams = new URL(json.items[0].jp).searchParams;
+        const msgSeq = searchParams.get('msgSeq')!;
+        const Group = searchParams.get('groupCode');
+        if (!Group) return;
+        // const businessId = searchParams.get('businessid');
+        const Peer = {
+            guildId: '',
+            chatType: ChatType.KCHATTYPEGROUP,
+            peerUid: Group,
+        };
+        const msgData = await this.core.apis.MsgApi.getMsgsBySeqAndCount(Peer, msgSeq.toString(), 1, true, true);
+        const msgList = (await this.core.apis.WebApi.getGroupEssenceMsgAll(Group)).flatMap((e) => e.data.msg_list);
+        const realMsg = msgList.find((e) => e.msg_seq.toString() == msgSeq);
+        return new OB11GroupEssenceEvent(
+            this.core,
+            parseInt(msg.peerUid),
+            MessageUnique.getShortIdByMsgId(msgData.msgList[0].msgId)!,
+            parseInt(msgData.msgList[0].senderUin),
+            parseInt(realMsg?.add_digest_uin ?? '0'),
+        );
+        // 获取MsgSeq+Peer可获取具体消息
+    }
+
+    async parseGroupUploadFileEvene(msg: RawMessage, element: FileElement, elementWrapper: MessageElement) {
+        return new OB11GroupUploadNoticeEvent(
+            this.core,
+            parseInt(msg.peerUid), parseInt(msg.senderUin || ''),
+            {
+                id: FileNapCatOneBotUUID.encode({
+                    chatType: ChatType.KCHATTYPEGROUP,
+                    peerUid: msg.peerUid,
+                }, msg.msgId, elementWrapper.elementId, elementWrapper?.fileElement?.fileUuid, "." + element.fileName),
+                url: pathToFileURL(element.filePath).href,
+                name: element.fileName,
+                size: parseInt(element.fileSize),
+                busid: element.fileBizId ?? 0,
+            },
+        );
+    }
+
+    async parseGrayTipElement(msg: RawMessage, grayTipElement: GrayTipElement) {
+        if (grayTipElement.subElementType === NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_GROUP) {
+            // 解析群组事件 由sysmsg解析
+            // return await this.parseGroupElement(msg, grayTipElement.groupElement, grayTipElement);
+
+        } else if (grayTipElement.subElementType === NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_XMLMSG) {
+            // 筛选出表情回应 事件
+            if (grayTipElement.xmlElement?.templId === '10382') {
+                return await this.obContext.apis.GroupApi.parseGroupEmojiLikeEventByGrayTip(msg.peerUid, grayTipElement);
+            } else {
+                //return await this.obContext.apis.GroupApi.parseGroupIncreaseEvent(msg.peerUid, grayTipElement);
+            }
+        } else if (grayTipElement.subElementType == NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_JSON) {
+            // 解析json事件
+            if (grayTipElement.jsonGrayTipElement.busiId == 1061) {
+                return await this.parsePaiYiPai(msg, grayTipElement.jsonGrayTipElement.jsonStr);
+            } else if (grayTipElement.jsonGrayTipElement.busiId == JsonGrayBusiId.AIO_GROUP_ESSENCE_MSG_TIP) {
+                return await this.parseEssenceMsg(msg, grayTipElement.jsonGrayTipElement.jsonStr);
+            } else {
+                return await this.parseOtherJsonEvent(msg, grayTipElement.jsonGrayTipElement.jsonStr, this.core.context);
+            }
+        }
+        return undefined;
+    }
 }

src/onebot/api/msg.ts

@@ -7,7 +7,6 @@ import {
     CustomMusicSignPostData,
     ElementType,
     FaceIndex,
-    FaceType,
     IdMusicSignPostData,
     MessageElement,
     NapCatCore,
@@ -16,9 +15,12 @@ import {
     RawMessage,
     SendMessageElement,
     SendTextElement,
+    BaseEmojiType,
+    FaceType,
+    GrayTipElement,
 } from '@/core';
 import faceConfig from '@/core/external/face_config.json';
-import { NapCatOneBot11Adapter, OB11Message, OB11MessageData, OB11MessageDataType, OB11MessageFileBase, } from '@/onebot';
+import { NapCatOneBot11Adapter, OB11Message, OB11MessageData, OB11MessageDataType, OB11MessageFileBase, OB11MessageForward, } from '@/onebot';
 import { OB11Construct } from '@/onebot/helper/data';
 import { EventType } from '@/onebot/event/OneBotEvent';
 import { encodeCQCode } from '@/onebot/helper/cqcode';
@@ -30,27 +32,36 @@ import { OB11FriendAddNoticeEvent } from '@/onebot/event/notice/OB11FriendAddNot
 // import { decodeSysMessage } from '@/core/packet/proto/old/ProfileLike';
 import { ForwardMsgBuilder } from "@/common/forward-msg-builder";
 import { decodeSysMessage } from "@/core/helper/adaptDecoder";
+import { GroupChange, PushMsgBody } from "@/core/packet/transformer/proto";
+import { NapProtoMsg } from '@napneko/nap-proto-core';
+import { OB11GroupIncreaseEvent } from '../event/notice/OB11GroupIncreaseEvent';
+import { OB11GroupDecreaseEvent, GroupDecreaseSubType } from '../event/notice/OB11GroupDecreaseEvent';
 
 type RawToOb11Converters = {
     [Key in keyof MessageElement as Key extends `${string}Element` ? Key : never]: (
         element: Exclude<MessageElement[Key], null | undefined>,
         msg: RawMessage,
         elementWrapper: MessageElement,
+        context: RecvMessageContext
     ) => PromiseLike<OB11MessageData | null>
 }
 
 type Ob11ToRawConverters = {
     [Key in OB11MessageDataType]: (
         sendMsg: Extract<OB11MessageData, { type: Key }>,
-        context: MessageContext,
+        context: SendMessageContext,
     ) => Promise<SendMessageElement | undefined>
 }
 
-export type MessageContext = {
+export type SendMessageContext = {
     deleteAfterSentFiles: string[],
     peer: Peer
 }
 
+export type RecvMessageContext = {
+    parseMultMsg: boolean
+}
+
 function keyCanBeParsed(key: string, parser: RawToOb11Converters): key is keyof RawToOb11Converters {
     return key in parser;
 }
@@ -107,6 +118,7 @@ export class OneBotMsgApi {
                 return {
                     type: OB11MessageDataType.image,
                     data: {
+                        pic_type: element.picType,
                         summary: element.summary,
                         file: encodedFileId,
                         sub_type: element.picSubType,
@@ -144,14 +156,14 @@ export class OneBotMsgApi {
 
         faceElement: async element => {
             const faceIndex = element.faceIndex;
-            if (faceIndex === FaceIndex.dice) {
+            if (faceIndex === FaceIndex.DICE) {
                 return {
                     type: OB11MessageDataType.dice,
                     data: {
                         result: element.resultId!,
                     },
                 };
-            } else if (faceIndex === FaceIndex.rps) {
+            } else if (faceIndex === FaceIndex.RPS) {
                 return {
                     type: OB11MessageDataType.rps,
                     data: {
@@ -337,42 +349,26 @@ export class OneBotMsgApi {
             };
         },
 
-        multiForwardMsgElement: async (_, msg) => {
-            // const message_data: OB11MessageForward = {
-            //     data: {} as any,
-            //     type: OB11MessageDataType.forward,
-            // };
-            // message_data.data.id = msg.msgId;
+        multiForwardMsgElement: async (_, msg, wrapper, context) => {
             const parentMsgPeer = msg.parentMsgPeer ?? {
                 chatType: msg.chatType,
                 guildId: '',
                 peerUid: msg.peerUid,
             };
-            //判断是否在合并消息内
-            msg.parentMsgIdList = msg.parentMsgIdList ?? [];
-            //首次列表不存在则开始创建
-            msg.parentMsgIdList.push(msg.msgId);
-            //let parentMsgId = msg.parentMsgIdList[msg.parentMsgIdList.length - 2 < 0 ? 0 : msg.parentMsgIdList.length - 2];
-            //加入自身MsgId
-            const multiMsgs = (await this.core.apis.MsgApi.getMultiMsg(parentMsgPeer, msg.parentMsgIdList[0], msg.msgId))?.msgList;
-            //拉取下级消息
+            const multiMsgs = await this.getMultiMessages(msg, parentMsgPeer);
+            // 拉取失败则跳过
             if (!multiMsgs) return null;
-            //拉取失败则跳过
-
-            return {
+            const forward: OB11MessageForward = {
                 type: OB11MessageDataType.forward,
-                data: {
-                    id: msg.msgId,
-                    content: (await Promise.all(multiMsgs.map(
-                        async multiMsgItem => {
-                            multiMsgItem.parentMsgPeer = parentMsgPeer;
-                            multiMsgItem.parentMsgIdList = msg.parentMsgIdList;
-                            multiMsgItem.id = MessageUnique.createUniqueMsgId(parentMsgPeer, multiMsgItem.msgId); //该ID仅用查看 无法调用
-                            return await this.parseMessage(multiMsgItem, 'array');
-                        },
-                    ))).filter(item => item !== undefined),
-                },
+                data: { id: msg.msgId }
             };
+            if (!context.parseMultMsg) return forward;
+            forward.data.content = await this.parseMultiMessageContent(
+                multiMsgs,
+                parentMsgPeer,
+                msg.parentMsgIdList
+            );
+            return forward;
         },
 
         arkElement: async (element) => {
@@ -546,8 +542,8 @@ export class OneBotMsgApi {
             elementType: ElementType.FACE,
             elementId: '',
             faceElement: {
-                faceIndex: FaceIndex.dice,
-                faceType: FaceType.dice,
+                faceIndex: FaceIndex.DICE,
+                faceType: FaceType.AniSticke,
                 faceText: '[骰子]',
                 packId: '1',
                 stickerId: '33',
@@ -562,9 +558,9 @@ export class OneBotMsgApi {
             elementType: ElementType.FACE,
             elementId: '',
             faceElement: {
-                faceIndex: FaceIndex.rps,
+                faceIndex: FaceIndex.RPS,
                 faceText: '[包剪锤]',
-                faceType: 3,
+                faceType: FaceType.AniSticke,
                 packId: '1',
                 stickerId: '34',
                 sourceType: 1,
@@ -673,41 +669,89 @@ export class OneBotMsgApi {
         this.core = core;
     }
 
-    async parsePrivateMsgEvent(msg: RawMessage) {
-        if (msg.chatType !== ChatType.KCHATTYPEC2C) {
-            return;
-        }
-        for (const element of msg.elements) {
-            if (element.grayTipElement && element.grayTipElement.subElementType == NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_JSON) {
-                if (element.grayTipElement.jsonGrayTipElement.busiId == 1061) {
-                    const PokeEvent = await this.obContext.apis.FriendApi.parsePrivatePokeEvent(element.grayTipElement);
-                    if (PokeEvent) return PokeEvent;
-                }
-                //好友添加成功事件
-                if (element.grayTipElement.jsonGrayTipElement.busiId == 19324 && msg.peerUid !== '') {
-                    return new OB11FriendAddNoticeEvent(this.core, Number(await this.core.apis.UserApi.getUinByUidV2(msg.peerUid)));
-                }
+    async parsePrivateMsgEvent(msg: RawMessage, grayTipElement: GrayTipElement) {
+        if (grayTipElement.subElementType == NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_JSON) {
+            if (grayTipElement.jsonGrayTipElement.busiId == 1061) {
+                const PokeEvent = await this.obContext.apis.FriendApi.parsePrivatePokeEvent(grayTipElement);
+                if (PokeEvent) { return PokeEvent; };
+            } else if (grayTipElement.jsonGrayTipElement.busiId == 19324 && msg.peerUid !== '') {
+                return new OB11FriendAddNoticeEvent(this.core, Number(await this.core.apis.UserApi.getUinByUidV2(msg.peerUid)));
             }
         }
     }
 
+    private async getMultiMessages(msg: RawMessage, parentMsgPeer: Peer) {
+        //判断是否在合并消息内
+        msg.parentMsgIdList = msg.parentMsgIdList ?? [];
+        //首次列表不存在则开始创建
+        msg.parentMsgIdList.push(msg.msgId);
+        //拉取下级消息
+        return (await this.core.apis.MsgApi.getMultiMsg(
+            parentMsgPeer,
+            msg.parentMsgIdList[0],
+            msg.msgId
+        ))?.msgList;
+    }
+
+    private async parseMultiMessageContent(
+        multiMsgs: RawMessage[],
+        parentMsgPeer: Peer,
+        parentMsgIdList: string[]
+    ) {
+        const parsed = await Promise.all(multiMsgs.map(async msg => {
+            msg.parentMsgPeer = parentMsgPeer;
+            msg.parentMsgIdList = parentMsgIdList;
+            msg.id = MessageUnique.createUniqueMsgId(parentMsgPeer, msg.msgId);
+            //该ID仅用查看 无法调用
+            return await this.parseMessage(msg, 'array', true);
+        }));
+        return parsed.filter(item => item !== undefined);
+    }
+
     async parseMessage(
         msg: RawMessage,
         messagePostFormat: string,
+        parseMultMsg: boolean = true
     ) {
         if (messagePostFormat === 'string') {
-            return (await this.parseMessageV2(msg))?.stringMsg;
+            return (await this.parseMessageV2(msg, parseMultMsg))?.stringMsg;
         }
-        return (await this.parseMessageV2(msg))?.arrayMsg;
+        return (await this.parseMessageV2(msg, parseMultMsg))?.arrayMsg;
     }
 
     async parseMessageV2(
         msg: RawMessage,
+        parseMultMsg: boolean = true
     ) {
         if (msg.senderUin == '0' || msg.senderUin == '') return;
         if (msg.peerUin == '0' || msg.peerUin == '') return;
-        //跳过空消息
-        const resMsg: OB11Message = {
+
+        const resMsg = this.initializeMessage(msg);
+
+        if (this.core.selfInfo.uin == msg.senderUin) {
+            resMsg.message_sent_type = 'self';
+        }
+
+        if (msg.chatType == ChatType.KCHATTYPEGROUP) {
+            await this.handleGroupMessage(resMsg, msg);
+        } else if (msg.chatType == ChatType.KCHATTYPEC2C) {
+            await this.handlePrivateMessage(resMsg, msg);
+        } else if (msg.chatType == ChatType.KCHATTYPETEMPC2CFROMGROUP) {
+            await this.handleTempGroupMessage(resMsg, msg);
+        } else {
+            return undefined;
+        }
+
+        const validSegments = await this.parseMessageSegments(msg, parseMultMsg);
+        resMsg.message = validSegments;
+        resMsg.raw_message = validSegments.map(msg => encodeCQCode(msg)).join('').trim();
+
+        const stringMsg = await this.convertArrayToStringMessage(resMsg);
+        return { stringMsg, arrayMsg: resMsg };
+    }
+
+    private initializeMessage(msg: RawMessage): OB11Message {
+        return {
             self_id: parseInt(this.core.selfInfo.uin),
             user_id: parseInt(msg.senderUin),
             time: parseInt(msg.msgTime) || Date.now(),
@@ -727,37 +771,40 @@ export class OneBotMsgApi {
             message_format: 'array',
             post_type: this.core.selfInfo.uin == msg.senderUin ? EventType.MESSAGE_SENT : EventType.MESSAGE,
         };
-        if (this.core.selfInfo.uin == msg.senderUin) {
-            resMsg.message_sent_type = 'self';
-        }
-        if (msg.chatType == ChatType.KCHATTYPEGROUP) {
-            resMsg.sub_type = 'normal'; // 这里go-cqhttp是group，而onebot11标准是normal, 蛋疼
-            resMsg.group_id = parseInt(msg.peerUin);
-            let member = await this.core.apis.GroupApi.getGroupMember(msg.peerUin, msg.senderUin);
-            if (!member) member = await this.core.apis.GroupApi.getGroupMember(msg.peerUin, msg.senderUin);
-            if (member) {
-                resMsg.sender.role = OB11Construct.groupMemberRole(member.role);
-                resMsg.sender.nickname = member.nick;
-            }
-        } else if (msg.chatType == ChatType.KCHATTYPEC2C) {
-            resMsg.sub_type = 'friend';
-            resMsg.sender.nickname = (await this.core.apis.UserApi.getUserDetailInfo(msg.senderUid)).nick;
-        } else if (msg.chatType == ChatType.KCHATTYPETEMPC2CFROMGROUP) {
-            resMsg.sub_type = 'group';
-            const ret = await this.core.apis.MsgApi.getTempChatInfo(ChatType.KCHATTYPETEMPC2CFROMGROUP, msg.senderUid);
-            if (ret.result === 0) {
-                const member = await this.core.apis.GroupApi.getGroupMember(msg.peerUin, msg.senderUin);
-                resMsg.group_id = parseInt(ret.tmpChatInfo!.groupCode);
-                resMsg.sender.nickname = member?.nick ?? member?.cardName ?? '临时会话';
-                resMsg.temp_source = resMsg.group_id;
-            } else {
-                resMsg.group_id = 284840486; //兜底数据
-                resMsg.temp_source = resMsg.group_id;
-                resMsg.sender.nickname = '临时会话';
-            }
-        }
+    }
 
-        // 处理消息段
+    private async handleGroupMessage(resMsg: OB11Message, msg: RawMessage) {
+        resMsg.sub_type = 'normal';
+        resMsg.group_id = parseInt(msg.peerUin);
+        let member = await this.core.apis.GroupApi.getGroupMember(msg.peerUin, msg.senderUin);
+        if (!member) member = await this.core.apis.GroupApi.getGroupMember(msg.peerUin, msg.senderUin);
+        if (member) {
+            resMsg.sender.role = OB11Construct.groupMemberRole(member.role);
+            resMsg.sender.nickname = member.nick;
+        }
+    }
+
+    private async handlePrivateMessage(resMsg: OB11Message, msg: RawMessage) {
+        resMsg.sub_type = 'friend';
+        resMsg.sender.nickname = (await this.core.apis.UserApi.getUserDetailInfo(msg.senderUid)).nick;
+    }
+
+    private async handleTempGroupMessage(resMsg: OB11Message, msg: RawMessage) {
+        resMsg.sub_type = 'group';
+        const ret = await this.core.apis.MsgApi.getTempChatInfo(ChatType.KCHATTYPETEMPC2CFROMGROUP, msg.senderUid);
+        if (ret.result === 0) {
+            const member = await this.core.apis.GroupApi.getGroupMember(msg.peerUin, msg.senderUin);
+            resMsg.group_id = parseInt(ret.tmpChatInfo!.groupCode);
+            resMsg.sender.nickname = member?.nick ?? member?.cardName ?? '临时会话';
+            resMsg.temp_source = resMsg.group_id;
+        } else {
+            resMsg.group_id = 284840486;
+            resMsg.temp_source = resMsg.group_id;
+            resMsg.sender.nickname = '临时会话';
+        }
+    }
+
+    private async parseMessageSegments(msg: RawMessage, parseMultMsg: boolean): Promise<OB11MessageData[]> {
         const msgSegments = await Promise.allSettled(msg.elements.map(
             async (element) => {
                 for (const key in element) {
@@ -766,45 +813,47 @@ export class OneBotMsgApi {
                             element: Exclude<MessageElement[keyof RawToOb11Converters], null | undefined>,
                             msg: RawMessage,
                             elementWrapper: MessageElement,
+                            context: RecvMessageContext
                         ) => PromiseLike<OB11MessageData | null>;
                         const parsedElement = await converters?.(
                             element[key],
                             msg,
                             element,
+                            { parseMultMsg }
                         );
-                        // 对于 face 类型的消息，检查是否存在
                         if (key === 'faceElement' && !parsedElement) {
-                            return null; // 如果没有找到对应的表情，返回 null
+                            return null;
                         }
-
                         return parsedElement;
                     }
                 }
             },
         ));
 
-        // 过滤掉无效的消息段
-        const validSegments = msgSegments.filter(entry => {
+        return msgSegments.filter(entry => {
             if (entry.status === 'fulfilled') {
                 return !!entry.value;
             } else {
-                this.core.context.logger.logError.bind(this.core.context.logger)('消息段解析失败', entry.reason);
+                this.core.context.logger.logError('消息段解析失败', entry.reason);
                 return false;
             }
         }).map((entry) => (<PromiseFulfilledResult<OB11MessageData>>entry).value).filter(value => value != null);
-
-        const msgAsCQCode = validSegments.map(msg => encodeCQCode(msg)).join('').trim();
-        resMsg.message = validSegments;
-        resMsg.raw_message = msgAsCQCode;
-        let stringMsg = structuredClone(resMsg);
-        stringMsg = await this.importArrayTostringMsg(stringMsg);
-        return { stringMsg: stringMsg, arrayMsg: resMsg };
     }
-    async importArrayTostringMsg(msg: OB11Message) {
+
+    private async convertArrayToStringMessage(originMsg: OB11Message): Promise<OB11Message> {
+        const msg = structuredClone(originMsg);
         msg.message_format = 'string';
         msg.message = msg.raw_message;
         return msg;
     }
+
+    async importArrayTostringMsg(originMsg: OB11Message) {
+        const msg = structuredClone(originMsg);
+        msg.message_format = 'string';
+        msg.message = msg.raw_message;
+        return msg;
+    }
+
     async createSendElements(
         messageData: OB11MessageData[],
         peer: Peer,
@@ -818,7 +867,7 @@ export class OneBotMsgApi {
             }
             const converter = this.ob11ToRawConverters[sendMsg.type] as (
                 sendMsg: Extract<OB11MessageData, { type: OB11MessageData['type'] }>,
-                context: MessageContext,
+                context: SendMessageContext,
             ) => Promise<SendMessageElement | undefined>;
             const callResult = converter(
                 sendMsg,
@@ -867,17 +916,25 @@ export class OneBotMsgApi {
             guildId: '',
             peerUid: peer.peerUid,
         }, returnMsg.msgId);
+
         setTimeout(() => {
             deleteAfterSentFiles.forEach(file => {
-                fsPromise.unlink(file).then().catch(e => this.core.context.logger.logError.bind(this.core.context.logger)('发送消息删除文件失败', e));
+                try {
+                    if (fs.existsSync(file)) {
+                        fsPromise.unlink(file).then().catch(e => this.core.context.logger.logError.bind(this.core.context.logger)('发送消息删除文件失败', e));
+                    }
+                } catch (error) {
+                    this.core.context.logger.logError.bind(this.core.context.logger)('发送消息删除文件失败', (error as Error).message);
+                }
             });
         }, 60000);
+
         return returnMsg;
     }
 
     private async handleOb11FileLikeMessage(
         { data: inputdata }: OB11MessageFileBase,
-        { deleteAfterSentFiles }: MessageContext,
+        { deleteAfterSentFiles }: SendMessageContext,
     ) {
         const realUri = inputdata.url || inputdata.file || inputdata.path || '';
         if (realUri.length === 0) {
@@ -900,17 +957,45 @@ export class OneBotMsgApi {
 
         return { path, fileName: inputdata.name ?? fileName };
     }
+    groupChangDecreseType2String(type: number): GroupDecreaseSubType {
+        switch (type) {
+            case 130:
+                return 'leave';
+            case 131:
+                return 'kick';
+            case 3:
+                return 'kick_me';
+            default:
+                return 'kick';
+        }
+    }
 
     async parseSysMessage(msg: number[]) {
-        const sysMsg = decodeSysMessage(Uint8Array.from(msg));
-        if (sysMsg.msgSpec.length === 0) {
-            return;
-        }
-        const { msgType, subType, subSubType } = sysMsg.msgSpec[0];
-        if (msgType === 528 && subType === 39 && subSubType === 39) {
-            if (!sysMsg.bodyWrapper) return;
-            return await this.obContext.apis.UserApi.parseLikeEvent(sysMsg.bodyWrapper.wrappedBody);
+        // Todo Refactor
+        const SysMessage = new NapProtoMsg(PushMsgBody).decode(Uint8Array.from(msg));
+        if (SysMessage.contentHead.type == 33 && SysMessage.body?.msgContent) {
+            const groupChange = new NapProtoMsg(GroupChange).decode(SysMessage.body.msgContent);
+            console.log(JSON.stringify(groupChange));
+            return new OB11GroupIncreaseEvent(
+                this.core,
+                groupChange.groupUin,
+                groupChange.memberUid ? +await this.core.apis.UserApi.getUinByUidV2(groupChange.memberUid) : 0,
+                groupChange.operatorUid ? +await this.core.apis.UserApi.getUinByUidV2(groupChange.operatorUid) : 0,
+                groupChange.decreaseType == 131 ? 'invite' : 'approve',
+            );
+        } else if (SysMessage.contentHead.type == 34 && SysMessage.body?.msgContent) {
+            const groupChange = new NapProtoMsg(GroupChange).decode(SysMessage.body.msgContent);
+            return new OB11GroupDecreaseEvent(
+                this.core,
+                groupChange.groupUin,
+                groupChange.memberUid ? +await this.core.apis.UserApi.getUinByUidV2(groupChange.memberUid) : 0,
+                groupChange.operatorUid ? +await this.core.apis.UserApi.getUinByUidV2(groupChange.operatorUid) : 0,
+                this.groupChangDecreseType2String(groupChange.decreaseType),
+            );
+        } else if (SysMessage.contentHead.type == 528 && SysMessage.contentHead.subType == 39 && SysMessage.body?.msgContent) {
+            return await this.obContext.apis.UserApi.parseLikeEvent(SysMessage.body?.msgContent);
         }
+
         /*
         if (msgType === 732 && subType === 16 && subSubType === 16) {
             const greyTip = GreyTipWrapper.fromBinary(Uint8Array.from(sysMsg.bodyWrapper!.wrappedBody.slice(7)));

src/onebot/api/user.ts

@@ -1,6 +1,6 @@
-import { NapCatCore } from '@/core';
+import { GrayTipRovokeElement, NapCatCore, RawMessage } from '@/core';
 import { NapCatOneBot11Adapter } from '@/onebot';
-import { OB11ProfileLikeEvent } from '../event/notice/OB11ProfileLikeEvent';
+import { OB11ProfileLikeEvent } from '@/onebot/event/notice/OB11ProfileLikeEvent';
 import { decodeProfileLikeTip } from "@/core/helper/adaptDecoder";
 
 export class OneBotUserApi {
@@ -13,7 +13,7 @@ export class OneBotUserApi {
     }
 
     async parseLikeEvent(wrappedBody: Uint8Array): Promise<OB11ProfileLikeEvent | undefined> {
-        const likeTip = decodeProfileLikeTip(Uint8Array.from(wrappedBody));
+        const likeTip = decodeProfileLikeTip(wrappedBody);
         if (likeTip?.msgType !== 0 || likeTip?.subType !== 203) return;
         this.core.context.logger.logDebug("收到点赞通知消息");
         const likeMsg = likeTip.content.msg;

src/onebot/config/config.ts

@@ -103,6 +103,7 @@ export interface OneBotConfig {
     network: NetworkConfig; // 网络配置
     musicSignUrl: string; // 音乐签名地址
     enableLocalFile2Url: boolean;
+    parseMultMsg: boolean;
 }
 
 const createDefaultConfig = <T>(config: T): T => config;
@@ -116,6 +117,7 @@ export const defaultOneBotConfigs = createDefaultConfig<OneBotConfig>({
     },
     musicSignUrl: '',
     enableLocalFile2Url: false,
+    parseMultMsg: true
 });
 
 export const mergeNetworkDefaultConfig = {
@@ -149,9 +151,12 @@ export function mergeOneBotConfigs(
     if (userConfig.musicSignUrl !== undefined) {
         mergedConfig.musicSignUrl = userConfig.musicSignUrl;
     }
-    if(userConfig.enableLocalFile2Url !== undefined) {
+    if (userConfig.enableLocalFile2Url !== undefined) {
         mergedConfig.enableLocalFile2Url = userConfig.enableLocalFile2Url;
     }
+    if (userConfig.parseMultMsg !== undefined) {
+        mergedConfig.parseMultMsg = userConfig.parseMultMsg;
+    }
     return mergedConfig;
 }
 

src/onebot/event/message/OB11BaseMessageEvent.ts

@@ -1,4 +1,4 @@
-import { EventType, OneBotEvent } from '../OneBotEvent';
+import { EventType, OneBotEvent } from '@/onebot/event/OneBotEvent';
 
 export abstract class OB11BaseMessageEvent extends OneBotEvent {
     post_type = EventType.MESSAGE;

src/onebot/event/request/OB11FriendRequest.ts

@@ -1,5 +1,5 @@
-import { OB11BaseNoticeEvent } from '../notice/OB11BaseNoticeEvent';
-import { EventType } from '../OneBotEvent';
+import { OB11BaseNoticeEvent } from '@/onebot/event/notice/OB11BaseNoticeEvent';
+import { EventType } from '@/onebot/event/OneBotEvent';
 import { NapCatCore } from '@/core';
 
 export class OB11FriendRequestEvent extends OB11BaseNoticeEvent {

src/onebot/event/request/OB11GroupRequest.ts

@@ -1,5 +1,5 @@
-import { OB11GroupNoticeEvent } from '../notice/OB11GroupNoticeEvent';
-import { EventType } from '../OneBotEvent';
+import { OB11GroupNoticeEvent } from '@/onebot/event/notice/OB11GroupNoticeEvent';
+import { EventType } from '@/onebot/event/OneBotEvent';
 import { NapCatCore } from '@/core';
 
 export class OB11GroupRequestEvent extends OB11GroupNoticeEvent {

src/onebot/index.ts

@@ -13,6 +13,8 @@ import {
     Peer,
     RawMessage,
     SendStatusType,
+    NTMsgType,
+    MessageElement,
 } from '@/core';
 import { OB11ConfigLoader } from '@/onebot/config';
 import {
@@ -40,7 +42,7 @@ import { MessageUnique } from '@/common/message-unique';
 import { proxiedListenerOf } from '@/common/proxy-handler';
 import { OB11FriendRequestEvent } from '@/onebot/event/request/OB11FriendRequest';
 import { OB11GroupAdminNoticeEvent } from '@/onebot/event/notice/OB11GroupAdminNoticeEvent';
-import { GroupDecreaseSubType, OB11GroupDecreaseEvent } from '@/onebot/event/notice/OB11GroupDecreaseEvent';
+// import { GroupDecreaseSubType, OB11GroupDecreaseEvent } from '@/onebot/event/notice/OB11GroupDecreaseEvent';
 import { OB11GroupRequestEvent } from '@/onebot/event/request/OB11GroupRequest';
 import { OB11FriendRecallNoticeEvent } from '@/onebot/event/notice/OB11FriendRecallNoticeEvent';
 import { OB11GroupRecallNoticeEvent } from '@/onebot/event/notice/OB11GroupRecallNoticeEvent';
@@ -176,67 +178,48 @@ export class NapCatOneBot11Adapter {
         };
     }
 
-    private async reloadNetwork(prev: OneBotConfig, now: OneBotConfig) {
+    private async reloadNetwork(prev: OneBotConfig, now: OneBotConfig): Promise<void> {
         const prevLog = await this.creatOneBotLog(prev);
         const newLog = await this.creatOneBotLog(now);
         this.context.logger.log(`[Notice] [OneBot11] 配置变更前:\n${prevLog}`);
         this.context.logger.log(`[Notice] [OneBot11] 配置变更后:\n${newLog}`);
 
-        const { added: addedHttpServers, removed: removedHttpServers } = this.findDifference(prev.network.httpServers, now.network.httpServers);
-        const { added: addedHttpClients, removed: removedHttpClients } = this.findDifference(prev.network.httpClients, now.network.httpClients);
-        const { added: addedWebSocketServers, removed: removedWebSocketServers } = this.findDifference(prev.network.websocketServers, now.network.websocketServers);
-        const { added: addedWebSocketClients, removed: removedWebSocketClients } = this.findDifference(prev.network.websocketClients, now.network.websocketClients);
-
-        await this.handleRemovedAdapters(removedHttpServers);
-        await this.handleRemovedAdapters(removedHttpClients);
-        await this.handleRemovedAdapters(removedWebSocketServers);
-        await this.handleRemovedAdapters(removedWebSocketClients);
-
-        await this.handlerConfigChange(now.network.httpServers);
-        await this.handlerConfigChange(now.network.httpClients);
-        await this.handlerConfigChange(now.network.websocketServers);
-        await this.handlerConfigChange(now.network.websocketClients);
-
-        await this.handleAddedAdapters(addedHttpServers, OB11PassiveHttpAdapter);
-        await this.handleAddedAdapters(addedHttpClients, OB11ActiveHttpAdapter);
-        await this.handleAddedAdapters(addedWebSocketServers, OB11PassiveWebSocketAdapter);
-        await this.handleAddedAdapters(addedWebSocketClients, OB11ActiveWebSocketAdapter);
+        await this.handleConfigChange(prev.network.httpServers, now.network.httpServers, OB11PassiveHttpAdapter);
+        await this.handleConfigChange(prev.network.httpClients, now.network.httpClients, OB11ActiveHttpAdapter);
+        await this.handleConfigChange(prev.network.websocketServers, now.network.websocketServers, OB11PassiveWebSocketAdapter);
+        await this.handleConfigChange(prev.network.websocketClients, now.network.websocketClients, OB11ActiveWebSocketAdapter);
     }
 
-    private async handlerConfigChange(adapters: Array<NetworkConfigAdapter>) {
-        for (const adapterConfig of adapters) {
+    private async handleConfigChange(
+        prevConfig: NetworkConfigAdapter[],
+        nowConfig: NetworkConfigAdapter[],
+        adapterClass: new (...args: any[]) => IOB11NetworkAdapter
+    ): Promise<void> {
+        // 比较旧的在新的找不到的回收
+        for (const adapterConfig of prevConfig) {
+            const existingAdapter = nowConfig.find((e) => e.name === adapterConfig.name);
+            if (!existingAdapter) {
+                const existingAdapter = this.networkManager.findSomeAdapter(adapterConfig.name);
+                if (existingAdapter) {
+                    await this.networkManager.closeSomeAdaterWhenOpen([existingAdapter]);
+                }
+            }
+        }
+        // 通知新配置重载 删除关闭的 加入新开的 
+        for (const adapterConfig of nowConfig) {
             const existingAdapter = this.networkManager.findSomeAdapter(adapterConfig.name);
             if (existingAdapter) {
                 const networkChange = await existingAdapter.reload(adapterConfig);
                 if (networkChange === OB11NetworkReloadType.NetWorkClose) {
-                    this.networkManager.closeSomeAdapters([existingAdapter]);
-
+                    await this.networkManager.closeSomeAdaterWhenOpen([existingAdapter]);
                 }
+            } else if (adapterConfig.enable) {
+                const newAdapter = new adapterClass(adapterConfig.name, adapterConfig, this.core, this.actions);
+                await this.networkManager.registerAdapterAndOpen(newAdapter);
             }
         }
     }
 
-    private async handleRemovedAdapters(adapters: Array<{ name: string }>): Promise<void> {
-        for (const adapter of adapters) {
-            await this.networkManager.closeAdapterByPredicate((existingAdapter) => existingAdapter.name === adapter.name);
-        }
-    }
-
-    private async handleAddedAdapters<T extends new (...args: any[]) => IOB11NetworkAdapter>(addedAdapters: Array<NetworkConfigAdapter>, AdapterClass: T) {
-        for (const adapter of addedAdapters) {
-            if (adapter.enable) {
-                const newAdapter = new AdapterClass(adapter.name, adapter, this.core, this.actions);
-                await newAdapter.open();
-                this.networkManager.registerAdapter(newAdapter);
-            }
-        }
-    }
-    private findDifference<T>(prev: T[], now: T[]): { added: T[]; removed: T[] } {
-        const added = now.filter((item) => !prev.includes(item));
-        const removed = prev.filter((item) => !now.includes(item));
-        return { added, removed };
-    }
-
     private initMsgListener() {
         const msgListener = new NodeIKernelMsgListener();
         msgListener.onRecvSysMsg = (msg) => {
@@ -282,30 +265,49 @@ export class NapCatOneBot11Adapter {
             }
         };
 
-        const msgIdSend = new LRUCache<string, number>(100);
-        const recallMsgs = new LRUCache<string, boolean>(100);
         msgListener.onAddSendMsg = async (msg) => {
-            if (msg.sendStatus == SendStatusType.KSEND_STATUS_SENDING) {
-                msgIdSend.put(msg.msgId, 0);
+            try {
+                if (msg.sendStatus == SendStatusType.KSEND_STATUS_SENDING) {
+                    const [updatemsgs] = await this.core.eventWrapper.registerListen('NodeIKernelMsgListener/onMsgInfoListUpdate', (msgList: RawMessage[]) => {
+                        const report = msgList.find((e) =>
+                            e.senderUin == this.core.selfInfo.uin && e.sendStatus !== SendStatusType.KSEND_STATUS_SENDING && e.msgId === msg.msgId
+                        );
+                        return !!report;
+                    }, 1, 10 * 60 * 1000);
+                    // 10分钟 超时
+                    const updatemsg = updatemsgs.find((e) => e.msgId === msg.msgId);
+                    if (updatemsg?.sendStatus == SendStatusType.KSEND_STATUS_SUCCESS || updatemsg?.sendStatus == SendStatusType.KSEND_STATUS_SUCCESS_NOSEQ) {
+                        updatemsg.id = MessageUnique.createUniqueMsgId(
+                            {
+                                chatType: updatemsg.chatType,
+                                peerUid: updatemsg.peerUid,
+                                guildId: '',
+                            },
+                            updatemsg.msgId
+                        );
+                        this.emitMsg(updatemsg);
+                    }
+                }
+            } catch (error) {
+                this.context.logger.logError('处理发送消息失败', error);
             }
         };
-        msgListener.onMsgInfoListUpdate = async (msgList) => {
-            this.emitRecallMsg(msgList, recallMsgs).catch((e) =>
-                this.context.logger.logError.bind(this.context.logger)('处理消息失败', e)
-            );
-            for (const msg of msgList.filter((e) => e.senderUin == this.core.selfInfo.uin)) {
-                if (msg.sendStatus == SendStatusType.KSEND_STATUS_SUCCESS && msgIdSend.get(msg.msgId) == 0) {
-                    msgIdSend.put(msg.msgId, 1);
-                    // 完成后再post
-                    msg.id = MessageUnique.createUniqueMsgId(
-                        {
-                            chatType: msg.chatType,
-                            peerUid: msg.peerUid,
-                            guildId: '',
-                        },
-                        msg.msgId
-                    );
-                    this.emitMsg(msg);
+        msgListener.onMsgRecall = async (chatType: ChatType, uid: string, msgSeq: string) => {
+            const peer: Peer = {
+                chatType: chatType,
+                peerUid: uid,
+                guildId: ''
+            };
+            const msg = (await this.core.apis.MsgApi.queryMsgsWithFilterExWithSeq(peer, msgSeq)).msgList.find(e => e.msgType == NTMsgType.KMSGTYPEGRAYTIPS);
+            const element = msg?.elements[0];
+            if (msg && element) {
+                const recallEvent = await this.emitRecallMsg(msg, element);
+                try {
+                    if (recallEvent) {
+                        await this.networkManager.emitEvent(recallEvent);
+                    }
+                } catch (e) {
+                    this.context.logger.logError('处理消息撤回失败', e);
                 }
             }
         };
@@ -411,102 +413,104 @@ export class NapCatOneBot11Adapter {
                                 this.core.apis.GroupApi.getGroup(notify.group.groupCode)
                             );
                         }
-                    } else if (
-                        notify.type == GroupNotifyMsgType.MEMBER_LEAVE_NOTIFY_ADMIN ||
-                        notify.type == GroupNotifyMsgType.KICK_MEMBER_NOTIFY_ADMIN
-                    ) {
-                        this.context.logger.logDebug('有成员退出通知', notify);
-                        const member1Uin = await this.core.apis.UserApi.getUinByUidV2(notify.user1.uid);
-                        let operatorId = member1Uin;
-                        let subType: GroupDecreaseSubType = 'leave';
-                        if (notify.user2.uid) {
-                            // 是被踢的
-                            const member2Uin = await this.core.apis.UserApi.getUinByUidV2(notify.user2.uid);
-                            if (member2Uin) {
-                                operatorId = member2Uin;
+                    } else
+                        // if (
+                        //     notify.type == GroupNotifyMsgType.MEMBER_LEAVE_NOTIFY_ADMIN ||
+                        //     notify.type == GroupNotifyMsgType.KICK_MEMBER_NOTIFY_ADMIN
+                        // ) {
+                        //     this.context.logger.logDebug('有成员退出通知', notify);
+                        //     const member1Uin = await this.core.apis.UserApi.getUinByUidV2(notify.user1.uid);
+                        //     let operatorId = member1Uin;
+                        //     let subType: GroupDecreaseSubType = 'leave';
+                        //     if (notify.user2.uid) {
+                        //         // 是被踢的
+                        //         const member2Uin = await this.core.apis.UserApi.getUinByUidV2(notify.user2.uid);
+                        //         if (member2Uin) {
+                        //             operatorId = member2Uin;
+                        //         }
+                        //         subType = 'kick';
+                        //     }
+                        //     const groupDecreaseEvent = new OB11GroupDecreaseEvent(
+                        //         this.core,
+                        //         parseInt(notify.group.groupCode),
+                        //         parseInt(member1Uin),
+                        //         parseInt(operatorId),
+                        //         subType
+                        //     );
+                        //     this.networkManager
+                        //         .emitEvent(groupDecreaseEvent)
+                        //         .catch((e) =>
+                        //             this.context.logger.logError.bind(this.context.logger)('处理群成员退出失败', e)
+                        //         );
+                        //     // notify.status == 1 表示未处理 2表示处理完成
+                        // } else
+                        if (
+                            [GroupNotifyMsgType.REQUEST_JOIN_NEED_ADMINI_STRATOR_PASS].includes(notify.type) &&
+                            notify.status == GroupNotifyMsgStatus.KUNHANDLE
+                        ) {
+                            this.context.logger.logDebug('有加群请求');
+                            try {
+                                let requestUin = await this.core.apis.UserApi.getUinByUidV2(notify.user1.uid);
+                                if (isNaN(parseInt(requestUin))) {
+                                    requestUin = (await this.core.apis.UserApi.getUserDetailInfo(notify.user1.uid)).uin;
+                                }
+                                const groupRequestEvent = new OB11GroupRequestEvent(
+                                    this.core,
+                                    parseInt(notify.group.groupCode),
+                                    parseInt(requestUin),
+                                    'add',
+                                    notify.postscript,
+                                    flag
+                                );
+                                this.networkManager
+                                    .emitEvent(groupRequestEvent)
+                                    .catch((e) =>
+                                        this.context.logger.logError.bind(this.context.logger)('处理加群请求失败', e)
+                                    );
+                            } catch (e) {
+                                this.context.logger.logError.bind(this.context.logger)(
+                                    '获取加群人QQ号失败 Uid:',
+                                    notify.user1.uid,
+                                    e
+                                );
                             }
-                            subType = 'kick';
-                        }
-                        const groupDecreaseEvent = new OB11GroupDecreaseEvent(
-                            this.core,
-                            parseInt(notify.group.groupCode),
-                            parseInt(member1Uin),
-                            parseInt(operatorId),
-                            subType
-                        );
-                        this.networkManager
-                            .emitEvent(groupDecreaseEvent)
-                            .catch((e) =>
-                                this.context.logger.logError.bind(this.context.logger)('处理群成员退出失败', e)
-                            );
-                        // notify.status == 1 表示未处理 2表示处理完成
-                    } else if (
-                        [GroupNotifyMsgType.REQUEST_JOIN_NEED_ADMINI_STRATOR_PASS].includes(notify.type) &&
-                        notify.status == GroupNotifyMsgStatus.KUNHANDLE
-                    ) {
-                        this.context.logger.logDebug('有加群请求');
-                        try {
-                            let requestUin = await this.core.apis.UserApi.getUinByUidV2(notify.user1.uid);
-                            if (isNaN(parseInt(requestUin))) {
-                                requestUin = (await this.core.apis.UserApi.getUserDetailInfo(notify.user1.uid)).uin;
-                            }
-                            const groupRequestEvent = new OB11GroupRequestEvent(
+                        } else if (
+                            notify.type == GroupNotifyMsgType.INVITED_BY_MEMBER &&
+                            notify.status == GroupNotifyMsgStatus.KUNHANDLE
+                        ) {
+                            this.context.logger.logDebug(`收到邀请我加群通知:${notify}`);
+                            const groupInviteEvent = new OB11GroupRequestEvent(
                                 this.core,
                                 parseInt(notify.group.groupCode),
-                                parseInt(requestUin),
+                                parseInt(await this.core.apis.UserApi.getUinByUidV2(notify.user2.uid)),
+                                'invite',
+                                notify.postscript,
+                                flag
+                            );
+                            this.networkManager
+                                .emitEvent(groupInviteEvent)
+                                .catch((e) =>
+                                    this.context.logger.logError.bind(this.context.logger)('处理邀请本人加群失败', e)
+                                );
+                        } else if (
+                            notify.type == GroupNotifyMsgType.INVITED_NEED_ADMINI_STRATOR_PASS &&
+                            notify.status == GroupNotifyMsgStatus.KUNHANDLE
+                        ) {
+                            this.context.logger.logDebug(`收到群员邀请加群通知:${notify}`);
+                            const groupInviteEvent = new OB11GroupRequestEvent(
+                                this.core,
+                                parseInt(notify.group.groupCode),
+                                parseInt(await this.core.apis.UserApi.getUinByUidV2(notify.user1.uid)),
                                 'add',
                                 notify.postscript,
                                 flag
                             );
                             this.networkManager
-                                .emitEvent(groupRequestEvent)
+                                .emitEvent(groupInviteEvent)
                                 .catch((e) =>
-                                    this.context.logger.logError.bind(this.context.logger)('处理加群请求失败', e)
+                                    this.context.logger.logError.bind(this.context.logger)('处理邀请本人加群失败', e)
                                 );
-                        } catch (e) {
-                            this.context.logger.logError.bind(this.context.logger)(
-                                '获取加群人QQ号失败 Uid:',
-                                notify.user1.uid,
-                                e
-                            );
                         }
-                    } else if (
-                        notify.type == GroupNotifyMsgType.INVITED_BY_MEMBER &&
-                        notify.status == GroupNotifyMsgStatus.KUNHANDLE
-                    ) {
-                        this.context.logger.logDebug(`收到邀请我加群通知:${notify}`);
-                        const groupInviteEvent = new OB11GroupRequestEvent(
-                            this.core,
-                            parseInt(notify.group.groupCode),
-                            parseInt(await this.core.apis.UserApi.getUinByUidV2(notify.user2.uid)),
-                            'invite',
-                            notify.postscript,
-                            flag
-                        );
-                        this.networkManager
-                            .emitEvent(groupInviteEvent)
-                            .catch((e) =>
-                                this.context.logger.logError.bind(this.context.logger)('处理邀请本人加群失败', e)
-                            );
-                    } else if (
-                        notify.type == GroupNotifyMsgType.INVITED_NEED_ADMINI_STRATOR_PASS &&
-                        notify.status == GroupNotifyMsgStatus.KUNHANDLE
-                    ) {
-                        this.context.logger.logDebug(`收到群员邀请加群通知:${notify}`);
-                        const groupInviteEvent = new OB11GroupRequestEvent(
-                            this.core,
-                            parseInt(notify.group.groupCode),
-                            parseInt(await this.core.apis.UserApi.getUinByUidV2(notify.user1.uid)),
-                            'add',
-                            notify.postscript,
-                            flag
-                        );
-                        this.networkManager
-                            .emitEvent(groupInviteEvent)
-                            .catch((e) =>
-                                this.context.logger.logError.bind(this.context.logger)('处理邀请本人加群失败', e)
-                            );
-                    }
                 }
             }
         };
@@ -545,13 +549,15 @@ export class NapCatOneBot11Adapter {
     private async emitMsg(message: RawMessage) {
         const network = Object.values(this.configLoader.configData.network).flat() as Array<AdapterConfigWrap>;
         this.context.logger.logDebug('收到新消息 RawMessage', message);
-        await this.handleMsg(message, network);
-        await this.handleGroupEvent(message);
-        await this.handlePrivateMsgEvent(message);
+        await Promise.allSettled([
+            this.handleMsg(message, network),
+            message.chatType == ChatType.KCHATTYPEGROUP ? this.handleGroupEvent(message) : this.handlePrivateMsgEvent(message)
+        ]);
     }
+
     private async handleMsg(message: RawMessage, network: Array<AdapterConfigWrap>) {
         try {
-            const ob11Msg = await this.apis.MsgApi.parseMessageV2(message);
+            const ob11Msg = await this.apis.MsgApi.parseMessageV2(message, this.configLoader.configData.parseMultMsg);
             if (ob11Msg) {
                 const isSelfMsg = this.isSelfMessage(ob11Msg);
                 this.context.logger.logDebug('转化为 OB11Message', ob11Msg);
@@ -616,9 +622,25 @@ export class NapCatOneBot11Adapter {
 
     private async handleGroupEvent(message: RawMessage) {
         try {
-            const groupEvent = await this.apis.GroupApi.parseGroupEvent(message);
-            if (groupEvent) {
-                this.networkManager.emitEvent(groupEvent);
+            // 群名片修改事件解析 任何都该判断
+            if (message.senderUin && message.senderUin !== '0') {
+                const cardChangedEvent = await this.apis.GroupApi.parseCardChangedEvent(message);
+                cardChangedEvent && await this.networkManager.emitEvent(cardChangedEvent);
+            }
+            if (message.msgType === NTMsgType.KMSGTYPEFILE) {
+                // 文件为单元素消息
+                const elementWrapper = message.elements.find(e => !!e.fileElement);
+                if (elementWrapper?.fileElement) {
+                    const uploadGroupFileEvent = await this.apis.GroupApi.parseGroupUploadFileEvene(message, elementWrapper.fileElement, elementWrapper);
+                    uploadGroupFileEvent && await this.networkManager.emitEvent(uploadGroupFileEvent);
+                }
+            } else if (message.msgType === NTMsgType.KMSGTYPEGRAYTIPS) {
+                // 灰条为单元素消息
+                const grayTipElement = message.elements[0].grayTipElement;
+                if (grayTipElement) {
+                    const event = await this.apis.GroupApi.parseGrayTipElement(message, grayTipElement);
+                    event && await this.networkManager.emitEvent(event);
+                }
             }
         } catch (e) {
             this.context.logger.logError('constructGroupEvent error: ', e);
@@ -627,59 +649,51 @@ export class NapCatOneBot11Adapter {
 
     private async handlePrivateMsgEvent(message: RawMessage) {
         try {
-            const privateEvent = await this.apis.MsgApi.parsePrivateMsgEvent(message);
-            if (privateEvent) {
-                this.networkManager.emitEvent(privateEvent);
+            if (message.msgType === NTMsgType.KMSGTYPEGRAYTIPS) {
+                // 灰条为单元素消息
+                const grayTipElement = message.elements[0].grayTipElement;
+                if (grayTipElement) {
+                    const event = await this.apis.MsgApi.parsePrivateMsgEvent(message, grayTipElement);
+                    event && await this.networkManager.emitEvent(event);
+                }
             }
         } catch (e) {
             this.context.logger.logError('constructPrivateEvent error: ', e);
         }
     }
-    private async emitRecallMsg(msgList: RawMessage[], cache: LRUCache<string, boolean>) {
-        for (const message of msgList) {
-            // log("message update", message.sendStatus, message.msgId, message.msgSeq)
-            const peer: Peer = { chatType: message.chatType, peerUid: message.peerUid, guildId: '' };
-            if (message.recallTime != '0' && !cache.get(message.msgId)) {
-                //TODO: 这个判断方法不太好，应该使用灰色消息元素来判断?
-                cache.put(message.msgId, true);
-                // 撤回消息上报
-                let oriMessageId = MessageUnique.getShortIdByMsgId(message.msgId);
-                if (!oriMessageId) {
-                    oriMessageId = MessageUnique.createUniqueMsgId(peer, message.msgId);
-                }
-                if (message.chatType == ChatType.KCHATTYPEC2C) {
-                    const friendRecallEvent = new OB11FriendRecallNoticeEvent(
-                        this.core,
-                        +message.senderUin,
-                        oriMessageId
-                    );
-                    this.networkManager
-                        .emitEvent(friendRecallEvent)
-                        .catch((e) =>
-                            this.context.logger.logError.bind(this.context.logger)('处理好友消息撤回失败', e)
-                        );
-                } else if (message.chatType == ChatType.KCHATTYPEGROUP) {
-                    let operatorId = message.senderUin;
-                    for (const element of message.elements) {
-                        const operatorUid = element.grayTipElement?.revokeElement.operatorUid;
-                        if (!operatorUid) return;
-                        const operator = await this.core.apis.GroupApi.getGroupMember(message.peerUin, operatorUid);
-                        operatorId = operator?.uin ?? message.senderUin;
-                    }
-                    const groupRecallEvent = new OB11GroupRecallNoticeEvent(
-                        this.core,
-                        +message.peerUin,
-                        +message.senderUin,
-                        +operatorId,
-                        oriMessageId
-                    );
-                    this.networkManager
-                        .emitEvent(groupRecallEvent)
-                        .catch((e) => this.context.logger.logError.bind(this.context.logger)('处理群消息撤回失败', e));
-                }
-            }
+
+    private async emitRecallMsg(message: RawMessage, element: MessageElement) {
+        const peer: Peer = { chatType: message.chatType, peerUid: message.peerUid, guildId: '' };
+        const oriMessageId = MessageUnique.getShortIdByMsgId(message.msgId) ?? MessageUnique.createUniqueMsgId(peer, message.msgId);
+        if (message.chatType == ChatType.KCHATTYPEC2C) {
+            return await this.emitFriendRecallMsg(message, oriMessageId, element);
+        } else if (message.chatType == ChatType.KCHATTYPEGROUP) {
+            return await this.emitGroupRecallMsg(message, oriMessageId, element);
         }
+
     }
+
+    private async emitFriendRecallMsg(message: RawMessage, oriMessageId: number, element: MessageElement) {
+        return new OB11FriendRecallNoticeEvent(
+            this.core,
+            +message.senderUin,
+            oriMessageId
+        );
+    }
+
+    private async emitGroupRecallMsg(message: RawMessage, oriMessageId: number, element: MessageElement) {
+        const operatorUid = element.grayTipElement?.revokeElement.operatorUid;
+        if (!operatorUid) return undefined;
+        const operatorId = message.senderUin ?? await this.core.apis.UserApi.getUinByUidV2(operatorUid);
+        return new OB11GroupRecallNoticeEvent(
+            this.core,
+            +message.peerUin,
+            +message.senderUin,
+            +operatorId,
+            oriMessageId
+        );
+    }
+
 }
 
 export * from './types';

src/onebot/network/active-http.ts

@@ -5,8 +5,8 @@ import { QuickAction, QuickActionEvent } from '@/onebot/types';
 import { NapCatCore } from '@/core';
 import { NapCatOneBot11Adapter } from '..';
 import { RequestUtil } from '@/common/request';
-import { HttpClientConfig } from '../config/config';
-import { ActionMap } from '../action';
+import { HttpClientConfig } from '@/onebot/config/config';
+import { ActionMap } from '@/onebot/action';
 
 export class OB11ActiveHttpAdapter implements IOB11NetworkAdapter {
     logger: LogWrapper;

src/onebot/network/active-websocket.ts

@@ -1,13 +1,13 @@
 import { IOB11NetworkAdapter, OB11EmitEventContent, OB11NetworkReloadType } from '@/onebot/network/index';
 import { WebSocket } from 'ws';
-import { OB11HeartbeatEvent } from '../event/meta/OB11HeartbeatEvent';
+import { OB11HeartbeatEvent } from '@/onebot/event/meta/OB11HeartbeatEvent';
 import { NapCatCore } from '@/core';
 import { ActionName } from '@/onebot/action/router';
 import { OB11Response } from '@/onebot/action/OneBotAction';
 import { LogWrapper } from '@/common/log';
 import { ActionMap } from '@/onebot/action';
-import { LifeCycleSubType, OB11LifeCycleEvent } from '../event/meta/OB11LifeCycleEvent';
-import { WebsocketClientConfig } from '../config/config';
+import { LifeCycleSubType, OB11LifeCycleEvent } from '@/onebot/event/meta/OB11LifeCycleEvent';
+import { WebsocketClientConfig } from '@/onebot/config/config';
 
 export class OB11ActiveWebSocketAdapter implements IOB11NetworkAdapter {
     isEnable: boolean = false;

src/onebot/network/index.ts

@@ -1,7 +1,7 @@
 import { OneBotEvent } from '@/onebot/event/OneBotEvent';
 import { OB11Message } from '@/onebot';
 import { ActionMap } from '@/onebot/action';
-import { NetworkConfigAdapter } from '../config/config';
+import { NetworkConfigAdapter } from '@/onebot/config/config';
 
 export type OB11EmitEventContent = OneBotEvent | OB11Message;
 export enum OB11NetworkReloadType {
@@ -37,6 +37,10 @@ export class OB11NetworkManager {
         return Promise.all(Array.from(this.adapters.values()).map(adapter => adapter.onEvent(event)));
     }
 
+    async emitEvents(events: OB11EmitEventContent[]) {
+        return Promise.all(events.map(event => this.emitEvent(event)));
+    }
+
     async emitEventByName(names: string[], event: OB11EmitEventContent) {
         return Promise.all(names.map(name => {
             const adapter = this.adapters.get(name);
@@ -68,6 +72,14 @@ export class OB11NetworkManager {
             await adapter.close();
         }
     }
+    async closeSomeAdaterWhenOpen(adaptersToClose: IOB11NetworkAdapter[]) {
+        for (const adapter of adaptersToClose) {
+            this.adapters.delete(adapter.name);
+            if (adapter.isEnable) {
+                await adapter.close();
+            }
+        }
+    }
 
     findSomeAdapter(name: string) {
         return this.adapters.get(name);

src/onebot/network/passive-http.ts

@@ -5,7 +5,7 @@ import { NapCatCore } from '@/core';
 import { OB11Response } from '@/onebot/action/OneBotAction';
 import { ActionMap } from '@/onebot/action';
 import cors from 'cors';
-import { HttpServerConfig } from '../config/config';
+import { HttpServerConfig } from '@/onebot/config/config';
 
 export class OB11PassiveHttpAdapter implements IOB11NetworkAdapter {
     private app: Express | undefined;
@@ -102,7 +102,7 @@ export class OB11PassiveHttpAdapter implements IOB11NetworkAdapter {
         if (req.path === '' || req.path === '/') {
             const hello = OB11Response.ok({});
             hello.message = 'NapCat4 Ss Running';
-            return res.json(hello)
+            return res.json(hello);
         }
         const actionName = req.path.split('/')[1];
         const action = this.actions.get(actionName);

src/onebot/network/passive-websocket.ts

@@ -3,14 +3,14 @@ import urlParse from 'url';
 import { WebSocket, WebSocketServer } from 'ws';
 import { Mutex } from 'async-mutex';
 import { OB11Response } from '@/onebot/action/OneBotAction';
-import { ActionName } from '../action/router';
+import { ActionName } from '@/onebot/action/router';
 import { NapCatCore } from '@/core';
 import { LogWrapper } from '@/common/log';
-import { OB11HeartbeatEvent } from '../event/meta/OB11HeartbeatEvent';
+import { OB11HeartbeatEvent } from '@/onebot/event/meta/OB11HeartbeatEvent';
 import { IncomingMessage } from 'http';
 import { ActionMap } from '@/onebot/action';
-import { LifeCycleSubType, OB11LifeCycleEvent } from '../event/meta/OB11LifeCycleEvent';
-import { WebsocketServerConfig } from '../config/config';
+import { LifeCycleSubType, OB11LifeCycleEvent } from '@/onebot/event/meta/OB11LifeCycleEvent';
+import { WebsocketServerConfig } from '@/onebot/config/config';
 
 export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {
     wsServer: WebSocketServer;
@@ -31,13 +31,9 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {
     ) {
         this.config = structuredClone(config);
         this.logger = core.context.logger;
-        if (this.config.host === '0.0.0.0') {
-            //兼容配置同时处理0.0.0.0逻辑
-            this.config.host = '';
-        }
         this.wsServer = new WebSocketServer({
             port: this.config.port,
-            host: this.config.host,
+            host: this.config.host === '0.0.0.0' ? '' : this.config.host,
             maxPayload: 1024 * 1024 * 1024,
         });
         this.wsServer.on('connection', async (wsClient, wsReq) => {

src/onebot/types/message.ts

@@ -236,7 +236,7 @@ export interface OB11MessageForward {
     type: OB11MessageDataType.forward;
     data: {
         id: string;
-        content: OB11Message[];
+        content?: OB11Message[];
     };
 }
 

src/onebot/types/quick.ts

@@ -1,6 +1,6 @@
-import { OB11BaseMetaEvent } from '../event/meta/OB11BaseMetaEvent';
-import { OB11BaseNoticeEvent } from '../event/notice/OB11BaseNoticeEvent';
-import { OB11Message } from './message';
+import { OB11BaseMetaEvent } from '@/onebot/event/meta/OB11BaseMetaEvent';
+import { OB11BaseNoticeEvent } from '@/onebot/event/notice/OB11BaseNoticeEvent';
+import { OB11Message } from '@/onebot/types/message';
 
 export type QuickActionEvent = OB11Message | OB11BaseMetaEvent | OB11BaseNoticeEvent;
 export type PostEventType = OB11Message | OB11BaseMetaEvent | OB11BaseNoticeEvent;

src/webui/index.ts

@@ -1,11 +1,20 @@
+/**
+ * @file WebUI服务入口文件
+ */
+
 import express from 'express';
-import { ALLRouter } from './src/router';
+
 import { LogWrapper } from '@/common/log';
 import { NapCatPathWrapper } from '@/common/path';
-import { WebUiConfigWrapper } from './src/helper/config';
 import { RequestUtil } from '@/common/request';
-import { isIP } from "node:net";
 
+import { WebUiConfigWrapper } from '@webapi/helper/config';
+import { ALLRouter } from '@webapi/router';
+import { cors } from '@webapi/middleware/cors';
+import { createUrl } from '@webapi/utils/url';
+import { sendSuccess } from '@webapi/utils/response';
+
+// 实例化Express
 const app = express();
 
 /**
@@ -26,49 +35,51 @@ export async function InitWebUi(logger: LogWrapper, pathWrapper: NapCatPathWrapp
         log('[NapCat] [WebUi] Current WebUi is not run.');
         return;
     }
+
+    // ------------注册中间件------------
+    // 使用express的json中间件
     app.use(express.json());
-    // 初始服务
+
+    // CORS中间件
+    // TODO:
+    app.use(cors);
+    // ------------中间件结束------------
+
+    // ------------挂载路由------------
+    // 挂载静态路由（前端），路径为 [/前缀]/webui
+    app.use(config.prefix + '/webui', express.static(pathWrapper.staticPath));
+    // 挂载API接口
+    app.use(config.prefix + '/api', ALLRouter);
+
+    // 初始服务（先放个首页）
     // WebUI只在config.prefix所示路径上提供服务，可配合Nginx挂载到子目录中
     app.all(config.prefix + '/', (_req, res) => {
-        res.json({
-            msg: 'NapCat WebAPI is now running!',
-        });
+        sendSuccess(res, null, 'NapCat WebAPI is now running!');
     });
-    // 配置静态文件服务，提供./static目录下的文件服务，访问路径为/webui
-    app.use(config.prefix + '/webui', express.static(pathWrapper.staticPath));
-    //挂载API接口
-    // 添加CORS支持
-    // TODO:
-    app.use((req, res, next) => {
-        res.header('Access-Control-Allow-Origin', '*');
-        res.header('Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE, OPTIONS');
-        res.header('Access-Control-Allow-Headers', 'Origin, X-Requested-With, Content-Type, Accept, Authorization');
-        next();
-    });
-    app.use(config.prefix + '/api', ALLRouter);
+    // ------------路由挂载结束------------
+
+    // ------------启动服务------------
     app.listen(config.port, config.host, async () => {
-        const normalizeHost = (host: string) => {
-            if (host === '0.0.0.0') return '127.0.0.1';
-            if (isIP(host) === 6) return `[${host}]`;
-            return host;
-        };
-        const createUrl = (host: string, path: string, token: string) => {
-            const url = new URL(`http://${normalizeHost(host)}`);
-            url.port = config.port.toString();
-            url.pathname = `${config.prefix}${path}`;
-            url.searchParams.set('token', token);
-            return url.toString();
-        };
+        // 启动后打印出相关地址
+
+        const port = config.port.toString(),
+            searchParams = { token: config.token },
+            path = `${config.prefix}/webui`;
+
+        // 打印日志（地址、token）
         log(`[NapCat] [WebUi] Current WebUi is running at http://${config.host}:${config.port}${config.prefix}`);
         log(`[NapCat] [WebUi] Login Token is ${config.token}`);
-        log(`[NapCat] [WebUi] WebUi User Panel Url: ${createUrl(config.host, '/webui', config.token)}`);
-        log(`[NapCat] [WebUi] WebUi Local Panel Url: ${createUrl('127.0.0.1', '/webui', config.token)}`);
+        log(`[NapCat] [WebUi] WebUi User Panel Url: ${createUrl(config.host, port, path, searchParams)}`);
+        log(`[NapCat] [WebUi] WebUi Local Panel Url: ${createUrl('127.0.0.1', port, path, searchParams)}`);
+
+        // 获取公网地址
         try {
             const publishUrl = 'https://ip.011102.xyz/';
             const data = await RequestUtil.HttpGetJson<{ IP: { IP: string } }>(publishUrl, 'GET', {}, {}, true, true);
-            log(`[NapCat] [WebUi] WebUi Publish Panel Url: ${createUrl(data.IP.IP, '/webui', config.token)}`);
+            log(`[NapCat] [WebUi] WebUi Publish Panel Url: ${createUrl(data.IP.IP, port, path, searchParams)}`);
         } catch (err) {
             logger.logError(`[NapCat] [WebUi] Get Publish Panel Url Error: ${err}`);
         }
     });
+    // ------------Over！------------
 }

src/webui/src/api/Auth.ts

@@ -1,69 +1,64 @@
 import { RequestHandler } from 'express';
-import { AuthHelper } from '../helper/SignToken';
-import { WebUiDataRuntime } from '../helper/Data';
+
 import { WebUiConfig } from '@/webui';
 
-const isEmpty = (data: any) => data === undefined || data === null || data === '';
+import { AuthHelper } from '@webapi/helper/SignToken';
+import { WebUiDataRuntime } from '@webapi/helper/Data';
+import { sendSuccess, sendError } from '@webapi/utils/response';
+import { isEmpty } from '@webapi/utils/check';
+
+// 登录
 export const LoginHandler: RequestHandler = async (req, res) => {
+    // 获取WebUI配置
     const WebUiConfigData = await WebUiConfig.GetWebUIConfig();
+    // 获取请求体中的token
     const { token } = req.body;
+    // 如果token为空，返回错误信息
     if (isEmpty(token)) {
-        res.json({
-            code: -1,
-            message: 'token is empty',
-        });
-        return;
+        return sendError(res, 'token is empty');
     }
-    if (!await WebUiDataRuntime.checkLoginRate(WebUiConfigData.loginRate)) {
-        res.json({
-            code: -1,
-            message: 'login rate limit',
-        });
-        return;
+    // 检查登录频率
+    if (!(await WebUiDataRuntime.checkLoginRate(WebUiConfigData.loginRate))) {
+        return sendError(res, 'login rate limit');
     }
     //验证config.token是否等于token
     if (WebUiConfigData.token !== token) {
-        res.json({
-            code: -1,
-            message: 'token is invalid',
-        });
-        return;
+        return sendError(res, 'token is invalid');
     }
-    const signCredential = Buffer.from(JSON.stringify(await AuthHelper.signCredential(WebUiConfigData.token))).toString('base64');
-    res.json({
-        code: 0,
-        message: 'success',
-        data: {
-            'Credential': signCredential,
-        },
+    // 签发凭证
+    const signCredential = Buffer.from(JSON.stringify(await AuthHelper.signCredential(WebUiConfigData.token))).toString(
+        'base64'
+    );
+    // 返回成功信息
+    return sendSuccess(res, {
+        Credential: signCredential,
     });
-    return;
 };
-export const LogoutHandler: RequestHandler = (req, res) => {
-    // 这玩意无状态销毁个灯 得想想办法
-    res.json({
-        code: 0,
-        message: 'success',
-    });
-    return;
+
+// 退出登录
+export const LogoutHandler: RequestHandler = (_, res) => {
+    // TODO: 这玩意无状态销毁个灯 得想想办法
+    return sendSuccess(res, null);
 };
+
+// 检查登录状态
 export const checkHandler: RequestHandler = async (req, res) => {
+    // 获取WebUI配置
     const WebUiConfigData = await WebUiConfig.GetWebUIConfig();
+    // 获取请求头中的Authorization
     const authorization = req.headers.authorization;
+    // 检查凭证
     try {
+        // 从Authorization中获取凭证
         const CredentialBase64: string = authorization?.split(' ')[1] as string;
+        // 解析凭证
         const Credential = JSON.parse(Buffer.from(CredentialBase64, 'base64').toString());
+        // 验证凭证是否在一小时内有效
         await AuthHelper.validateCredentialWithinOneHour(WebUiConfigData.token, Credential);
-        res.json({
-            code: 0,
-            message: 'success',
-        });
-        return;
+        // 返回成功信息
+        return sendSuccess(res, null);
     } catch (e) {
-        res.json({
-            code: -1,
-            message: 'failed',
-        });
+        // 返回错误信息
+        return sendError(res, 'Authorization Faild');
     }
-    return;
 };

src/webui/src/api/BaseInfo.ts

@@ -1,15 +1,15 @@
 import { RequestHandler } from 'express';
-import { WebUiDataRuntime } from '../helper/Data';
 
-export const LogFileListHandler: RequestHandler = async (req, res) => {
-    res.send({
-        code: 0,
-        data: {
-            uin: 0,
-            nick: 'NapCat',
-            avatar: 'https://q1.qlogo.cn/g?b=qq&nk=0&s=640',
-            status: 'online',
-            boottime: Date.now()
-        }
-    });
+import { sendSuccess } from '@webapi/utils/response';
+
+// TODO: Implement LogFileListHandler
+export const LogFileListHandler: RequestHandler = async (_, res) => {
+    const fakeData = {
+        uin: 0,
+        nick: 'NapCat',
+        avatar: 'https://q1.qlogo.cn/g?b=qq&nk=0&s=640',
+        status: 'online',
+        boottime: Date.now(),
+    };
+    sendSuccess(res, fakeData);
 };

src/webui/src/api/OB11Config.ts

@@ -1,79 +1,58 @@
 import { RequestHandler } from 'express';
-import { WebUiDataRuntime } from '../helper/Data';
 import { existsSync, readFileSync } from 'node:fs';
-import { OneBotConfig } from '@/onebot/config/config';
 import { resolve } from 'node:path';
-import { webUiPathWrapper } from '@/webui';
 
-const isEmpty = (data: any) => data === undefined || data === null || data === '';
-export const OB11GetConfigHandler: RequestHandler = async (req, res) => {
+import { OneBotConfig } from '@/onebot/config/config';
+
+import { webUiPathWrapper } from '@/webui';
+import { WebUiDataRuntime } from '@webapi/helper/Data';
+import { sendError, sendSuccess } from '@webapi/utils/response';
+import { isEmpty } from '@webapi/utils/check';
+
+// 获取OneBot11配置
+export const OB11GetConfigHandler: RequestHandler = async (_, res) => {
+    // 获取QQ登录状态
     const isLogin = await WebUiDataRuntime.getQQLoginStatus();
+    // 如果未登录，返回错误
     if (!isLogin) {
-        res.send({
-            code: -1,
-            message: 'Not Login',
-        });
-        return;
+        return sendError(res, 'Not Login');
     }
+    // 获取登录的QQ号
     const uin = await WebUiDataRuntime.getQQLoginUin();
+    // 读取配置文件
     const configFilePath = resolve(webUiPathWrapper.configPath, `./onebot11_${uin}.json`);
-    //console.log(configFilePath);
-    let data: OneBotConfig;
+    // 尝试解析配置文件
     try {
-        data = JSON.parse(
+        // 读取配置文件
+        const data = JSON.parse(
             existsSync(configFilePath)
                 ? readFileSync(configFilePath).toString()
                 : readFileSync(resolve(webUiPathWrapper.configPath, './onebot11.json')).toString()
-        );
+        ) as OneBotConfig;
+        // 返回配置文件
+        return sendSuccess(res, data);
     } catch (e) {
-        data = {} as OneBotConfig;
-        res.send({
-            code: -1,
-            message: 'Config Get Error',
-        });
-        return;
+        return sendError(res, 'Config Get Error');
     }
-    res.send({
-        code: 0,
-        message: 'success',
-        data: data,
-    });
-    return;
 };
+
+// 写入OneBot11配置
 export const OB11SetConfigHandler: RequestHandler = async (req, res) => {
+    // 获取QQ登录状态
     const isLogin = await WebUiDataRuntime.getQQLoginStatus();
+    // 如果未登录，返回错误
     if (!isLogin) {
-        res.send({
-            code: -1,
-            message: 'Not Login',
-        });
-        return;
+        return sendError(res, 'Not Login');
     }
+    // 如果配置为空，返回错误
     if (isEmpty(req.body.config)) {
-        res.send({
-            code: -1,
-            message: 'config is empty',
-        });
-        return;
+        return sendError(res, 'config is empty');
     }
-    let SetResult;
+    // 写入配置
     try {
         await WebUiDataRuntime.setOB11Config(JSON.parse(req.body.config));
-        SetResult = true;
+        return sendSuccess(res, null);
     } catch (e) {
-        SetResult = false;
+        return sendError(res, 'Config Set Error');
     }
-    if (SetResult) {
-        res.send({
-            code: 0,
-            message: 'success',
-        });
-    } else {
-        res.send({
-            code: -1,
-            message: 'Config Set Error',
-        });
-    }
-
-    return;
 };

src/webui/src/api/QQLogin.ts

@@ -1,77 +1,64 @@
 import { RequestHandler } from 'express';
-import { WebUiDataRuntime } from '../helper/Data';
 
-const isEmpty = (data: any) => data === undefined || data === null || data === '';
+import { WebUiDataRuntime } from '@webapi/helper/Data';
+import { isEmpty } from '@webapi/utils/check';
+import { sendError, sendSuccess } from '@webapi/utils/response';
+
+// 获取QQ登录二维码
 export const QQGetQRcodeHandler: RequestHandler = async (req, res) => {
+    // 判断是否已经登录
     if (await WebUiDataRuntime.getQQLoginStatus()) {
-        res.send({
-            code: -1,
-            message: 'QQ Is Logined',
-        });
-        return;
+        // 已经登录
+        return sendError(res, 'QQ Is Logined');
     }
+    // 获取二维码
     const qrcodeUrl = await WebUiDataRuntime.getQQLoginQrcodeURL();
+    // 判断二维码是否为空
     if (isEmpty(qrcodeUrl)) {
-        res.send({
-            code: -1,
-            message: 'QRCode Get Error',
-        });
-        return;
+        return sendError(res, 'QRCode Get Error');
     }
-    res.send({
-        code: 0,
-        message: 'success',
-        data: {
-            qrcode: qrcodeUrl,
-        },
-    });
-    return;
+    // 返回二维码URL
+    const data = {
+        qrcode: qrcodeUrl,
+    };
+    return sendSuccess(res, data);
 };
+
+// 获取QQ登录状态
 export const QQCheckLoginStatusHandler: RequestHandler = async (req, res) => {
-    res.send({
-        code: 0,
-        message: 'success',
-        data: {
-            isLogin: await WebUiDataRuntime.getQQLoginStatus(),
-        },
-    });
+    const data = {
+        isLogin: await WebUiDataRuntime.getQQLoginStatus(),
+        qrcodeurl: await WebUiDataRuntime.getQQLoginQrcodeURL(),
+    };
+    return sendSuccess(res, data);
 };
+
+// 快速登录
 export const QQSetQuickLoginHandler: RequestHandler = async (req, res) => {
+    // 获取QQ号
     const { uin } = req.body;
+    // 判断是否已经登录
     const isLogin = await WebUiDataRuntime.getQQLoginStatus();
     if (isLogin) {
-        res.send({
-            code: -1,
-            message: 'QQ Is Logined',
-        });
-        return;
+        return sendError(res, 'QQ Is Logined');
     }
+    // 判断QQ号是否为空
     if (isEmpty(uin)) {
-        res.send({
-            code: -1,
-            message: 'uin is empty',
-        });
-        return;
+        return sendError(res, 'uin is empty');
     }
+
+    // 获取快速登录状态
     const { result, message } = await WebUiDataRuntime.requestQuickLogin(uin);
     if (!result) {
-        res.send({
-            code: -1,
-            message: message,
-        });
-        return;
+        return sendError(res, message);
     }
     //本来应该验证 但是http不宜这么搞 建议前端验证
     //isLogin = await WebUiDataRuntime.getQQLoginStatus();
-    res.send({
-        code: 0,
-        message: 'success',
-    });
+    return sendSuccess(res, null);
 };
-export const QQGetQuickLoginListHandler: RequestHandler = async (req, res) => {
+
+// 获取快速登录列表
+export const QQGetQuickLoginListHandler: RequestHandler = async (_, res) => {
     const quickLoginList = await WebUiDataRuntime.getQQQuickLoginList();
-    res.send({
-        code: 0,
-        data: quickLoginList,
-    });
+    return sendSuccess(res, quickLoginList);
 };

src/webui/src/const/status.ts

@@ -0,0 +1,13 @@
+export enum HttpStatusCode {
+    OK = 200,
+    BadRequest = 400,
+    Unauthorized = 401,
+    Forbidden = 403,
+    NotFound = 404,
+    InternalServerError = 500,
+}
+
+export enum ResponseCode {
+    Success = 0,
+    Error = -1,
+}

src/webui/src/helper/Data.ts

@@ -1,18 +1,5 @@
 import { OneBotConfig } from '@/onebot/config/config';
 
-interface LoginRuntimeType {
-    LoginCurrentTime: number;
-    LoginCurrentRate: number;
-    QQLoginStatus: boolean;
-    QQQRCodeURL: string;
-    QQLoginUin: string;
-    NapCatHelper: {
-        onQuickLoginRequested: (uin: string) => Promise<{ result: boolean; message: string }>;
-        onOB11ConfigChanged: (ob11: OneBotConfig) => Promise<void>;
-        QQLoginList: string[];
-    };
-}
-
 const LoginRuntime: LoginRuntimeType = {
     LoginCurrentTime: Date.now(),
     LoginCurrentRate: 0,

src/webui/src/helper/SignToken.ts

@@ -1,15 +1,5 @@
 import crypto from 'crypto';
 
-interface WebUiCredentialInnerJson {
-    CreatedTime: number;
-    TokenEncoded: string;
-}
-
-interface WebUiCredentialJson {
-    Data: WebUiCredentialInnerJson;
-    Hmac: string;
-}
-
 export class AuthHelper {
     private static readonly secretKey = Math.random().toString(36).slice(2);
 
@@ -24,9 +14,7 @@ export class AuthHelper {
             TokenEncoded: token,
         };
         const jsonString = JSON.stringify(innerJson);
-        const hmac = crypto.createHmac('sha256', AuthHelper.secretKey)
-            .update(jsonString, 'utf8')
-            .digest('hex');
+        const hmac = crypto.createHmac('sha256', AuthHelper.secretKey).update(jsonString, 'utf8').digest('hex');
         return { Data: innerJson, Hmac: hmac };
     }
 
@@ -38,7 +26,8 @@ export class AuthHelper {
     public static async checkCredential(credentialJson: WebUiCredentialJson): Promise<boolean> {
         try {
             const jsonString = JSON.stringify(credentialJson.Data);
-            const calculatedHmac = crypto.createHmac('sha256', AuthHelper.secretKey)
+            const calculatedHmac = crypto
+                .createHmac('sha256', AuthHelper.secretKey)
                 .update(jsonString, 'utf8')
                 .digest('hex');
             return calculatedHmac === credentialJson.Hmac;
@@ -53,7 +42,10 @@ export class AuthHelper {
      * @param credentialJson 已签名的凭证JSON对象。
      * @returns 布尔值，表示凭证是否有效且token匹配。
      */
-    public static async validateCredentialWithinOneHour(token: string, credentialJson: WebUiCredentialJson): Promise<boolean> {
+    public static async validateCredentialWithinOneHour(
+        token: string,
+        credentialJson: WebUiCredentialJson
+    ): Promise<boolean> {
         const isValid = await AuthHelper.checkCredential(credentialJson);
         if (!isValid) {
             return false;

src/webui/src/helper/config.ts

@@ -3,7 +3,6 @@ import { existsSync, readFileSync, writeFileSync } from 'node:fs';
 import * as net from 'node:net';
 import { resolve } from 'node:path';
 
-
 // 限制尝试端口的次数，避免死循环
 const MAX_PORT_TRY = 100;
 
@@ -64,14 +63,6 @@ async function tryUsePort(port: number, host: string, tryCount: number = 0): Pro
     });
 }
 
-export interface WebUiConfigType {
-    host: string;
-    port: number;
-    prefix: string;
-    token: string;
-    loginRate: number;
-}
-
 // 读取当前目录下名为 webui.json 的配置文件，如果不存在则创建初始化配置文件
 export class WebUiConfigWrapper {
     WebUiConfigData: WebUiConfigType | undefined = undefined;
@@ -114,14 +105,18 @@ export class WebUiConfigWrapper {
             // 不希望回写的配置放后面
 
             // 查询主机地址是否可用
-            const [host_err, host] = await tryUseHost(parsedConfig.host).then(data => [null, data]).catch(err => [err, null]);
+            const [host_err, host] = await tryUseHost(parsedConfig.host)
+                .then((data) => [null, data])
+                .catch((err) => [err, null]);
             if (host_err) {
                 console.log('host不可用', host_err);
                 parsedConfig.port = 0; // 设置为0，禁用WebUI
             } else {
                 parsedConfig.host = host;
                 // 修正端口占用情况
-                const [port_err, port] = await tryUsePort(parsedConfig.port, parsedConfig.host).then(data => [null, data]).catch(err => [err, null]);
+                const [port_err, port] = await tryUsePort(parsedConfig.port, parsedConfig.host)
+                    .then((data) => [null, data])
+                    .catch((err) => [err, null]);
                 if (port_err) {
                     console.log('port不可用', port_err);
                     parsedConfig.port = 0; // 设置为0，禁用WebUI
@@ -137,4 +132,3 @@ export class WebUiConfigWrapper {
         return defaultconfig; // 理论上这行代码到不了，到了只能返回默认配置了
     }
 }
-

src/webui/src/middleware/auth.ts

@@ -0,0 +1,46 @@
+import { NextFunction, Request, Response } from 'express';
+
+import { WebUiConfig } from '@/webui';
+
+import { AuthHelper } from '@webapi/helper/SignToken';
+import { sendError } from '@webapi/utils/response';
+
+// 鉴权中间件
+export async function auth(req: Request, res: Response, next: NextFunction) {
+    // 判断当前url是否为/login 如果是跳过鉴权
+    if (req.url == '/auth/login') {
+        return next();
+    }
+
+    // 判断是否有Authorization头
+    if (req.headers?.authorization) {
+        // 切割参数以获取token
+        const authorization = req.headers.authorization.split(' ');
+        // 当Bearer后面没有参数时
+        if (authorization.length < 2) {
+            return sendError(res, 'Unauthorized');
+        }
+        // 获取token
+        const token = authorization[1];
+        // 解析token
+        let Credential: WebUiCredentialJson;
+        try {
+            Credential = JSON.parse(Buffer.from(token, 'base64').toString('utf-8'));
+        } catch (e) {
+            return sendError(res, 'Unauthorized');
+        }
+        // 获取配置
+        const config = await WebUiConfig.GetWebUIConfig();
+        // 验证凭证在1小时内有效且token与原始token相同
+        const credentialJson = await AuthHelper.validateCredentialWithinOneHour(config.token, Credential);
+        if (credentialJson) {
+            // 通过验证
+            return next();
+        }
+        // 验证失败
+        return sendError(res, 'Unauthorized');
+    }
+
+    // 没有Authorization头
+    return sendError(res, 'Unauthorized');
+}

src/webui/src/middleware/cors.ts

@@ -0,0 +1,9 @@
+import type { RequestHandler } from 'express';
+
+// CORS 中间件，跨域用
+export const cors: RequestHandler = (_, res, next) => {
+    res.header('Access-Control-Allow-Origin', '*');
+    res.header('Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE, OPTIONS');
+    res.header('Access-Control-Allow-Headers', 'Origin, X-Requested-With, Content-Type, Accept, Authorization');
+    next();
+};

src/webui/src/router/OB11Config.ts

@@ -1,7 +1,11 @@
 import { Router } from 'express';
-import { OB11GetConfigHandler, OB11SetConfigHandler } from '../api/OB11Config';
+
+import { OB11GetConfigHandler, OB11SetConfigHandler } from '@webapi/api/OB11Config';
 
 const router = Router();
+// router:读取配置
 router.post('/GetConfig', OB11GetConfigHandler);
+// router:写入配置
 router.post('/SetConfig', OB11SetConfigHandler);
+
 export { router as OB11ConfigRouter };

src/webui/src/router/QQLogin.ts

@@ -1,14 +1,20 @@
 import { Router } from 'express';
+
 import {
     QQCheckLoginStatusHandler,
     QQGetQRcodeHandler,
     QQGetQuickLoginListHandler,
     QQSetQuickLoginHandler,
-} from '../api/QQLogin';
+} from '@webapi/api/QQLogin';
 
 const router = Router();
+// router:获取快速登录列表
 router.all('/GetQuickLoginList', QQGetQuickLoginListHandler);
+// router:检查QQ登录状态
 router.post('/CheckLoginStatus', QQCheckLoginStatusHandler);
+// router:获取QQ登录二维码
 router.post('/GetQQLoginQrcode', QQGetQRcodeHandler);
+// router:设置QQ快速登录
 router.post('/SetQuickLogin', QQSetQuickLoginHandler);
+
 export { router as QQLoginRouter };

src/webui/src/router/auth.ts

@@ -1,9 +1,13 @@
 import { Router } from 'express';
-import { checkHandler, LoginHandler, LogoutHandler } from '../api/Auth';
+
+import { checkHandler, LoginHandler, LogoutHandler } from '@webapi/api/Auth';
 
 const router = Router();
-
+// router:登录
 router.post('/login', LoginHandler);
+// router:检查登录状态
 router.post('/check', checkHandler);
+// router:注销
 router.post('/logout', LogoutHandler);
+
 export { router as AuthRouter };

src/webui/src/router/index.ts

@@ -1,67 +1,30 @@
-import { NextFunction, Request, Response, Router } from 'express';
-import { AuthHelper } from '../../src/helper/SignToken';
-import { QQLoginRouter } from './QQLogin';
-import { AuthRouter } from './auth';
-import { OB11ConfigRouter } from './OB11Config';
-import { WebUiConfig } from '@/webui';
+/**
+ * @file 所有路由的入口文件
+ */
+
+import { Router } from 'express';
+
+import { OB11ConfigRouter } from '@webapi/router/OB11Config';
+import { auth } from '@webapi/middleware/auth';
+import { sendSuccess } from '@webapi/utils/response';
+
+import { QQLoginRouter } from '@webapi/router/QQLogin';
+import { AuthRouter } from '@webapi/router/auth';
 
 const router = Router();
 
-export async function AuthApi(req: Request, res: Response, next: NextFunction) {
-    //判断当前url是否为/login 如果是跳过鉴权
-    if (req.url == '/auth/login') {
-        next();
-        return;
-    }
-    if (req.headers?.authorization) {
-        const authorization = req.headers.authorization.split(' ');
-        if (authorization.length < 2) {
-            res.json({
-                code: -1,
-                msg: 'Unauthorized',
-            });
-            return;
-        }
-        const token = authorization[1];
-        let Credential: any;
-        try {
-            Credential = JSON.parse(Buffer.from(token, 'base64').toString('utf-8'));
-        } catch (e) {
-            res.json({
-                code: -1,
-                msg: 'Unauthorized',
-            });
-            return;
-        }
-        const config = await WebUiConfig.GetWebUIConfig();
-        const credentialJson = await AuthHelper.validateCredentialWithinOneHour(config.token, Credential);
-        if (credentialJson) {
-            //通过验证
-            next();
-            return;
-        }
-        res.json({
-            code: -1,
-            msg: 'Unauthorized',
-        });
-        return;
-    }
+// 鉴权中间件
+router.use(auth);
 
-    res.json({
-        code: -1,
-        msg: 'Server Error',
-    });
-    return;
-}
-
-router.use(AuthApi);
-router.all('/test', (req, res) => {
-    res.json({
-        code: 0,
-        msg: 'ok',
-    });
+// router:测试用
+router.all('/test', (_, res) => {
+    return sendSuccess(res);
 });
+// router:WebUI登录相关路由
 router.use('/auth', AuthRouter);
+// router:QQ登录相关路由
 router.use('/QQLogin', QQLoginRouter);
+// router:OB11配置相关路由
 router.use('/OB11Config', OB11ConfigRouter);
+
 export { router as ALLRouter };

src/webui/src/types/config.d.ts

@@ -0,0 +1,7 @@
+interface WebUiConfigType {
+    host: string;
+    port: number;
+    prefix: string;
+    token: string;
+    loginRate: number;
+}

src/webui/src/types/data.d.ts

@@ -0,0 +1,12 @@
+interface LoginRuntimeType {
+    LoginCurrentTime: number;
+    LoginCurrentRate: number;
+    QQLoginStatus: boolean;
+    QQQRCodeURL: string;
+    QQLoginUin: string;
+    NapCatHelper: {
+        onQuickLoginRequested: (uin: string) => Promise<{ result: boolean; message: string }>;
+        onOB11ConfigChanged: (ob11: OneBotConfig) => Promise<void>;
+        QQLoginList: string[];
+    };
+}

src/webui/src/types/server.d.ts

@@ -0,0 +1,7 @@
+interface APIResponse<T> {
+    code: number;
+    message: string;
+    data: T;
+}
+
+type Protocol = 'http' | 'https' | 'ws' | 'wss';

src/webui/src/types/sign_token.d.ts

@@ -0,0 +1,9 @@
+interface WebUiCredentialInnerJson {
+    CreatedTime: number;
+    TokenEncoded: string;
+}
+
+interface WebUiCredentialJson {
+    Data: WebUiCredentialInnerJson;
+    Hmac: string;
+}

src/webui/src/utils/check.ts

@@ -0,0 +1 @@
+export const isEmpty = <T>(data: T) => data === undefined || data === null || data === '';

src/webui/src/utils/response.ts

@@ -0,0 +1,26 @@
+import type { Response } from 'express';
+
+import { ResponseCode, HttpStatusCode } from '@webapi/const/status';
+
+export const sendResponse = <T>(res: Response, data?: T, code: ResponseCode = 0, message = 'success') => {
+    res.status(HttpStatusCode.OK).json({
+        code,
+        message,
+        data,
+    });
+};
+
+export const sendError = (res: Response, message = 'error') => {
+    res.status(HttpStatusCode.OK).json({
+        code: ResponseCode.Error,
+        message,
+    });
+};
+
+export const sendSuccess = <T>(res: Response, data?: T, message = 'success') => {
+    res.status(HttpStatusCode.OK).json({
+        code: ResponseCode.Success,
+        data,
+        message,
+    });
+};

src/webui/src/utils/url.ts

@@ -0,0 +1,47 @@
+/**
+ * @file URL工具
+ */
+
+import { isIP } from 'node:net';
+
+/**
+ * 将 host（主机地址） 转换为标准格式
+ * @param host 主机地址
+ * @returns 标准格式的IP地址
+ * @example normalizeHost('10.0.3.2') => '10.0.3.2'
+ * @example normalizeHost('0.0.0.0') => '127.0.0.1'
+ * @example normalizeHost('2001:4860:4801:51::27') => '[2001:4860:4801:51::27]'
+ */
+export const normalizeHost = (host: string) => {
+    if (host === '0.0.0.0') return '127.0.0.1';
+    if (isIP(host) === 6) return `[${host}]`;
+    return host;
+};
+
+/**
+ * 创建URL
+ * @param host 主机地址
+ * @param port 端口
+ * @param path URL路径
+ * @param search URL参数
+ * @returns 完整URL
+ * @example createUrl('127.0.0.1', '8080', '/api', { token: '123456' }) => 'http://127.0.0.1:8080/api?token=123456'
+ * @example createUrl('baidu.com', '80', void 0, void 0, 'https') => 'https://baidu.com:80/'
+ */
+export const createUrl = (
+    host: string,
+    port: string,
+    path = '/',
+    search?: Record<string, any>,
+    protocol: Protocol = 'http'
+) => {
+    const url = new URL(`${protocol}://${normalizeHost(host)}`);
+    url.port = port;
+    url.pathname = path;
+    if (search) {
+        for (const key in search) {
+            url.searchParams.set(key, search[key]);
+        }
+    }
+    return url.toString();
+};

tsconfig.json

@@ -1,34 +1,37 @@
 {
-  "compilerOptions": {
-    "target": "ES2020",
-    "useDefineForClassFields": true,
-    "module": "ESNext",
-    "lib": [
-      "ES2020",
-      "DOM",
-      "DOM.Iterable"
-    ],
-    "skipLibCheck": true,
-    "moduleResolution": "Node",
-    "experimentalDecorators": true,
-    "allowImportingTsExtensions": false,
-    "allowSyntheticDefaultImports": true,
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "noEmit": true,
-    "jsx": "preserve",
-    "strict": true,
-    "noUnusedLocals": false,
-    "noUnusedParameters": false,
-    "noFallthroughCasesInSwitch": true,
-    "sourceMap": true,
-    "paths": {
-      "@*": [
-        "./src*"
-      ]
-    }
-  },
-  "include": [
-    "src/**/*.ts"
-  ]
+    "compilerOptions": {
+        "target": "ES2020",
+        "useDefineForClassFields": true,
+        "module": "ESNext",
+        "lib": [
+            "ES2020",
+            "DOM",
+            "DOM.Iterable"
+        ],
+        "skipLibCheck": true,
+        "moduleResolution": "Node",
+        "experimentalDecorators": true,
+        "allowImportingTsExtensions": false,
+        "allowSyntheticDefaultImports": true,
+        "resolveJsonModule": true,
+        "isolatedModules": true,
+        "noEmit": true,
+        "jsx": "preserve",
+        "strict": true,
+        "noUnusedLocals": false,
+        "noUnusedParameters": false,
+        "noFallthroughCasesInSwitch": true,
+        "sourceMap": true,
+        "paths": {
+            "@/*": [
+                "./src/*"
+            ],
+            "@webapi/*": [
+                "./src/webui/src/*"
+            ],
+        }
+    },
+    "include": [
+        "src/**/*.ts"
+    ]
 }

vite.config.ts

@@ -50,59 +50,63 @@ const ShellBaseConfigPlugin: PluginOption[] = [
     nodeResolve(),
 ];
 
-const ShellBaseConfig = () => defineConfig({
-    resolve: {
-        conditions: ['node', 'default'],
-        alias: {
-            '@/core': resolve(__dirname, './src/core'),
-            '@': resolve(__dirname, './src'),
-            './lib-cov/fluent-ffmpeg': './lib/fluent-ffmpeg',
-        },
-    },
-    build: {
-        sourcemap: false,
-        target: 'esnext',
-        minify: false,
-        lib: {
-            entry: {
-                'napcat': 'src/shell/napcat.ts',
-                'audio-worker': 'src/common/audio-worker.ts',
+const ShellBaseConfig = () =>
+    defineConfig({
+        resolve: {
+            conditions: ['node', 'default'],
+            alias: {
+                '@/core': resolve(__dirname, './src/core'),
+                '@': resolve(__dirname, './src'),
+                './lib-cov/fluent-ffmpeg': './lib/fluent-ffmpeg',
+                '@webapi': resolve(__dirname, './src/webui/src'),
             },
-            formats: ['es'],
-            fileName: (_, entryName) => `${entryName}.mjs`,
         },
-        rollupOptions: {
-            external: [...nodeModules, ...external],
+        build: {
+            sourcemap: false,
+            target: 'esnext',
+            minify: false,
+            lib: {
+                entry: {
+                    napcat: 'src/shell/napcat.ts',
+                    'audio-worker': 'src/common/audio-worker.ts',
+                },
+                formats: ['es'],
+                fileName: (_, entryName) => `${entryName}.mjs`,
+            },
+            rollupOptions: {
+                external: [...nodeModules, ...external],
+            },
         },
-    },
-});
+    });
 
-const FrameworkBaseConfig = () => defineConfig({
-    resolve: {
-        conditions: ['node', 'default'],
-        alias: {
-            '@/core': resolve(__dirname, './src/core'),
-            '@': resolve(__dirname, './src'),
-            './lib-cov/fluent-ffmpeg': './lib/fluent-ffmpeg',
-        },
-    },
-    build: {
-        sourcemap: false,
-        target: 'esnext',
-        minify: false,
-        lib: {
-            entry: {
-                'napcat': 'src/framework/napcat.ts',
-                'audio-worker': 'src/common/audio-worker.ts',
+const FrameworkBaseConfig = () =>
+    defineConfig({
+        resolve: {
+            conditions: ['node', 'default'],
+            alias: {
+                '@/core': resolve(__dirname, './src/core'),
+                '@': resolve(__dirname, './src'),
+                './lib-cov/fluent-ffmpeg': './lib/fluent-ffmpeg',
+                '@webapi': resolve(__dirname, './src/webui/src'),
             },
-            formats: ['es'],
-            fileName: (_, entryName) => `${entryName}.mjs`,
         },
-        rollupOptions: {
-            external: [...nodeModules, ...external],
+        build: {
+            sourcemap: false,
+            target: 'esnext',
+            minify: false,
+            lib: {
+                entry: {
+                    napcat: 'src/framework/napcat.ts',
+                    'audio-worker': 'src/common/audio-worker.ts',
+                },
+                formats: ['es'],
+                fileName: (_, entryName) => `${entryName}.mjs`,
+            },
+            rollupOptions: {
+                external: [...nodeModules, ...external],
+            },
         },
-    },
-});
+    });
 
 export default defineConfig(({ mode }): UserConfig => {
     if (mode === 'shell') {