fix: code

README.md

@@ -1,6 +1,6 @@
 <div align="center">
   
-![NapCatQQ](https://socialify.git.ci/NapNeko/NapCatQQ/image?font=Jost&logo=https%3A%2F%2Fnapneko.github.io%2Fassets%2Fnewlogo.png&name=1&owner=1&pattern=Diagonal+Stripes&stargazers=1&theme=Auto)
+  ![Logo](https://socialify.git.ci/NapNeko/NapCatQQ/image?font=Jost&logo=https%3A%2F%2Fnapneko.github.io%2Fassets%2Flogo.png&name=1&owner=1&pattern=Diagonal%20Stripes&stargazers=1&theme=Auto)
   
 </div>
 
@@ -30,25 +30,11 @@ NapCatQQ 是现代化的基于 NTQQ 的 Bot 协议端实现
 
 [Cloudflare.Pages](https://napneko.pages.dev/)
 
-[Server.Other](https://docs.napcat.cyou/)
+[Server.Other](https://napcat.cyou/)
 
-[Qbot.News](https://neko.qbot.news)
 
 ## 回家旅途
-[QQ Group#1](https://qm.qq.com/q/I6LU87a0Yq)
+[QQ Group](https://qm.qq.com/q/I6LU87a0Yq)
-
-[QQ Group#2](https://qm.qq.com/q/uqh4I87KoM)
-
-[Telegram](https://t.me/MelodicMoonlight)
-
-> QQ Group#2 准许Bot / Telegram与QQ Group#2 为新建Group
-
-## 性能设计/协议标准
-NapCat 已实现90％+的 OneBot / GoCQ 标准接口，并提供兼容性保留接口，其设计理念遵守 无数据库/异步优先/后台刷新 的性能思想。
-
-由此设计带来一系列好处，在开发中，获取群员列表通常小于50Ms，单条文本消息发送在320Ms以内，在1k+的群聊流畅运行，同时带来一些副作用，上报数据中大量使用Magic生成字段，消息Id无法持久，无法上报撤回消息原始内容。
-
-NapCat 在设计理念下遵守 OneBot 规范大多数要求并且积极改进，任何合理的标准化 Issue 与 Pr 将被接收。
 
 ## 感谢他们
 感谢 [Lagrange](https://github.com/LagrangeDev/Lagrange.Core) 对本项目的大力支持 参考部分代码 已获授权

launcher/qqnt.json

@@ -1,9 +1,9 @@
 {
   "name": "qq-chat",
-  "version": "9.9.17-30899",
+  "version": "9.9.16-29927",
-  "verHash": "ececf273",
+  "verHash": "3e273e30",
-  "linuxVersion": "3.2.15-30899",
+  "linuxVersion": "3.2.13-29927",
-  "linuxVerHash": "63c751e8",
+  "linuxVerHash": "833d113c",
   "type": "module",
   "private": true,
   "description": "QQ",
@@ -18,7 +18,7 @@
     "qd": "externals/devtools/cli/index.js"
   },
   "main": "./loadNapCat.js",
-  "buildVersion": "30899",
+  "buildVersion": "29927",
   "isPureShell": true,
   "isByteCodeShell": true,
   "platform": "win32",

manifest.json

@@ -4,12 +4,16 @@
   "name": "NapCatQQ",
   "slug": "NapCat.Framework",
   "description": "高性能的 OneBot 11 协议实现",
-  "version": "4.2.67",
+  "version": "4.2.12",
   "icon": "./logo.png",
   "authors": [
     {
-      "name": "NapNeko",
+      "name": "MliKiowa",
-      "link": "https://github.com/NapNeko"
+      "link": "https://github.com/MliKiowa"
+    },
+    {
+      "name": "Young",
+      "link": "https://github.com/Wesley-Young"
     }
   ],
   "repository": {

napcat.webui/package.json

@@ -5,14 +5,12 @@
   "type": "module",
   "scripts": {
     "webui:lint": "eslint --fix src/**/*.{js,ts,vue}",
-    "webui:dev": "vite --host",
+    "webui:dev": "vite",
     "webui:build": "vite build",
     "webui:preview": "vite preview"
   },
   "dependencies": {
     "eslint-plugin-prettier": "^5.2.1",
-    "event-source-polyfill": "^1.0.31",
-    "mitt": "^3.0.1",
     "qrcode": "^1.5.4",
     "tdesign-icons-vue-next": "^0.3.3",
     "tdesign-vue-next": "^1.10.3",
@@ -22,7 +20,6 @@
   "devDependencies": {
     "@eslint/eslintrc": "^3.1.0",
     "@eslint/js": "^9.14.0",
-    "@types/event-source-polyfill": "^1.0.5",
     "@types/qrcode": "^1.5.5",
     "@vitejs/plugin-legacy": "^5.4.3",
     "@vitejs/plugin-vue": "^5.1.4",

napcat.webui/src/App.vue

@@ -109,4 +109,4 @@ onUnmounted(() => {
     window.removeEventListener('resize', haddingFbars);
 });
 </script>
-<style></style>
+<style scoped></style>

napcat.webui/src/backend/githubApi.ts

@@ -1,66 +0,0 @@
-export class githubApiManager {
-    public async GetBaseData(): Promise<Response | null> {
-        try {
-            const ConfigResponse = await fetch('https://api.github.com/repos/NapNeko/NapCatQQ', {
-                method: 'GET',
-                headers: {
-                    'Content-Type': 'application/json',
-                },
-            });
-            if (ConfigResponse.status == 200) {
-                return await ConfigResponse.json();
-            }
-        } catch (error) {
-            console.error('Error getting  github data :', error);
-        }
-        return null;
-    }
-    public async GetReleasesData(): Promise<Response | null> {
-        try {
-            const ConfigResponse = await fetch('https://api.github.com/repos/NapNeko/NapCatQQ/releases', {
-                method: 'GET',
-                headers: {
-                    'Content-Type': 'application/json',
-                },
-            });
-            if (ConfigResponse.status == 200) {
-                return await ConfigResponse.json();
-            }
-        } catch (error) {
-            console.error('Error getting releases data:', error);
-        }
-        return null;
-    }
-    public async GetPullsData(): Promise<Response | null> {
-        try {
-            const ConfigResponse = await fetch('https://api.github.com/repos/NapNeko/NapCatQQ/pulls', {
-                method: 'GET',
-                headers: {
-                    'Content-Type': 'application/json',
-                },
-            });
-            if (ConfigResponse.status == 200) {
-                return await ConfigResponse.json();
-            }
-        } catch (error) {
-            console.error('Error getting Pulls data:', error);
-        }
-        return null;
-    }
-    public async GetContributors(): Promise<Response | null> {
-        try {
-            const ConfigResponse = await fetch('https://api.github.com/repos/NapNeko/NapCatQQ/contributors', {
-                method: 'GET',
-                headers: {
-                    'Content-Type': 'application/json',
-                },
-            });
-            if (ConfigResponse.status == 200) {
-                return await ConfigResponse.json();
-            }
-        } catch (error) {
-            console.error('Error getting Pulls data:', error);
-        }
-        return null;
-    }
-}

napcat.webui/src/backend/log.ts

@@ -1,72 +0,0 @@
-import { EventSourcePolyfill } from 'event-source-polyfill';
-type LogListItem = string;
-type LogListData = LogListItem[];
-let eventSourcePoly: EventSourcePolyfill | null = null;
-export class LogManager {
-    private readonly retCredential: string;
-    private readonly apiPrefix: string;
-
-    //调试时http://127.0.0.1:6099/api 打包时 ../api
-    constructor(retCredential: string, apiPrefix: string = '../api') {
-        this.retCredential = retCredential;
-        this.apiPrefix = apiPrefix;
-    }
-    public async GetLogList(): Promise<LogListData> {
-        try {
-            const ConfigResponse = await fetch(`${this.apiPrefix}/Log/GetLogList`, {
-                method: 'GET',
-                headers: {
-                    Authorization: 'Bearer ' + this.retCredential,
-                    'Content-Type': 'application/json',
-                },
-            });
-            if (ConfigResponse.status == 200) {
-                const ConfigResponseJson = await ConfigResponse.json();
-                if (ConfigResponseJson.code == 0) {
-                    return ConfigResponseJson?.data as LogListData;
-                }
-            }
-        } catch (error) {
-            console.error('Error getting LogList:', error);
-        }
-        return [] as LogListData;
-    }
-    public async GetLog(FileName: string): Promise<string> {
-        try {
-            const ConfigResponse = await fetch(`${this.apiPrefix}/Log/GetLog?id=${FileName}`, {
-                method: 'GET',
-                headers: {
-                    Authorization: 'Bearer ' + this.retCredential,
-                    'Content-Type': 'application/json',
-                },
-            });
-            if (ConfigResponse.status == 200) {
-                const ConfigResponseJson = await ConfigResponse.json();
-                if (ConfigResponseJson.code == 0) {
-                    return ConfigResponseJson?.data;
-                }
-            }
-        } catch (error) {
-            console.error('Error getting LogData:', error);
-        }
-        return 'null';
-    }
-    public async getRealTimeLogs(): Promise<EventSourcePolyfill | null> {
-        this.creatEventSource();
-        return eventSourcePoly;
-    }
-    private creatEventSource() {
-        try {
-            eventSourcePoly = new EventSourcePolyfill(`${this.apiPrefix}/Log/GetLogRealTime`, {
-                heartbeatTimeout: 3 * 60 * 1000,
-                headers: {
-                    Authorization: 'Bearer ' + this.retCredential,
-                    Accept: 'text/event-stream',
-                },
-                withCredentials: true,
-            });
-        } catch (error) {
-            console.error('创建SSE连接出错:', error);
-        }
-    }
-}

napcat.webui/src/backend/shell.ts

@@ -1,5 +1,5 @@
 import { OneBotConfig } from '../../../src/onebot/config/config';
-import { ResponseCode } from '../../../src/webui/src/const/status';
+
 export class QQLoginManager {
     private retCredential: string;
     private readonly apiPrefix: string;
@@ -22,8 +22,8 @@ export class QQLoginManager {
             });
             if (ConfigResponse.status == 200) {
                 const ConfigResponseJson = await ConfigResponse.json();
-                if (ConfigResponseJson.code == ResponseCode.Success) {
+                if (ConfigResponseJson.code == 0) {
-                    return ConfigResponseJson.data;
+                    return ConfigResponseJson?.data as OneBotConfig;
                 }
             }
         } catch (error) {

napcat.webui/src/components/Dashboard.vue

@@ -1,28 +1,18 @@
 <template>
     <t-layout class="dashboard-container">
-        <div v-if="!mediaQuery.matches">
+        <div ref="menuRef">
-            <SidebarMenu
+            <SidebarMenu :menu-items="menuItems" class="sidebar-menu" />
-                :menu-items="menuItems"
-                class="sidebar-menu"
-                :menu-width="sidebarWidth"
-            />
         </div>
         <t-layout>
             <router-view />
         </t-layout>
-        <div v-if="mediaQuery.matches" class="bottom-menu">
-            <BottomMenu :menu-items="menuItems" />
-        </div>
     </t-layout>
 </template>
 
 <script setup lang="ts">
-import { onMounted, onUnmounted, ref } from 'vue';
+import { onMounted, ref } from 'vue';
 import SidebarMenu from './webui/Nav.vue';
-import BottomMenu from './webui/NavBottom.vue';
 import emitter from '@/ts/event-bus';
-const mediaQuery = window.matchMedia('(max-width: 768px)');
-const sidebarWidth = ['232px', '64px'];
 interface MenuItem {
     value: string;
     icon: string;
@@ -37,18 +27,13 @@ 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) => {
-    const menuWidth = event ? sidebarWidth[1] : sidebarWidth[0];
+    emitter.emit('sendWidth', menuRef.value?.offsetWidth);
-    emitter.emit('sendWidth', menuWidth);
+    localStorage.setItem('menuWidth', menuRef.value?.offsetWidth?.toString() || '0');
-    localStorage.setItem('menuWidth', menuWidth.toString() || '0');
 });
-
 onMounted(() => {
-    if (mediaQuery.matches){
+    localStorage.setItem('menuWidth', menuRef.value?.offsetWidth?.toString() || '0');
-        localStorage.setItem('menuWidth', '0');
-    }
-});
-onUnmounted(() => {
 });
 </script>
 
@@ -64,12 +49,6 @@ onUnmounted(() => {
     position: relative;
     z-index: 2;
 }
-.bottom-menu {
-    position: fixed;
-    bottom: 0;
-    width: 100%;
-    z-index: 2;
-}
 
 @media (max-width: 768px) {
     .content {
@@ -77,19 +56,3 @@ onUnmounted(() => {
     }
 }
 </style>
-<style>
-@media (max-width: 768px) {
-    .t-head-menu__inner .t-menu:first-child {
-        margin-left: 0;
-    }
-    .t-head-menu__inner{
-        width: 100%;
-    }
-    .t-head-menu .t-menu{
-        justify-content: space-evenly;
-    }
-    .t-menu__content{
-        display: none;
-    }
-}
-</style>

napcat.webui/src/components/QQLogin.vue

@@ -1,20 +1,34 @@
 <template>
-    <t-card class="layout" :bordered="false">
+    <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' }"
+                    <t-button
-                        @click="loginMethod = 'quick'">Quick Login</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' }"
+                    <t-button
-                        @click="loginMethod = 'qrcode'">QR Code</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"
+                <t-select
-                    @change="selectAccount">
+                    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>
@@ -27,7 +41,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted, onBeforeUnmount, nextTick, watch } from 'vue';
+import { ref, onMounted } from 'vue';
 import * as QRCode from 'qrcode';
 import { useRouter } from 'vue-router';
 import { MessagePlugin } from 'tdesign-vue-next';
@@ -41,7 +55,6 @@ 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) {
@@ -75,6 +88,10 @@ const HeartBeat = async (): Promise<void> => {
         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) {
@@ -86,38 +103,19 @@ const HeartBeat = async (): Promise<void> => {
 const InitPages = async (): Promise<void> => {
     quickLoginList.value = await qqLoginManager.getQQQuickLoginList();
     qrcodeUrl = await qqLoginManager.getQQLoginQrcode();
-    await nextTick();
     generateQrCode(qrcodeUrl, qrcodeCanvas.value);
+    heartBeatTimer = window.setInterval(HeartBeat, 3000);
 };
 
 onMounted(() => {
-    InitPages().then().catch((err) => {
+    InitPages();
-        console.error('InitPages Error:', err);
-    });
-    heartBeatTimer = window.setInterval(HeartBeat, 3000);
 });
-
-onBeforeUnmount(() => {
-    if (heartBeatTimer) {
-        clearInterval(heartBeatTimer);
-    }
-
-});
-
-watch(loginMethod, async (newMethod) => {
-    if (newMethod === 'qrcode') {
-        await nextTick();
-        generateQrCode(qrcodeUrl, qrcodeCanvas.value);
-    }
-});
-
 </script>
 
 <style scoped>
 .layout {
     height: 100vh;
 }
-
 .login-container {
     padding: 20px;
     border-radius: 5px;
@@ -184,4 +182,4 @@ watch(loginMethod, async (newMethod) => {
     left: 0;
     right: 0;
 }
-</style>
+</style>

napcat.webui/src/components/WebUiLogin.vue

@@ -1,5 +1,5 @@
 <template>
-    <t-card class="layout" :bordered="false">
+    <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">

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

@@ -1,5 +1,5 @@
 <template>
-    <t-menu theme="light" :width="menuWidth" :collapsed="collapsed" class="sidebar-menu">
+    <t-menu theme="light" default-value="2-1" :collapsed="collapsed" class="sidebar-menu">
         <template #logo>
             <div class="logo">
                 <img class="logo-img" :width="collapsed ? 35 : 'auto'" src="@/assets/logo_webui.png" alt="logo" />
@@ -33,7 +33,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted, watch } from 'vue';
+import { ref, defineProps, onMounted, watch } from 'vue';
 import emitter from '@/ts/event-bus';
 
 type MenuItem = {
@@ -43,11 +43,10 @@ type MenuItem = {
     icon?: string;
     disabled?: boolean;
 };
+
 defineProps<{
     menuItems: MenuItem[];
-    menuWidth: string | number | Array<string | number>;
 }>();
-const mediaQuery = window.matchMedia('(max-width: 800px)');
 const collapsed = ref<boolean>(localStorage.getItem('sidebar-collapsed') === 'true');
 const iconName = ref<string>(collapsed.value ? 'menu-unfold' : 'menu-fold');
 const disBtn = ref<boolean>(false);
@@ -58,10 +57,12 @@ const changeCollapsed = (): void => {
     localStorage.setItem('sidebar-collapsed', collapsed.value.toString());
 };
 watch(collapsed, (newValue, oldValue) => {
-    emitter.emit('sendMenu', collapsed.value);
+    setTimeout(() => {
+        emitter.emit('sendMenu', collapsed.value);
+    }, 300);
 });
 onMounted(() => {
-    emitter.emit('sendMenu', collapsed.value);
+    const mediaQuery = window.matchMedia('(max-width: 800px)');
     const handleMediaChange = (e: MediaQueryListEvent) => {
         disBtn.value = e.matches;
         if (e.matches) {

napcat.webui/src/components/webui/NavBottom.vue

@@ -1,35 +0,0 @@
-<template>
-    <t-head-menu theme="light" class="bottom-menu">
-        <router-link v-for="item in menuItems" :key="item.value" :to="item.route">
-            <t-tooltip :content="item.label" placement="top">
-                <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>
-    </t-head-menu>
-</template>
-<script setup lang="ts">
-type MenuItem = {
-    value: string;
-    label: string;
-    route: string;
-    icon?: string;
-    disabled?: boolean;
-};
-
-defineProps<{
-    menuItems: MenuItem[];
-}>();
-</script>
-<style scoped>
-.bottom-menu {
-    display: flex;
-    justify-content: center;
-    border-top: 0.8px solid #ddd;
-}
-</style>

napcat.webui/src/css/font.css

@@ -3,11 +3,4 @@
   src: url('../assets/Sotheby.ttf') format('truetype');
   font-weight: normal;
   font-style: normal;
-}
+}
-@font-face {
-    font-family: 'ProtoNerdFontItalic';
-    src: url('../assets/0xProtoNerdFont-Italic.ttf') format('truetype');
-    font-weight: normal;
-    font-style: normal;
-}
-

napcat.webui/src/main.ts

@@ -40,13 +40,8 @@ import {
     Aside as TAside,
     Popconfirm as Tpopconfirm,
     Empty as TEmpty,
-    Dropdown as TDropdown,
-    Typography as TTypographyText,
-    TreeSelect as TTreeSelect,
-    Loading as TLoading,
-    HeadMenu as THeadMenu
 } from 'tdesign-vue-next';
-import router from './router';
+import { router } from './router';
 import 'tdesign-vue-next/es/style/index.css';
 const app = createApp(App);
 app.use(router);
@@ -89,9 +84,4 @@ app.use(TFooter);
 app.use(TAside);
 app.use(Tpopconfirm);
 app.use(TEmpty);
-app.use(TDropdown);
-app.use(TTypographyText);
-app.use(TTreeSelect);
-app.use(TLoading);
-app.use(THeadMenu);
 app.mount('#app');

napcat.webui/src/pages/AboutUs.vue

@@ -1,101 +1,23 @@
 <template>
     <div class="about-us">
         <div>
-            <t-divider content="面板关于信息" align="left">
+            <t-divider content="面板关于信息" align="left" />
-                <template #content>
+            <t-alert theme="success" message="NapCat.WebUi is running" />
-                    <div style="display: flex; justify-content: center; align-items: center">
+            <t-list class="list">
-                        <info-circle-icon></info-circle-icon>
+                <t-list-item class="list-item">
-                        <div style="margin-left: 5px">面板关于信息</div>
+                    <span class="item-label">开发人员:</span>
-                    </div>
-                </template>
-            </t-divider>
-            <t-alert theme="success" class="header" message="NapCat.WebUi is running" />
-            <t-list>
-                <t-list-item>
-                    <div class="label-box">
-                        <star-filled-icon class="item-icon" size="large" />
-                        <span class="item-label">Star:</span>
-                    </div>
                     <span class="item-content">
-                        <t-link class="link-text"  href="https://github.com/NapNeko/NapCatQQ/stargazers">{{
+                        <t-link href="mailto:nanaeonn@outlook.com">Mlikiowa</t-link>
-                            githubBastData?.stargazers_count
-                        }}</t-link>
                     </span>
                 </t-list-item>
-                <t-list-item>
+                <t-list-item class="list-item">
-                    <tips-filled-icon class="item-icon" size="large" />
+                    <span class="item-label">版本信息:</span>
-                    <span class="item-label">issues:</span>
                     <span class="item-content">
-                        <t-link class="link-text" href="https://github.com/NapNeko/NapCatQQ/issues">{{
+                        <t-tag class="tag-item" theme="success"> WebUi: {{ pkg.version }} </t-tag>
-                            githubBastData?.open_issues_count
+                        <t-tag class="tag-item" theme="success"> NapCat: {{ napCatVersion }} </t-tag>
-                        }}</t-link>
+                        <t-tag class="tag-item" theme="success">
-                    </span>
+                            TDesign: {{ pkg.dependencies['tdesign-vue-next'] }}
-                </t-list-item>
-                <t-list-item>
-                    <git-pull-request-filled-icon class="item-icon" size="large" />
-                    <span class="item-label">Pull Requests:</span>
-                    <span class="item-content">
-                        <t-link class="link-text" href="https://github.com/NapNeko/NapCatQQ/pulls">{{githubPullData?.length
-                        }}</t-link>
-                    </span>
-                </t-list-item>
-                <t-list-item >
-                    <bookmark-add-filled-icon class="item-icon" size="large" />
-                    <span class="item-label">Releases:</span>
-                    <span class="item-content">
-                        <t-link class="link-text" href="https://github.com/NapNeko/NapCatQQ/releases">{{
-                                githubReleasesData&&githubReleasesData[0]?timeDifference(githubReleasesData[0].published_at) + '前更新':''
-                        }}</t-link>
-                    </span>
-                </t-list-item>
-                <t-list-item>
-                    <usergroup-filled-icon class="item-icon" size="large" />
-                    <span class="item-label">Contributors:</span>
-                    <span class="item-content">
-                        <t-link class="link-text" href="https://github.com/NapNeko/NapCatQQ/graphs/contributors">{{githubContributorsData?.length}}</t-link>
-                    </span>
-                </t-list-item>
-                <t-list-item>
-                    <browse-filled-icon class="item-icon" size="large" />
-                    <span class="item-label">Watchers:</span>
-                    <span class="item-content">
-                        <t-link class="link-text" href="https://github.com/NapNeko/NapCatQQ/watchers">{{
-                            githubBastData?.watchers
-                        }}</t-link>
-                    </span>
-                </t-list-item>
-                <t-list-item>
-                    <fork-filled-icon class="item-icon" size="large" />
-                    <span class="item-label">Fork:</span>
-                    <span class="item-content">
-                        <t-link class="link-text" href="https://github.com/NapNeko/NapCatQQ/fork">{{
-                            githubBastData?.forks_count
-                        }}</t-link>
-                    </span>
-                </t-list-item>
-                <t-list-item>
-                    <statue-of-jesus-filled-icon class="item-icon" size="large" />
-                    <span class="item-label">License:</span>
-                    <span class="item-content">
-                        <t-link class="link-text" href="https://github.com/NapNeko/NapCatQQ#License-1-ov-file">{{
-                            githubBastData?.license.key
-                        }}</t-link>
-                    </span>
-                </t-list-item>
-                <t-list-item>
-                    <component-layout-filled-icon class="item-icon" size="large" />
-                    <span class="item-label">Version:</span>
-                    <span class="item-content">
-                        <t-tag class="tag-item pgk-color"> WebUi: {{ pkg.version }} </t-tag>
-                        <t-tag class="tag-item nc-color">
-                            NapCat:
-                            {{ napCatVersion }}
                         </t-tag>
-                         <t-tag v-if="githubReleasesData&&githubReleasesData[0] ?.tag_name" class="tag-item nc-color">
-                            New NapCat:
-                            {{ githubReleasesData[0].tag_name }}
-                        </t-tag>
-                        <t-tag class="tag-item td-color"> TDesign: {{ pkg.dependencies['tdesign-vue-next'] }} </t-tag>
                     </span>
                 </t-list-item>
             </t-list>
@@ -106,51 +28,6 @@
 <script setup lang="ts">
 import pkg from '../../package.json';
 import { napCatVersion } from '../../../src/common/version';
-import {
-    InfoCircleIcon,
-    TipsFilledIcon,
-    StarFilledIcon,
-    GitPullRequestFilledIcon,
-    ForkFilledIcon,
-    StatueOfJesusFilledIcon,
-    BookmarkAddFilledIcon,
-    UsergroupFilledIcon,
-    BrowseFilledIcon,
-    ComponentLayoutFilledIcon,
-} from 'tdesign-icons-vue-next';
-import { githubApiManager } from '@/backend/githubApi';
-import { onMounted, ref } from 'vue';
-const githubApi = new githubApiManager();
-const githubBastData = ref<any>(null);
-const githubReleasesData = ref<any>(null);
-const githubContributorsData = ref<any>(null);
-const githubPullData = ref<any>(null);
-const getBaseData = async () => {
-    githubBastData.value = await githubApi.GetBaseData();
-    githubReleasesData.value = await githubApi.GetReleasesData();
-    githubContributorsData.value = await githubApi.GetContributors();
-    githubPullData.value = await githubApi.GetPullsData();
-};
-const timeDifference = (timestamp: string): string => {
-    const givenTime = new Date(timestamp);
-    const currentTime = new Date();
-    const diffInMilliseconds = currentTime.getTime() - givenTime.getTime();
-
-    const seconds = Math.floor(diffInMilliseconds / 1000);
-    const minutes = Math.floor(seconds / 60);
-    const hours = Math.floor(minutes / 60);
-
-    if (hours > 0) {
-        return `${hours}小时`;
-    } else if (minutes > 0) {
-        return `${minutes}分钟`;
-    } else {
-        return `${seconds}秒`;
-    }
-};
-onMounted(() => {
-    getBaseData();
-});
 </script>
 
 <style scoped>
@@ -158,26 +35,23 @@ onMounted(() => {
     padding: 20px;
     text-align: left;
 }
-.label-box {
+
+.list {
     display: flex;
-    justify-content: center;
+    flex-direction: column;
+}
+
+.list-item {
+    display: flex;
+    justify-content: space-between;
     align-items: center;
 }
-.item-icon {
+
-    padding: 5px;
-    color: #ffffff;
-    border-radius: 3px;
-    background-image: linear-gradient(-225deg, #2cd8d5 0%, #c5c1ff 56%, #ffbac3 100%);
-}
 .item-label {
     flex: 1;
-    margin-left: 8px;
+    font-weight: bold;
-    box-sizing: border-box;
-    height: auto;
-    padding: 0;
-    border: none;
-    font-size: 16px;
 }
+
 .item-content {
     flex: 2;
     display: flex;
@@ -190,37 +64,3 @@ onMounted(() => {
     margin-bottom: 10px;
 }
 </style>
-<style>
-.t-list-item {
-    padding: 5px var(--td-comp-paddingLR-l);
-}
-.item-label {
-    flex: 2;
-    background-image: linear-gradient(to right, #fa709a 0%, #fee140 100%);
-    background-clip: text;
-    -webkit-background-clip: text;
-    -webkit-text-fill-color: transparent;
-}
-.pgk-color {
-    color: white;
-    background-image: linear-gradient(-225deg, #9be15d 0%, #00e3ae 100%);
-}
-.nc-color {
-    color: white;
-    background-image: linear-gradient(-225deg, #2cd8d5 0%, #c5c1ff 56%, #ffbac3 100%);
-}
-.td-color {
-    color: white;
-    background-image: linear-gradient(225deg, #0acffe 0%, #495aff 100%);
-}
-.header {
-    background-image: linear-gradient(225deg, #dfffcd 0%, #90f9c4 48%, #39f3bb 100%) !important;
-}
-.link-text{
-    background-clip: text;
-    -webkit-background-clip: text;
-    -webkit-text-fill-color: transparent;
-    background-image: linear-gradient(-225deg, #B6CEE8 0%, #F578DC 100%);
-    font-weight: bold;
-}
-</style>

napcat.webui/src/pages/Log.vue

@@ -1,600 +1,6 @@
 <template>
-    <div class="title">
+    <div class="log-view">
-        <t-divider content="日志查看" align="left">
+        <h1>面板日志信息</h1>
-            <template #content>
+        <p>这里显示面板的日志信息。</p>
-                <div style="display: flex; justify-content: center; align-items: center">
-                    <system-log-icon></system-log-icon>
-                    <div style="margin-left: 5px">日志查看</div>
-                </div>
-            </template>
-        </t-divider>
     </div>
-    <div class="tab-box">
-        <t-tabs default-value="realtime" @change="selectType">
-            <t-tab-panel value="realtime" label="实时日志"></t-tab-panel>
-            <t-tab-panel value="history" label="历史日志"></t-tab-panel>
-        </t-tabs>
-    </div>
-    <div class="card-box">
-        <t-card class="card" :bordered="true">
-            <template #actions>
-                <t-row :align="'middle'" justify="center" :style="{ gap: smallScreen.matches ? '5px' : '24px' }">
-                    <t-col flex="auto" style="display: inline-flex; justify-content: center">
-                        <t-tooltip content="清理日志">
-                            <t-button variant="text" shape="square" @click="clearLogs">
-                                <clear-icon></clear-icon>
-                            </t-button>
-                        </t-tooltip>
-                    </t-col>
-                    <t-col flex="auto" style="display: inline-flex; justify-content: center">
-                        <t-tooltip content="下载日志">
-                            <t-button variant="text" shape="square" @click="downloadText">
-                                <download-icon></download-icon>
-                            </t-button>
-                        </t-tooltip>
-                    </t-col>
-                    <t-col
-                        v-if="LogDataType === 'history'"
-                        flex="auto"
-                        style="display: inline-flex; justify-content: center">
-                        <t-tooltip content="历史日志">
-                            <t-button variant="text" shape="square" @click="historyLog">
-                                <history-icon></history-icon>
-                            </t-button>
-                        </t-tooltip>
-                    </t-col>
-                    <t-col flex="auto" style="display: inline-flex; justify-content: center">
-                        <div class="tag-box">
-                            <t-tag class="t-tag" :style="{ backgroundImage: typeKey[optValue.description] }">{{
-                                optValue.content }}</t-tag>
-                        </div>
-                        <t-dropdown :options="options" :min-column-width="112" @click="openTypeList">
-                            <t-button variant="text" shape="square">
-                                <more-icon />
-                            </t-button>
-                        </t-dropdown>
-                    </t-col>
-                </t-row>
-            </template>
-            <template #content>
-                <div class="content" ref="contentBox">
-                    <div v-for="item in LogDataType === 'realtime'
-                        ? realtimeLogHtmlList.get(optValue.description)
-                        : historyLogHtmlList.get(optValue.description)">
-                        <span>{{ item.time }}</span><span :id="item.type">{{ item.content }}</span>
-                    </div>
-                </div>
-            </template>
-        </t-card>
-    </div>
-    <t-dialog v-model:visible="visibleBody" header="历史日志" :destroy-on-close="true" :show-in-attached-element="true"
-        :on-confirm="GetLogList" class=".t-dialog__ctx .t-dialog__position">
-        <t-select v-model="value" :options="logFileData" placeholder="请选择日志" :multiple="true"
-            style="text-align: left" />
-    </t-dialog>
 </template>
-<script setup lang="ts">
-import { MoreIcon, ClearIcon, DownloadIcon, HistoryIcon, SystemLogIcon } from 'tdesign-icons-vue-next';
-import { nextTick, onMounted, onUnmounted, Ref, ref, watch } from 'vue';
-import { LogManager } from '@/backend/log';
-import { MessagePlugin } from 'tdesign-vue-next';
-import { EventSourcePolyfill } from 'event-source-polyfill';
-const smallScreen = window.matchMedia('(max-width: 768px)');
-const LogDataType = ref<string>('realtime');
-const visibleBody = ref<boolean>(false);
-const contentBox = ref<HTMLElement | null>(null);
-let isMouseEntered = false;
-const logManager = new LogManager(localStorage.getItem('auth') || '');
-const eventSource = ref<EventSourcePolyfill | null>(null);
-const intervalId = ref<number | null>(null);
-const isPaused = ref(false);
-interface OptionItem {
-    content: string;
-    value: number;
-    description: string;
-}
-const options = ref<OptionItem[]>([
-    {
-        content: '全部',
-        value: 1,
-        description: 'all',
-    },
-    {
-        content: '调试',
-        value: 2,
-        description: 'debug',
-    },
-    {
-        content: '提示',
-        value: 3,
-        description: 'info',
-    },
-    {
-        content: '警告',
-        value: 4,
-        description: 'warn',
-    },
-    {
-        content: '错误',
-        value: 5,
-        description: 'error',
-    },
-    {
-        content: '致命',
-        value: 5,
-        description: 'fatal',
-    },
-]);
-const typeKey = ref<Record<string, string>>({
-    all: 'linear-gradient(60deg,#16a085 0%, #f4d03f 100%)',
-    debug: 'linear-gradient(-225deg, #5271c4 0%, #b19fff 48%, #eca1fe 100%)',
-    info: 'linear-gradient(-225deg, #22e1ff 0%, #1d8fe1 48%, #625eb1 100%)',
-    warn: 'linear-gradient(to right, #e14fad 0%, #f9d423 48%, #e37318 100%)',
-    error: 'linear-gradient(to left, #ffe29f 0%, #ffa99f 48%, #d94541 100%)',
-    fatal: 'linear-gradient(-225deg, #fd0700, #ec567f)',
-});
-interface logHtml {
-    type?: string;
-    content: string;
-    color?: string;
-    time?: string;
-}
-type LogHtmlMap = Map<string, logHtml[]>;
-const realtimeLogHtmlList = ref<LogHtmlMap>(
-    new Map([
-        ['all', []],
-        ['debug', []],
-        ['info', []],
-        ['warn', []],
-        ['error', []],
-        ['fatal', []],
-    ])
-);
-const historyLogHtmlList = ref<LogHtmlMap>(
-    new Map([
-        ['all', []],
-        ['debug', []],
-        ['info', []],
-        ['warn', []],
-        ['error', []],
-        ['fatal', []],
-    ])
-);
-const logFileData = ref<{ label: string; value: string }[]>([]);
-const value = ref([]);
-const optValue = ref<OptionItem>({
-    content: '全部',
-    value: 1,
-    description: 'all',
-});
-const openTypeList = (data: OptionItem) => {
-    optValue.value = data;
-};
-const logType = ['debug', 'info', 'warn', 'error', 'fatal'];
-//清理log
-const clearLogs = () => {
-    if (LogDataType.value === 'realtime') {
-        clearAllLogs(realtimeLogHtmlList);
-    } else {
-        clearAllLogs(historyLogHtmlList);
-    }
-};
-const clearAllLogs = (logList: Ref<Map<string, Array<logHtml>>>) => {
-    if ((optValue.value && optValue.value.description === 'all') || !optValue.value) {
-        logList.value = new Map([
-            ['all', []],
-            ['debug', []],
-            ['info', []],
-            ['warn', []],
-            ['error', []],
-            ['fatal', []],
-        ]);
-    } else {
-        logList.value.set(optValue.value.description, []);
-    }
-};
-//定时清理log
-
-const TimerClear = () => {
-    clearAllLogs(realtimeLogHtmlList);
-};
-const startTimer = () => {
-    if (!isPaused.value) {
-        intervalId.value = window.setInterval(TimerClear, 0.5 * 60 * 1000);
-    }
-};
-const pauseTimer = () => {
-    if (intervalId.value) {
-        window.clearInterval(intervalId.value);
-        isPaused.value = true;
-    }
-};
-const resumeTimer = () => {
-    if (isPaused.value) {
-        startTimer();
-        isPaused.value = false;
-    }
-};
-const stopTimer = () => {
-    if (intervalId.value) {
-        window.clearInterval(intervalId.value);
-        intervalId.value = null;
-    }
-};
-const extractContent = (text: string): string | null => {
-    const regex = /\[([^\]]+)]/;
-    const match = regex.exec(text);
-    if (match && match[1]) {
-        const extracted = match[1].toLowerCase();
-        if (logType.includes(extracted)) {
-            return match[1];
-        }
-    }
-    return null;
-};
-const loadData = (text: string, loadType: string) => {
-    const lines = text.split(/\r\n/);
-    lines.forEach((line) => {
-        if (loadType === 'realtime') {
-            let remoteJson = JSON.parse(line) as { message: string, level: string };
-            const type = remoteJson.level;
-            const actualType = type || 'other';
-            const color = actualType && typeKey.value[actualType] ? typeKey.value[actualType] : undefined;
-            const data: logHtml = {
-                type: actualType,
-                content: remoteJson.message,
-                color: color,
-                time: '',
-            };
-            updateLogList(realtimeLogHtmlList, actualType, data);
-        } else if (loadType === 'history') {
-            const type = extractContent(line);
-            const actualType = type || 'other';
-            const timeRegex = /(\d{2}-\d{2} \d{2}:\d{2}:\d{2})|(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})/;
-            const match = timeRegex.exec(line);
-            let time = match ? match[0] : null;
-            const color = actualType && typeKey.value[actualType] ? typeKey.value[actualType] : undefined;
-            const data: logHtml = {
-                type: actualType,
-                content: line.slice(match ? match[0].length : 0) || '',
-                color: color,
-                time: time ? time + ' ' : '',
-            };
-            updateLogList(historyLogHtmlList, actualType, data);
-        }
-    });
-};
-
-const updateLogList = (logList: Ref<Map<string, Array<logHtml>>>, actualType: string, data: logHtml) => {
-    const allLogs = logList.value.get('all');
-    if (Array.isArray(allLogs)) {
-        allLogs.push(data);
-    }
-    if (actualType !== 'other') {
-        const typeLogs = logList.value.get(actualType);
-        if (Array.isArray(typeLogs)) {
-            typeLogs.push(data);
-        }
-    }
-};
-const selectType = (key: string) => {
-    LogDataType.value = key;
-};
-interface CustomURL extends URL {
-    recycleObjectURL: (url: string) => void;
-}
-
-const isCompatibleWithCustomURL = (obj: any): obj is CustomURL => {
-    return typeof obj === 'object' && obj !== null && typeof (obj as any).recycleObjectURL === 'function';
-};
-
-const recycleURL = (url: string) => {
-    if (isCompatibleWithCustomURL(window.URL)) {
-        const customURL = window.URL as CustomURL;
-        customURL.recycleObjectURL(url);
-    }
-};
-const generateTXT = (textContent: string, fileName: string) => {
-    try {
-        const blob = new Blob([textContent], { type: 'text/plain' });
-        const url = URL.createObjectURL(blob);
-        const a = document.createElement('a');
-        a.href = url;
-        a.download = fileName;
-        a.click();
-        recycleURL(url);
-    } catch (error) {
-        console.error('下载文本时出现错误:', error);
-    }
-};
-const downloadText = () => {
-    if (LogDataType.value === 'realtime') {
-        const logs = realtimeLogHtmlList.value.get(optValue.value.description);
-        if (logs && logs.length > 0) {
-            const result = logs.map((obj) => obj.content).join('\r\n');
-            generateTXT(result, '实时日志');
-        } else {
-            MessagePlugin.error('暂无可下载日志');
-        }
-    } else {
-        const logs = historyLogHtmlList.value.get(optValue.value.description);
-        if (logs && logs.length > 0) {
-            const result = logs.map((obj) => obj.content).join('\r\n');
-            generateTXT(result, '历史日志');
-        } else {
-            MessagePlugin.error('暂无可下载日志');
-        }
-    }
-};
-const historyLog = async () => {
-    value.value = [];
-    visibleBody.value = true;
-    const res = await logManager.GetLogList();
-    clearAllLogs(historyLogHtmlList);
-    if (res.length > 0) {
-        logFileData.value = res.map((ele: string) => {
-            return { label: ele, value: ele };
-        });
-    } else {
-        logFileData.value = [];
-    }
-};
-const GetLogList = async () => {
-    if (value.value.length > 0) {
-        for (const ele of value.value) {
-            try {
-                const data = await logManager.GetLog(ele);
-                if (data && data !== 'null') {
-                    loadData(data, 'history');
-                }
-            } catch (error) {
-                console.error(`获取日志 ${ele} 时出现错误:`, error);
-            }
-        }
-        visibleBody.value = false;
-    } else {
-        MessagePlugin.error('请选择日志');
-    }
-};
-
-const fetchRealTimeLogs = async () => {
-    eventSource.value = await logManager.getRealTimeLogs();
-    if (eventSource.value) {
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        //@ts-expect-error
-        eventSource.value.onmessage = (event: MessageEvent) => {
-            console.log(event.data)
-            loadData(event.data, 'realtime');
-        };
-    }
-};
-const closeRealTimeLogs = async () => {
-    if (eventSource.value) {
-        eventSource.value.close();
-    }
-};
-const scrollToBottom = () => {
-    if (!isMouseEntered) {
-        nextTick(() => {
-            if (contentBox.value) {
-                contentBox.value.scrollTop = contentBox.value.scrollHeight;
-            }
-        });
-    }
-};
-
-const observeDOMChanges = () => {
-    if (contentBox.value) {
-        const observer = new MutationObserver(() => {
-            scrollToBottom();
-        });
-        observer.observe(contentBox.value, {
-            childList: true,
-            subtree: true,
-        });
-    }
-};
-const showScrollbar = () => {
-    if (contentBox.value) {
-        contentBox.value.style.overflow = 'auto';
-    }
-};
-const hideScrollbar = () => {
-    if (contentBox.value) {
-        contentBox.value.style.overflow = 'hidden';
-        if (!isMouseEntered) {
-            scrollToBottom();
-        }
-    }
-};
-
-watch(
-    realtimeLogHtmlList,
-    () => {
-        if (!isMouseEntered) {
-            scrollToBottom();
-        }
-    },
-    { immediate: true }
-);
-watch(
-    historyLogHtmlList,
-    () => {
-        if (!isMouseEntered) {
-            scrollToBottom();
-        }
-    },
-    { immediate: true }
-);
-
-onMounted(() => {
-    fetchRealTimeLogs();
-    startTimer();
-    contentBox.value = document.querySelector('.content');
-    if (contentBox.value) {
-        contentBox.value.style.overflow = 'hidden';
-        contentBox.value.addEventListener('mouseenter', () => {
-            isMouseEntered = true;
-            showScrollbar();
-            pauseTimer();
-        });
-        contentBox.value.addEventListener('mouseleave', () => {
-            isMouseEntered = false;
-            hideScrollbar();
-            resumeTimer();
-            setTimeout(() => {
-                scrollToBottom();
-            }, 1000);
-        });
-        observeDOMChanges();
-    }
-});
-onUnmounted(() => {
-    closeRealTimeLogs();
-    stopTimer();
-});
-</script>
-<style scoped>
-.title {
-    padding: 20px 20px 0 20px;
-}
-
-.tab-box {
-    margin: 0 20px;
-}
-
-.card-box {
-    margin: 10px 20px;
-}
-
-.content {
-    height: 56vh;
-    background-image: url('@/assets/logo.png');
-    border: 1px solid #ddd6d6 !important;
-    padding: 5px 10px;
-    text-align: left;
-    overflow-y: auto;
-    margin-top: -10px;
-    font-family: monospace;
-    font-size: 15px;
-    line-height: 16px;
-}
-
-.content span {
-    white-space: pre-wrap;
-    word-break: break-all;
-    overflow-wrap: break-word;
-}
-
-@keyframes fadeInOnce {
-    0% {
-        opacity: 0;
-    }
-
-    100% {
-        opacity: 1;
-    }
-}
-
-@keyframes fadeOutOnce {
-    0% {
-        opacity: 1;
-    }
-
-    100% {
-        opacity: 0;
-    }
-}
-
-.content div {
-    animation: fadeInOnce 0.5s forwards;
-}
-
-::-webkit-scrollbar {
-    width: 5px;
-    background: #f1f1f1;
-}
-
-::-webkit-scrollbar-thumb {
-    background-color: #888888;
-    border-radius: 4px;
-}
-
-.tag-box {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    margin-right: 5px;
-}
-
-.t-tag {
-    min-width: 60px;
-    text-align: center;
-    display: flex;
-    justify-content: center;
-    color: white;
-    font-weight: 500;
-}
-
-#debug {
-    background-clip: text;
-    -webkit-background-clip: text;
-    -webkit-text-fill-color: transparent;
-    background-image: linear-gradient(-225deg, #5271c4 0%, #b19fff 48%, #eca1fe 100%);
-}
-
-#info {
-    background-clip: text;
-    -webkit-background-clip: text;
-    -webkit-text-fill-color: transparent;
-    background-image: linear-gradient(-225deg, #22e1ff 0%, #1d8fe1 48%, #625eb1 100%);
-}
-
-#warn {
-    background-clip: text;
-    -webkit-background-clip: text;
-    -webkit-text-fill-color: transparent;
-    background-image: linear-gradient(225deg, #e14fad 0%, #f9d423 48%, #e37318 100%);
-}
-
-#error {
-    background-clip: text;
-    -webkit-background-clip: text;
-    -webkit-text-fill-color: transparent;
-    background-image: linear-gradient(to left, #ffe29f 0%, #ffa99f 48%, #d94541 100%);
-}
-
-#fatal {
-    background-clip: text;
-    -webkit-background-clip: text;
-    -webkit-text-fill-color: transparent;
-    background-image: linear-gradient(to right, #fd0700, #ec567f);
-}
-
-#other {
-    background-clip: text;
-    -webkit-background-clip: text;
-    -webkit-text-fill-color: transparent;
-    background-image: linear-gradient(to top, #3f51b1 0%, #5a55ae 13%, #7b5fac 25%, #8f6aae 38%, #a86aa4 50%, #cc6b8e 62%, #f18271 75%, #f3a469 87%, #f7c978 100%);
-}
-
-@media (max-width: 786px) {
-    .content {
-        height: 50vh;
-        font-family: ProtoNerdFontItalic, monospace;
-        font-size: 12px;
-        line-height: 14.3px;
-    }
-}
-</style>
-<style>
-.card {
-    padding: 5px 10px 20px 10px !important;
-}
-
-@media (max-width: 786px) {
-    .card {
-        padding: 0 !important;
-    }
-}
-</style>

napcat.webui/src/pages/NetWork.vue

@@ -1,18 +1,10 @@
 <template>
     <div ref="headerBox" class="title">
-        <t-divider content="网络配置" align="left">
+        <t-divider content="网络配置" align="left" />
-            <template #content>
-                <div style="display: flex; justify-content: center; align-items: center">
-                    <wifi1-icon />
-                    <div style="margin-left: 5px">网络配置</div>
-                </div>
-            </template>
-        </t-divider>
         <t-divider align="right">
             <t-button @click="addConfig()">
                 <template #icon><add-icon /></template>
-                添加配置</t-button
+                添加配置</t-button>
-            >
         </t-divider>
     </div>
     <div v-if="loadPage" ref="setting" class="setting">
@@ -24,142 +16,86 @@
             <t-tab-panel value="websocketClients" label="WebSocket 客户端"></t-tab-panel>
         </t-tabs>
     </div>
-    <t-loading attach="#alice" :loading="!loadPage" :showOverlay="false">
-        <div id="alice" v-if="!loadPage" style="height: 80vh;position: relative" ></div>
-    </t-loading>
     <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
+                <t-card :title="item.name" :description="item.type" :style="{ width: cardWidth + 'px' }"
-                    :title="item.name"
+                    :header-bordered="true" class="setting-card">
-                    :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  content="确认删除" @confirm="delConfig(item)">
+                            <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
+                        <t-card class="card-address" :style="{
-                            class="card-address"
+                            borderLeft: '7px solid ' + (item.enable ?
-                            :style="{
+                                'var(--td-success-color)' :
-                                borderLeft:
+                                'var(--td-error-color)')
-                                    '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>
-                            <div class="local-box" v-if="item.host && item.port">
+                                    <strong class="local">{{ item.host }}:{{ item.port }}</strong>
-                                <server-filled-icon class="local-icon" size="20px" @click="toggleProperty(item, 'enable')"></server-filled-icon>
+                                    <copy-icon class="copy-icon"  size="20px" @click="copyText(item.host + ':' + item.port)"></copy-icon>
-                                <strong class="local">{{ item.host }}:{{ item.port }}</strong>
+                                </div>
-                                <copy-icon
+                                <div  class="local-box" v-if="item.url">
-                                    class="copy-icon"
+                                    <server-filled-icon class="local-icon" size="20px"></server-filled-icon>
-                                    size="20px"
+                                    <strong  class="local" >{{ item.url }}</strong>
-                                    @click="copyText(item.host + ':' + item.port)"
+                                    <copy-icon class="copy-icon"  size="20px" @click="copyText(item.url)"></copy-icon>
-                                ></copy-icon>
+                                </div>
-                            </div>
-                            <div class="local-box" v-if="item.url">
-                                <server-filled-icon class="local-icon" size="20px"  @click="toggleProperty(item, 'enable')"></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 :default-value="[0]" expand-mutex style="margin-top:10px;" class="info-coll">
                             <t-collapse-panel header="基础信息">
-                                <t-descriptions
+                                <t-descriptions size="small" :layout="infoOneCol ? 'vertical' : 'horizontal'"
-                                    size="small"
+                                    class="setting-base-info">
-                                    :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">
+                                        <div v-if="mediumScreen.matches||largeScreen.matches" class="token-view">
                                             <span>{{ showToken ? item.token : '******' }}</span>
-                                            <browse-icon
+                                            <browse-icon class="browse-icon" v-if="showToken" size="18px"
-                                                class="browse-icon"
+                                                @click="showToken = false"></browse-icon>
-                                                v-if="showToken"
+                                            <browse-off-icon class="browse-icon" v-else size="18px"
-                                                size="18px"
+                                                @click="showToken = true"></browse-off-icon>
-                                                @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>
+                                                    <div @click="copyText(item.token)">{{item.token}}</div>
                                                 </template>
                                             </t-popup>
                                         </div>
                                     </t-descriptions-item>
-                                    <t-descriptions-item label="消息格式">{{
+                                    <t-descriptions-item label="消息格式">{{ item.messagePostFormat }}</t-descriptions-item>
-                                        item.messagePostFormat
-                                    }}</t-descriptions-item>
                                 </t-descriptions>
                             </t-collapse-panel>
                             <t-collapse-panel header="状态信息">
-                                <t-descriptions
+                                <t-descriptions size="small" :layout="infoOneCol ? 'vertical' : 'horizontal'"
-                                    size="small"
+                                    class="setting-base-info">
-                                    :layout="infoOneCol ? 'vertical' : 'horizontal'"
-                                    class="setting-base-info"
-                                >
                                     <t-descriptions-item v-if="item.hasOwnProperty('debug')" label="调试日志">
-                                        <t-tag
+                                        <t-tag class="tag-item" :theme="item.debug ? 'success' : 'danger'">
-                                            :class="item.debug ? 'tag-item-on' : 'tag-item-off'"
+                                            {{ item.debug ? '开启' : '关闭' }}</t-tag>
-                                            @click="toggleProperty(item, 'debug')"
-                                        >
-                                            {{ item.debug ? '开启' : '关闭' }}</t-tag
-                                        >
                                     </t-descriptions-item>
-                                    <t-descriptions-item
+                                    <t-descriptions-item v-if="item.hasOwnProperty('enableWebsocket')"
-                                        v-if="item.hasOwnProperty('enableWebsocket')"
+                                        label="Websocket 功能">
-                                        label="Websocket 功能"
+                                        <t-tag class="tag-item" :theme="item.enableWebsocket ? 'success' : 'danger'">
-                                    >
+                                            {{ item.enableWebsocket ? '启用' : '禁用' }}</t-tag>
-                                        <t-tag
-                                            :class="item.enableWebsocket ? 'tag-item-on' : 'tag-item-off'"
-                                            @click="toggleProperty(item, 'enableWebsocket')"
-                                        >
-                                            {{ item.enableWebsocket ? '启用' : '禁用' }}</t-tag
-                                        >
                                     </t-descriptions-item>
-                                    <t-descriptions-item
+                                    <t-descriptions-item v-if="item.hasOwnProperty('enableCors')" label="跨域放行">
-                                        v-if="item.hasOwnProperty('enableCors')"
+                                        <t-tag class="tag-item" :theme="item.enableCors ? 'success' : 'danger'">
-                                        label="跨域放行"
+                                            {{ item.enableCors ? '开启' : '关闭' }}</t-tag>
-                                    >
-                                        <t-tag  :class="item.enableCors ? 'tag-item-on' : 'tag-item-off'" @click="toggleProperty(item, 'enableCors')">
-                                            {{ item.enableCors ? '开启' : '关闭' }}</t-tag
-                                        >
                                     </t-descriptions-item>
-                                    <t-descriptions-item
+                                    <t-descriptions-item v-if="item.hasOwnProperty('enableForcePushEvent')"
-                                        v-if="item.hasOwnProperty('enableForcePushEvent')"
+                                        label="上报自身消息">
-                                        label="上报自身消息"
+                                        <t-tag class="tag-item" :theme="item.reportSelfMessage ? 'success' : 'danger'">
-                                    >
+                                            {{ item.reportSelfMessage ? '开启' : '关闭' }}</t-tag>
-                                        <t-tag
-                                            :class="item.reportSelfMessage ? 'tag-item-on' : 'tag-item-off'"
-                                            @click="toggleProperty(item, 'reportSelfMessage')"
-                                        >
-                                            {{ item.reportSelfMessage ? '开启' : '关闭' }}</t-tag
-                                        >
                                     </t-descriptions-item>
-                                    <t-descriptions-item
+                                    <t-descriptions-item v-if="item.hasOwnProperty('enableForcePushEvent')"
-                                        v-if="item.hasOwnProperty('enableForcePushEvent')"
+                                        label="强制推送事件">
-                                        label="强制推送事件"
+                                        <t-tag class="tag-item"
-                                    >
+                                            :theme="item.enableForcePushEvent ? 'success' : 'danger'">
-                                        <t-tag
+                                            {{ item.enableForcePushEvent ? '开启' : '关闭' }}</t-tag>
-                                            class="tag-item"
-                                            :class="item.enableForcePushEvent ? 'tag-item-on' : 'tag-item-off'"
-                                            @click="toggleProperty(item, 'enableForcePushEvent')"
-                                        >
-                                            {{ item.enableForcePushEvent ? '开启' : '关闭' }}</t-tag
-                                        >
                                     </t-descriptions-item>
                                 </t-descriptions>
                             </t-collapse-panel>
@@ -169,34 +105,20 @@
             </div>
             <div style="height: 20vh"></div>
         </div>
-        <t-card v-else>
+        <t-card  v-else>
             <t-empty class="card-none" title="暂无网络配置"> </t-empty>
         </t-card>
     </div>
-    <t-dialog
+    <t-dialog v-model:visible="visibleBody" :header="dialogTitle" :destroy-on-close="true"
-        v-model:visible="visibleBody"
+        :show-in-attached-element="true" placement="center" :on-confirm="saveConfig" class=".t-dialog__ctx .t-dialog--defaul">
-        :header="dialogTitle"
+        <div slot="body" class="dialog-body" >
-        :destroy-on-close="true"
-        :show-in-attached-element="true"
-        :on-confirm="saveConfig"
-        class=".t-dialog__ctx .t-dialog__position"
-    >
-        <div slot="body" class="dialog-body">
             <t-form ref="form" :data="newTab" labelAlign="left" :model="newTab">
-                <t-form-item
+                <t-form-item style="text-align: left" :rules="[{ required: true, message: '请输入名称', trigger: 'blur' }]"
-                    style="text-align: left"
+                    label="名称" name="name">
-                    :rules="[{ required: true, message: '请输入名称', trigger: 'blur' }]"
-                    label="名称"
-                    name="name"
-                >
                     <t-input v-model="newTab.name" />
                 </t-form-item>
-                <t-form-item
+                <t-form-item style="text-align: left" :rules="[{ required: true, message: '请选择类型', trigger: 'change' }]"
-                    style="text-align: left"
+                    label="类型" name="type">
-                    :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>
@@ -205,10 +127,8 @@
                     </t-select>
                 </t-form-item>
                 <div>
-                    <component
+                    <component :is="resolveDynamicComponent(getComponent(newTab.type as ComponentKey))"
-                        :is="resolveDynamicComponent(getComponent(newTab.type as ComponentKey))"
+                        :config="newTab.data" />
-                        :config="newTab.data"
-                    />
                 </div>
             </t-form>
         </div>
@@ -216,17 +136,8 @@
 </template>
 
 <script setup lang="ts">
-import {
+import { AddIcon, DeleteIcon, Edit2Icon, ServerFilledIcon, CopyIcon, BrowseOffIcon, BrowseIcon } from 'tdesign-icons-vue-next';
-    AddIcon,
+import { onMounted, onUnmounted, ref, resolveDynamicComponent } from 'vue';
-    DeleteIcon,
-    Edit2Icon,
-    ServerFilledIcon,
-    CopyIcon,
-    BrowseOffIcon,
-    BrowseIcon,
-    Wifi1Icon,
-} from 'tdesign-icons-vue-next';
-import { onMounted, onUnmounted, ref, resolveDynamicComponent, watch } from 'vue';
 import emitter from '@/ts/event-bus';
 import {
     mergeNetworkDefaultConfig,
@@ -276,7 +187,7 @@ const operateType = ref<string>('');
 //配置项索引
 const configIndex = ref<number>(0);
 //保存时所用数据
-const networkConfig: NetworkConfig & { [key: string]: any } = {
+const networkConfig: NetworkConfig & { [key: string]: any; } = {
     websocketClients: [],
     websocketServers: [],
     httpClients: [],
@@ -324,18 +235,6 @@ const editConfig = (item: any) => {
     configIndex.value = networkConfig[newTab.value.type].findIndex((obj: any) => obj.name === item.name);
     visibleBody.value = true;
 };
-const toggleProperty = async (item: any, tagData: string) => {
-    const type = getKeyByValue(typeCh, item.type);
-    const newData = { ...item };
-    newData[tagData] = !item[tagData];
-    if (type) {
-        newTab.value = { name: item.name, data: newData, type: type };
-    }
-    operateType.value = 'edit';
-    configIndex.value = networkConfig[newTab.value.type].findIndex((obj: any) => obj.name === item.name);
-    await saveConfig();
-};
-
 const delConfig = (item: any) => {
     const type = getKeyByValue(typeCh, item.type);
     if (type) {
@@ -353,6 +252,7 @@ const selectType = (key: ComponentKey) => {
 };
 
 const onloadDefault = (key: ComponentKey) => {
+    console.log(key);
     newTab.value.data = structuredClone(mergeNetworkDefaultConfig[key]);
 };
 //检测重名
@@ -450,21 +350,22 @@ const loadConfig = async () => {
 };
 
 const copyText = async (text: string) => {
-    const textarea = document.createElement('textarea');
+    const input = document.createElement('input');
-    textarea.value = text;
+    input.value = text;
-    document.body.appendChild(textarea);
+    document.body.appendChild(input);
-    textarea.select();
+    input.select();
-    try {
+    await navigator.clipboard.writeText(text);
-        document.execCommand('copy');
+    document.body.removeChild(input);
-        MessagePlugin.success('复制成功');
+    MessagePlugin.success('复制成功');
-    } catch (err) {
-        console.error('复制失败', err);
-    } finally {
-        document.body.removeChild(textarea);
-    }
 };
 
 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;
@@ -474,43 +375,29 @@ const handleResize = () => {
         cardWidth.value = tabsWidth.value;
     }
     loadPage.value = true;
-    setTimeout(()=>{
+    setTimeout(() => {
         cardHeight.value = window.innerHeight - (headerBox.value?.offsetHeight ?? 0) - (setting.value?.offsetHeight ?? 0) - 21;
-    },300)
+    }, 300);
 };
 emitter.on('sendWidth', (width) => {
-    if (typeof width === 'string') {
+    if (typeof width === 'number' && !isNaN(width)) {
-        const strWidth = width as string;
+        menuWidth.value = width;
-        menuWidth.value = parseInt(strWidth);
-    }
-});
-watch(menuWidth, (newValue, oldValue) => {
-    loadPage.value = false;
-    setTimeout(()=>{
         handleResize();
-    },300)
+    }
 });
 onMounted(() => {
     loadConfig();
     const cachedWidth = localStorage.getItem('menuWidth');
     if (cachedWidth) {
         menuWidth.value = parseInt(cachedWidth);
-        setTimeout(()=>{
+        setTimeout(() => {
             handleResize();
-        },300)
+        }, 300);
     }
-    window.addEventListener('resize', ()=>{
+    window.addEventListener('resize', handleResize);
-        setTimeout(()=>{
-            handleResize();
-        },300)
-    });
 });
 onUnmounted(() => {
-    window.removeEventListener('resize', ()=>{
+    window.removeEventListener('resize', handleResize);
-        setTimeout(()=>{
-            handleResize();
-        },300)
-    });
 });
 </script>
 
@@ -550,7 +437,7 @@ onUnmounted(() => {
     display: flex;
     margin-top: 2px;
 }
-.local-icon {
+.local-icon{
     flex: 1;
 }
 .local {
@@ -561,12 +448,14 @@ onUnmounted(() => {
     text-overflow: ellipsis;
 }
 
+
 .copy-icon {
     flex: 1;
     cursor: pointer;
     flex-direction: row;
 }
 
+
 .token-view {
     display: flex;
     align-items: center;
@@ -578,22 +467,11 @@ onUnmounted(() => {
     overflow: hidden;
     text-overflow: ellipsis;
 }
-
+.browse-icon{
-.tag-item-on{
-    color: white;
-    cursor: pointer;
-    background-image: linear-gradient(to top, #0ba360 0%, #3cba92 100%) !important;
-}
-.tag-item-off{
-    color: white;
-    cursor: pointer;
-    background-image: linear-gradient(to top, rgba(255, 8, 68, 0.93) 0%, #D54941 100%) !important;
-}
-.browse-icon {
     flex: 2;
 }
-:global(.t-dialog__ctx .t-dialog__position) {
+:global(.t-dialog__ctx .t-dialog--defaul) {
-    padding: 48px 10px;
+    margin: 0 20px;
 }
 @media (max-width: 1024px) {
     .setting-box {
@@ -605,6 +483,7 @@ onUnmounted(() => {
     .setting-box {
         grid-template-columns: 1fr;
     }
+
 }
 
 .card-box {
@@ -615,8 +494,9 @@ onUnmounted(() => {
     line-height: 400px !important;
 }
 
+
 .dialog-body {
-    max-height: 50vh;
+    max-height: 60vh;
     overflow-y: auto;
 }
 
@@ -635,6 +515,12 @@ onUnmounted(() => {
     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;
@@ -644,7 +530,7 @@ onUnmounted(() => {
     padding: 0 var(--td-comp-paddingLR-l) !important;
 }
 
-.setting-base-info tr > td:last-child {
+.setting-base-info tr>td:last-child {
     text-align: right;
 }
 

napcat.webui/src/pages/OtherConfig.vue

@@ -1,13 +1,6 @@
 <template>
     <div class="title">
-        <t-divider content="其余配置" align="left">
+        <t-divider content="其余配置" align="left" />
-            <template #content>
-                <div style="display: flex; justify-content: center; align-items: center">
-                    <setting-icon />
-                    <div style="margin-left: 5px">其余配置</div>
-                </div>
-            </template>
-        </t-divider>
     </div>
     <t-card class="card">
         <div class="other-config-container">
@@ -36,12 +29,11 @@ import { ref, onMounted } from 'vue';
 import { MessagePlugin } from 'tdesign-vue-next';
 import { OneBotConfig } from '../../../src/onebot/config/config';
 import { QQLoginManager } from '@/backend/shell';
-import { SettingIcon } from 'tdesign-icons-vue-next';
 
 const otherConfig = ref<Partial<OneBotConfig>>({
     musicSignUrl: '',
     enableLocalFile2Url: false,
-    parseMultMsg: true,
+    parseMultMsg: true
 });
 
 const labelAlign = ref<string>();

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

@@ -2,7 +2,7 @@
     <div>
         <t-form labelAlign="left">
             <t-form-item label="启用">
-                <t-switch v-model="config.enable" />
+                <t-checkbox v-model="config.enable" />
             </t-form-item>
             <t-form-item label="URL">
                 <t-input v-model="config.url" />
@@ -11,20 +11,20 @@
                 <t-select v-model="config.messagePostFormat" :options="messageFormatOptions" />
             </t-form-item>
             <t-form-item label="报告自身消息">
-                <t-switch v-model="config.reportSelfMessage" />
+                <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-switch v-model="config.debug" />
+                <t-checkbox v-model="config.debug" />
             </t-form-item>
         </t-form>
     </div>
 </template>
 
 <script setup lang="ts">
-import { ref, watch } from 'vue';
+import { defineProps, ref, watch } from 'vue';
 import { HttpClientConfig } from '../../../../src/onebot/config/config';
 
 const props = defineProps<{

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

@@ -2,7 +2,7 @@
     <div>
         <t-form labelAlign="left">
             <t-form-item label="启用">
-                <t-switch v-model="config.enable" />
+                <t-checkbox v-model="config.enable" />
             </t-form-item>
             <t-form-item label="端口">
                 <t-input v-model.number="config.port" type="number" />
@@ -11,10 +11,10 @@
                 <t-input v-model="config.host" type="text" />
             </t-form-item>
             <t-form-item label="启用 CORS">
-                <t-switch v-model="config.enableCors" />
+                <t-checkbox v-model="config.enableCors" />
             </t-form-item>
             <t-form-item label="启用 WS">
-                <t-switch v-model="config.enableWebsocket" />
+                <t-checkbox v-model="config.enableWebsocket" />
             </t-form-item>
             <t-form-item label="消息格式">
                 <t-select v-model="config.messagePostFormat" :options="messageFormatOptions" />
@@ -23,14 +23,14 @@
                 <t-input v-model="config.token" type="text" />
             </t-form-item>
             <t-form-item label="调试模式">
-                <t-switch v-model="config.debug" />
+                <t-checkbox v-model="config.debug" />
             </t-form-item>
         </t-form>
     </div>
 </template>
 
 <script setup lang="ts">
-import { ref, watch } from 'vue';
+import { defineProps, ref, watch } from 'vue';
 import { HttpServerConfig } from '../../../../src/onebot/config/config';
 
 const props = defineProps<{

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

@@ -2,7 +2,7 @@
     <div>
         <t-form labelAlign="left">
             <t-form-item label="启用">
-                <t-switch v-model="config.enable" />
+                <t-checkbox v-model="config.enable" />
             </t-form-item>
             <t-form-item label="URL">
                 <t-input v-model="config.url" />
@@ -11,13 +11,13 @@
                 <t-select v-model="config.messagePostFormat" :options="messageFormatOptions" />
             </t-form-item>
             <t-form-item label="报告自身消息">
-                <t-switch v-model="config.reportSelfMessage" />
+                <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-switch v-model="config.debug" />
+                <t-checkbox v-model="config.debug" />
             </t-form-item>
             <t-form-item label="心跳间隔">
                 <t-input v-model.number="config.heartInterval" type="number" />
@@ -27,7 +27,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, watch } from 'vue';
+import { defineProps, ref, watch } from 'vue';
 import { WebsocketClientConfig } from '../../../../src/onebot/config/config';
 
 const props = defineProps<{

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

@@ -2,7 +2,7 @@
     <div>
         <t-form labelAlign="left">
             <t-form-item label="启用">
-                <t-switch v-model="config.enable" />
+                <t-checkbox v-model="config.enable" />
             </t-form-item>
             <t-form-item label="主机">
                 <t-input v-model="config.host" />
@@ -14,16 +14,16 @@
                 <t-select v-model="config.messagePostFormat" :options="messageFormatOptions" />
             </t-form-item>
             <t-form-item label="上报自身消息">
-                <t-switch v-model="config.reportSelfMessage" />
+                <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-switch v-model="config.enableForcePushEvent" />
+                <t-checkbox v-model="config.enableForcePushEvent" />
             </t-form-item>
             <t-form-item label="调试模式">
-                <t-switch v-model="config.debug" />
+                <t-checkbox v-model="config.debug" />
             </t-form-item>
             <t-form-item label="心跳间隔">
                 <t-input v-model.number="config.heartInterval" type="number" />
@@ -33,7 +33,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, watch } from 'vue';
+import { defineProps, ref, watch } from 'vue';
 import { WebsocketServerConfig } from '../../../../src/onebot/config/config';
 
 const props = defineProps<{

napcat.webui/src/router/index.ts

@@ -7,8 +7,6 @@ import NetWork from '../pages/NetWork.vue';
 import QQLogin from '../components/QQLogin.vue';
 import WebUiLogin from '../components/WebUiLogin.vue';
 import OtherConfig from '../pages/OtherConfig.vue';
-import { MessagePlugin } from 'tdesign-vue-next';
-import { QQLoginManager } from '@/backend/shell';
 
 const routes: Array<RouteRecordRaw> = [
     { path: '/', redirect: '/webui' },
@@ -28,27 +26,7 @@ const routes: Array<RouteRecordRaw> = [
     },
 ];
 
-const router = createRouter({
+export const router = createRouter({
     history: createWebHashHistory(),
     routes,
 });
-
-router.beforeEach(async (to, from, next) => {
-    const isPublicRoute = ['/webui', '/qqlogin'].includes(to.path);
-    const token = localStorage.getItem('auth');
-
-    if (!isPublicRoute) {
-        if (!token) {
-            MessagePlugin.error('请先登录');
-            return next('/webui');
-        }
-        const login = await new QQLoginManager(token).checkWebUiLogined();
-        if (!login) {
-            MessagePlugin.error('请先登录');
-            return next('/webui');
-        }
-    }
-    next();
-});
-
-export default router;

napcat.webui/tsconfig.json

@@ -3,15 +3,22 @@
         "target": "ESNext",
         "jsx": "preserve",
         "jsxImportSource": "vue",
-        "lib": ["DOM", "DOM.Iterable", "ES2022"],
+        "lib": [
+            "DOM",
+            "DOM.Iterable"
+        ],
         "baseUrl": ".",
         "module": "esnext",
         "moduleResolution": "bundler",
         "paths": {
-            "@/*": ["src/*"]
+            "@/*": [
+                "src/*"
+            ]
         },
         "resolveJsonModule": true,
-        "types": ["vite/client"],
+        "types": [
+            "vite/client"
+        ],
         "strict": true,
         "strictNullChecks": true,
         "noUnusedLocals": true,
@@ -23,5 +30,5 @@
     },
     "include": ["src"],
     "exclude": ["node_modules"],
-    "references": [{ "path": "./tsconfig.node.json" }]
+    "references": [{"path": "./tsconfig.node.json"}]
 }

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.2.67",
+  "version": "4.2.12",
   "scripts": {
     "build:universal": "npm run build:webui && vite build --mode universal || exit 1",
     "build:framework": "npm run build:webui && vite build --mode framework || exit 1",
@@ -13,21 +13,18 @@
     "dev:shell": "vite build --mode shell",
     "dev:webui": "cd napcat.webui && npm run webui:dev",
     "lint": "eslint --fix src/**/*.{js,ts,vue}",
-    "depend": "cd dist && npm install --omit=dev",
+    "depend": "cd dist && npm install --omit=dev"
-    "dev:depend": "npm i && cd napcat.webui && npm i"
   },
   "devDependencies": {
-    "esbuild": "0.24.0",
     "@babel/preset-typescript": "^7.24.7",
     "@eslint/compat": "^1.2.2",
     "@eslint/eslintrc": "^3.1.0",
     "@eslint/js": "^9.14.0",
     "@log4js-node/log4js-api": "^1.0.2",
     "@napneko/nap-proto-core": "^0.0.4",
-    "@rollup/plugin-typescript": "^12.1.2",
+    "@rollup/plugin-node-resolve": "^15.2.3",
-    "@rollup/plugin-node-resolve": "^16.0.0",
+    "@rollup/plugin-typescript": "^11.1.6",
     "@types/cors": "^2.8.17",
-    "@sinclair/typebox": "^0.34.9",
     "@types/express": "^5.0.0",
     "@types/fluent-ffmpeg": "^2.1.24",
     "@types/node": "^22.0.1",
@@ -37,7 +34,7 @@
     "@typescript-eslint/parser": "^8.3.0",
     "ajv": "^8.13.0",
     "async-mutex": "^0.5.0",
-    "commander": "^13.0.0",
+    "commander": "^12.1.0",
     "cors": "^2.8.5",
     "eslint": "^9.14.0",
     "eslint-import-resolver-typescript": "^3.6.1",
@@ -51,7 +48,8 @@
     "vite": "^6.0.1",
     "vite-plugin-cp": "^4.0.8",
     "vite-tsconfig-paths": "^5.1.0",
-    "winston": "^3.17.0"
+    "winston": "^3.17.0",
+    "@sinclair/typebox": "^0.34.9"
   },
   "dependencies": {
     "express": "^5.0.0",

src/common/cancel-task.ts

@@ -1,107 +0,0 @@
-export type TaskExecutor<T> = (resolve: (value: T | PromiseLike<T>) => void, reject: (reason?: any) => void, onCancel: (callback: () => void) => void) => void;
-
-export class CancelableTask<T> {
-    private promise: Promise<T>;
-    private cancelCallback: (() => void) | null = null;
-    private isCanceled = false;
-    private cancelListeners: Array<() => void> = [];
-
-    constructor(executor: TaskExecutor<T>) {
-        this.promise = new Promise<T>((resolve, reject) => {
-            const onCancel = (callback: () => void) => {
-                this.cancelCallback = callback;
-            };
-
-            executor(
-                (value) => {
-                    if (!this.isCanceled) {
-                        resolve(value);
-                    }
-                },
-                (reason) => {
-                    if (!this.isCanceled) {
-                        reject(reason);
-                    }
-                },
-                onCancel
-            );
-        });
-    }
-
-    public cancel() {
-        if (this.cancelCallback) {
-            this.cancelCallback();
-        }
-        this.isCanceled = true;
-        this.cancelListeners.forEach(listener => listener());
-    }
-
-    public isTaskCanceled(): boolean {
-        return this.isCanceled;
-    }
-
-    public onCancel(listener: () => void) {
-        this.cancelListeners.push(listener);
-    }
-
-    public then<TResult1 = T, TResult2 = never>(
-        onfulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | undefined | null,
-        onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined | null
-    ): Promise<TResult1 | TResult2> {
-        return this.promise.then(onfulfilled, onrejected);
-    }
-
-    public catch<TResult = never>(
-        onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | undefined | null
-    ): Promise<T | TResult> {
-        return this.promise.catch(onrejected);
-    }
-
-    public finally(onfinally?: (() => void) | undefined | null): Promise<T> {
-        return this.promise.finally(onfinally);
-    }
-
-    [Symbol.asyncIterator]() {
-        return {
-            next: () => this.promise.then(value => ({ value, done: true })),
-        };
-    }
-}
-
-
-async function demoAwait() {
-    const executor: TaskExecutor<number> = (resolve, reject, onCancel) => {
-        let count = 0;
-        const intervalId = setInterval(() => {
-            count++;
-            console.log(`Task is running... Count: ${count}`);
-            if (count === 5) {
-                clearInterval(intervalId);
-                resolve(count);
-            }
-        }, 1000);
-
-        onCancel(() => {
-            clearInterval(intervalId);
-            console.log('Task has been canceled.');
-            reject(new Error('Task was canceled'));
-        });
-    };
-
-    const task = new CancelableTask(executor);
-
-    task.onCancel(() => {
-        console.log('Cancel listener triggered.');
-    });
-
-    setTimeout(() => {
-        task.cancel(); // 取消任务
-    }, 6000);
-
-    try {
-        const result = await task;
-        console.log(`Task completed with result: ${result}`);
-    } catch (error) {
-        console.error('Task failed:', error);
-    }
-}

src/common/decorator.ts

@@ -1,22 +0,0 @@
-// decoratorAsyncMethod(this,function,wrapper)
-async function decoratorMethod<T, R>(
-    target: T, 
-    method: () => Promise<R>, 
-    wrapper: (result: R) => Promise<any>, 
-    executeImmediately: boolean = true
-): Promise<any> {
-    const execute = async () => {
-        try {
-            const result = await method.call(target);
-            return wrapper(result);
-        } catch (error) {
-            return Promise.reject(error instanceof Error ? error : new Error(String(error)));
-        }
-    };
-
-    if (executeImmediately) {
-        return execute();
-    } else {
-        return execute;
-    }
-}

src/common/fall-back.ts

@@ -1,43 +0,0 @@
-type Handler<T> = () => T | Promise<T>;
-type Checker<T> = (result: T) => T | Promise<T>;
-
-export class Fallback<T> {
-    private handlers: Handler<T>[] = [];
-    private checker: Checker<T>;
-
-    constructor(checker?: Checker<T>) {
-        this.checker = checker || (async (result: T) => result);
-    }
-
-    add(handler: Handler<T>): this {
-        this.handlers.push(handler);
-        return this;
-    }
-
-    // 执行处理程序链
-    async run(): Promise<T> {
-        const errors: Error[] = [];
-        for (const handler of this.handlers) {
-            try {
-                const result = await handler();
-                try {
-                    return await this.checker(result);
-                } catch (checkerError) {
-                    errors.push(checkerError instanceof Error ? checkerError : new Error(String(checkerError)));
-                }
-            } catch (error) {
-                errors.push(error instanceof Error ? error : new Error(String(error)));
-            }
-        }
-        throw new AggregateError(errors, 'All handlers failed');
-    }
-}
-export class FallbackUtil{
-    static boolchecker<T>(value: T, condition: boolean): T {
-        if (condition) {
-            return value;
-        } else {
-            throw new Error('Condition is false, throwing error');
-        }
-    }
-}

src/common/file.ts

@@ -1,7 +1,9 @@
 import fs from 'fs';
 import { stat } from 'fs/promises';
 import crypto, { randomUUID } from 'crypto';
+import util from 'util';
 import path from 'node:path';
+import * as fileType from 'file-type';
 import { solveProblem } from '@/common/helper';
 
 export interface HttpDownloadOptions {
@@ -13,6 +15,7 @@ type Uri2LocalRes = {
     success: boolean,
     errMsg: string,
     fileName: string,
+    ext: string,
     path: string
 }
 
@@ -70,6 +73,27 @@ async function checkFile(path: string): Promise<void> {
     // 如果文件存在，则无需做任何事情，Promise 解决（resolve）自身
 }
 
+export async function file2base64(path: string) {
+    const readFile = util.promisify(fs.readFile);
+    const result = {
+        err: '',
+        data: '',
+    };
+    try {
+        try {
+            await checkFileExist(path, 5000);
+        } catch (e: any) {
+            result.err = e.toString();
+            return result;
+        }
+        const data = await readFile(path);
+        result.data = data.toString('base64');
+    } catch (err: any) {
+        result.err = err.toString();
+    }
+    return result;
+}
+
 export function calculateFileMD5(filePath: string): Promise<string> {
     return new Promise((resolve, reject) => {
         // 创建一个流式读取器
@@ -136,6 +160,20 @@ export async function httpDownload(options: string | HttpDownloadOptions): Promi
     return Buffer.from(buffer);
 }
 
+export async function checkFileV2(filePath: string) {
+    try {
+        const ext: string | undefined = (await fileType.fileTypeFromFile(filePath))?.ext;
+        if (ext) {
+            fs.renameSync(filePath, filePath + `.${ext}`);
+            filePath += `.${ext}`;
+            return { success: true, ext: ext, path: filePath };
+        }
+    } catch (e) {
+        // log("获取文件类型失败", filePath,e.stack)
+    }
+    return { success: false, ext: '', path: filePath };
+}
+
 export enum FileUriType {
     Unknown = 0,
     Local = 1,
@@ -175,34 +213,63 @@ export async function checkUriType(Uri: string) {
     return { Uri: Uri, Type: FileUriType.Unknown };
 }
 
-export async function uriToLocalFile(dir: string, uri: string, filename: string = randomUUID(), headers?: Record<string, string>): Promise<Uri2LocalRes> {
+export async function uri2local(dir: string, uri: string, filename: string | undefined = undefined): Promise<Uri2LocalRes> {
     const { Uri: HandledUri, Type: UriType } = await checkUriType(uri);
 
-    const filePath = path.join(dir, filename);
+    //解析失败
+    const tempName = randomUUID();
+    if (!filename) filename = randomUUID();
 
-    switch (UriType) {
+    //解析Http和Https协议
-    case FileUriType.Local: {
+    if (UriType == FileUriType.Unknown) {
+        return { success: false, errMsg: `未知文件类型, uri= ${uri}`, fileName: '', ext: '', path: '' };
+    }
+
+    //解析File协议和本地文件
+    if (UriType == FileUriType.Local) {
         const fileExt = path.extname(HandledUri);
-        const localFileName = path.basename(HandledUri, fileExt) + fileExt;
+        let filename = path.basename(HandledUri, fileExt);
-        const tempFilePath = path.join(dir, filename + fileExt);
+        filename += fileExt;
-        fs.copyFileSync(HandledUri, tempFilePath);
+        //复制文件到临时文件并保持后缀
-        return { success: true, errMsg: '', fileName: localFileName, path: tempFilePath };
+        const filenameTemp = tempName + fileExt;
+        const filePath = path.join(dir, filenameTemp);
+        fs.copyFileSync(HandledUri, filePath);
+        return { success: true, errMsg: '', fileName: filename, ext: fileExt, path: filePath };
     }
 
-    case FileUriType.Remote: {
+    //接下来都要有文件名
-        const buffer = await httpDownload({ url: HandledUri, headers: headers });
+    if (UriType == FileUriType.Remote) {
+        const pathInfo = path.parse(decodeURIComponent(new URL(HandledUri).pathname));
+        if (pathInfo.name) {
+            const pathlen = 200 - dir.length - pathInfo.name.length;
+            filename = pathlen > 0 ? pathInfo.name.substring(0, pathlen) : pathInfo.name.substring(pathInfo.name.length, pathInfo.name.length - 10);//过长截断
+            if (pathInfo.ext) {
+                filename += pathInfo.ext;
+            }
+        }
+        filename = filename.replace(/[/\\:*?"<>|]/g, '_');
+        const fileExt = path.extname(HandledUri).replace(/[/\\:*?"<>|]/g, '_').substring(0, 10);
+        const filePath = path.join(dir, tempName + fileExt);
+        const buffer = await httpDownload(HandledUri);
+        //没有文件就创建
         fs.writeFileSync(filePath, buffer, { flag: 'wx' });
-        return { success: true, errMsg: '', fileName: filename, path: filePath };
+        return { success: true, errMsg: '', fileName: filename, ext: fileExt, path: filePath };
     }
 
-    case FileUriType.Base64: {
+    //解析Base64
+    if (UriType == FileUriType.Base64) {
         const base64 = HandledUri.replace(/^base64:\/\//, '');
-        const base64Buffer = Buffer.from(base64, 'base64');
+        const buffer = Buffer.from(base64, 'base64');
-        fs.writeFileSync(filePath, base64Buffer, { flag: 'wx' });
+        let filePath = path.join(dir, filename);
-        return { success: true, errMsg: '', fileName: filename, path: filePath };
+        let fileExt = '';
-    }
+        fs.writeFileSync(filePath, buffer);
-
+        const { success, ext, path: fileTypePath } = await checkFileV2(filePath);
-    default:
+        if (success) {
-        return { success: false, errMsg: `识别URL失败, uri= ${uri}`, fileName: '', path: '' };
+            filePath = fileTypePath;
+            fileExt = ext;
+            filename = filename + '.' + ext;
+        }
+        return { success: true, errMsg: '', fileName: filename, ext: fileExt, path: filePath };
     }
+    return { success: false, errMsg: `未知文件类型, uri= ${uri}`, fileName: '', ext: '', path: '' };
 }

src/common/log.ts

@@ -315,5 +315,5 @@ function replyElementToText(replyElement: any, msg: RawMessage, recursiveLevel:
     return `[回复消息 ${recordMsgOrNull && recordMsgOrNull.peerUin != '284840486' && recordMsgOrNull.peerUin != '1094950020'
         ? rawMessageToText(recordMsgOrNull, recursiveLevel + 1)
         : `未找到消息记录 (MsgId = ${replyElement.sourceMsgIdInRecords})`
-    }]`;
+        }]`;
 }

src/common/umami.ts

@@ -1,165 +0,0 @@
-import https from 'node:https';
-import { napCatVersion } from './version';
-import os from 'node:os';
-
-export class UmamiTraceCore {
-    napcatVersion = napCatVersion;
-    qqversion = '1.0.0';
-    guid = 'default-user';
-    heartbeatInterval: NodeJS.Timeout | null = null;
-    website: string = '596cbbb2-1740-4373-a807-cf3d0637bfa7';
-    referrer: string = 'https://trace.napneko.icu/';
-    hostname: string = 'trace.napneko.icu';
-    ua: string = '';
-    workname: string = 'default';
-    bootTime = Date.now();
-    cache: string = '';
-    platform = process.platform;
-    
-    init(qqversion: string, guid: string, workname: string) {
-        this.qqversion = qqversion;
-        this.workname = workname;
-        const UaList = {
-            linux: 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.11 (KHTML, like Gecko) Ubuntu/11.10 Chromium/27.0.1453.93 Chrome/27.0.1453.93 Safari/537.36',
-            win32: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.2128.93 Safari/537.36',
-            darwin: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.102 Safari/537.36',
-        };
-
-        try {
-            if (this.platform === 'win32') {
-                const ntVersion = os.release();
-                UaList.win32 = `Mozilla/5.0 (Windows NT ${ntVersion}; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.2128.93 Safari/537.36`;
-            } else if (this.platform === 'darwin') {
-                const macVersion = os.release();
-                UaList.darwin = `Mozilla/5.0 (Macintosh; Intel Mac OS X ${macVersion}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.102 Safari/537.36`;
-            }
-        } catch (error) {
-            this.ua = UaList.win32;
-        }
-
-        this.ua = UaList[this.platform as keyof typeof UaList] || UaList.win32;
-
-        this.identifyUser(guid);
-        this.startHeartbeat();
-    }
-
-    identifyUser(guid: string) {
-        this.guid = guid;
-        const data = {
-            napcat_version: this.napcatVersion,
-            qq_version: this.qqversion,
-            napcat_working: this.workname,
-            device_guid: this.guid,
-            device_platform: this.platform,
-            device_arch: os.arch(),
-            boot_time: new Date(this.bootTime + 8 * 60 * 60 * 1000).toISOString().replace('T', ' ').substring(0, 19),
-            sys_time: new Date(Date.now() - os.uptime() * 1000 + 8 * 60 * 60 * 1000).toISOString().replace('T', ' ').substring(0, 19),
-        };
-        this.sendEvent(
-            {
-                website: this.website,
-                hostname: this.hostname,
-                referrer: this.referrer,
-                title: 'NapCat ' + this.napcatVersion,
-                url: `/${this.qqversion}/${this.napcatVersion}/${this.workname}/identify`,
-            },
-            data,
-            'identify'
-        );
-    }
-
-    sendEvent(event: string | object, data?: object, type = 'event') {
-        const env = process.env;
-        const language = env.LANG || env.LANGUAGE || env.LC_ALL || env.LC_MESSAGES;
-        const payload = {
-            ...(typeof event === 'string' ? { event } : event),
-            hostname: this.hostname,
-            referrer: this.referrer,
-            website: this.website,
-            language: language || 'en-US',
-            screen: '1920x1080',
-            data: {
-                ...data,
-            },
-        };
-        this.sendRequest(payload, type);
-    }
-
-    sendTrace(eventName: string, data: string = '') {
-        const payload = {
-            website: this.website,
-            hostname: this.hostname,
-            title: 'NapCat ' + this.napcatVersion,
-            url: `/${this.qqversion}/${this.napcatVersion}/${this.workname}/${eventName}` + (data ? `/${data}` : ''),
-            referrer: this.referrer,
-        };
-        this.sendRequest(payload);
-    }
-
-    sendRequest(payload: object, type = 'event') {
-        const options = {
-            hostname: '104.19.42.72', // 固定 IP 或者从 hostUrl 获取
-            port: 443,
-            path: '/api/send',
-            method: 'POST',
-            headers: {
-                "Host": "umami.napneko.icu",
-                "Content-Type": "application/json",
-                "User-Agent": this.ua,
-                ...(this.cache ? { 'x-umami-cache': this.filterInvalidChars(this.cache) } : {})
-            }
-        };
-        try {
-            const request = https.request(options, (res) => {
-                let responseData = '';
-    
-                res.on('data', (chunk) => {
-                    responseData += chunk;
-                });
-    
-                res.on('end', () => {
-                    if (!this.cache) {
-                        this.cache = responseData;
-                        console.log('Umami cache:', this.cache);
-                    }
-                });
-    
-                res.on('error', (error) => {
-                });
-            });
-    
-            request.on('error', (error) => {
-            });
-    
-            request.write(JSON.stringify({ type, payload }));
-            request.end();
-        } catch (error) {
-        }
-    }
-    
-    filterInvalidChars(value: string): string {
-        return value.replace(/[^\x00-\x7F]/g, '');
-    }
-
-    startHeartbeat() {
-        if (this.heartbeatInterval) {
-            clearInterval(this.heartbeatInterval);
-        }
-        this.heartbeatInterval = setInterval(() => {
-            this.sendEvent({
-                name: 'heartbeat',
-                title: 'NapCat ' + this.napcatVersion,
-                url: `/${this.qqversion}/${this.napcatVersion}/${this.workname}/heartbeat`,
-            });
-        }, 5 * 60 * 1000);
-    }
-
-    stopHeartbeat() {
-        if (this.heartbeatInterval) {
-            clearInterval(this.heartbeatInterval);
-            this.heartbeatInterval = null;
-        }
-    }
-}
-
-export const UmamiTrace = new UmamiTraceCore();

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '4.2.67';
+export const napCatVersion = '4.2.12';

src/core/apis/file.ts

@@ -6,6 +6,7 @@ import {
     Peer,
     PicElement,
     PicSubType,
+    PicType,
     RawMessage,
     SendFileElement,
     SendPicElement,
@@ -16,7 +17,7 @@ import path from 'path';
 import fs from 'fs';
 import fsPromises from 'fs/promises';
 import { InstanceContext, NapCatCore, SearchResultItem } from '@/core';
-import { fileTypeFromFile } from 'file-type';
+import * as fileType from 'file-type';
 import imageSize from 'image-size';
 import { ISizeCalculationResult } from 'image-size/dist/types/interface';
 import { RkeyManager } from '@/core/helper/rkey';
@@ -61,7 +62,7 @@ export class NTQQFileApi {
 
     async uploadFile(filePath: string, elementType: ElementType = ElementType.PIC, elementSubType: number = 0) {
         const fileMd5 = await calculateFileMD5(filePath);
-        const extOrEmpty = await fileTypeFromFile(filePath).then(e => e?.ext ?? '').catch(e => '');
+        const extOrEmpty = (await fileType.fileTypeFromFile(filePath))?.ext;
         const ext = extOrEmpty ? `.${extOrEmpty}` : '';
         let fileName = `${path.basename(filePath)}`;
         if (fileName.indexOf('.') === -1) {
@@ -157,7 +158,7 @@ export class NTQQFileApi {
 
         let fileExt = 'mp4';
         try {
-            const tempExt = (await fileTypeFromFile(filePath))?.ext;
+            const tempExt = (await fileType.fileTypeFromFile(filePath))?.ext;
             if (tempExt) fileExt = tempExt;
         } catch (e) {
             this.context.logger.logError('获取文件类型失败', e);

src/core/apis/friend.ts

@@ -1,4 +1,4 @@
-import { FriendRequest, FriendV2 } from '@/core/types';
+import { FriendV2 } from '@/core/types';
 import { BuddyListReqType, InstanceContext, NapCatCore } from '@/core';
 import { LimitedHashTable } from '@/common/message-unique';
 
@@ -79,10 +79,16 @@ export class NTQQFriendApi {
         return ret;
     }
 
-    async handleFriendRequest(notify: FriendRequest, accept: boolean) {
+    async handleFriendRequest(flag: string, accept: boolean) {
+        const data = flag.split('|');
+        if (data.length < 2) {
+            return;
+        }
+        const friendUid = data[0];
+        const reqTime = data[1];
         this.context.session.getBuddyService()?.approvalFriendRequest({
-            friendUid: notify.friendUid,
+            friendUid: friendUid,
-            reqTime: notify.reqTime,
+            reqTime: reqTime,
             accept,
         });
     }

src/core/apis/group.ts

@@ -1,5 +1,6 @@
 import {
     GeneralCallResult,
+    Group,
     GroupMember,
     NTGroupMemberRole,
     NTGroupRequestOperateTypes,
@@ -7,8 +8,6 @@ import {
     KickMemberV2Req,
     MemberExtSourceType,
     NapCatCore,
-    GroupNotify,
-    GroupInfoSource,
 } from '@/core';
 import { isNumeric, solveAsyncProblem } from '@/common/helper';
 import { LimitedHashTable } from '@/common/message-unique';
@@ -17,35 +16,35 @@ import { NTEventWrapper } from '@/common/event';
 export class NTQQGroupApi {
     context: InstanceContext;
     core: NapCatCore;
+    groupCache: Map<string, Group> = new Map<string, Group>();
     groupMemberCache: Map<string, Map<string, GroupMember>> = new Map<string, Map<string, GroupMember>>();
+    groups: Group[] = [];
     essenceLRU = new LimitedHashTable<number, string>(1000);
+    session: any;
 
     constructor(context: InstanceContext, core: NapCatCore) {
         this.context = context;
         this.core = core;
     }
-
-    async fetchGroupDetail(groupCode: string) {
-        const [, detailInfo] = await this.core.eventWrapper.callNormalEventV2(
-            'NodeIKernelGroupService/getGroupDetailInfo',
-            'NodeIKernelGroupListener/onGroupDetailInfoChange',
-            [groupCode, GroupInfoSource.KDATACARD],
-            (ret) => ret.result === 0,
-            (detailInfo) => detailInfo.groupCode === groupCode,
-            1,
-            5000
-        );
-        return detailInfo;
-    }
-
     async initApi() {
         this.initCache().then().catch(e => this.context.logger.logError(e));
     }
-
     async initCache() {
-        for (const group of await this.getGroups(true)) {
+        this.groups = await this.getGroups();
-            this.refreshGroupMemberCache(group.groupCode).then().catch();
+        for (const group of this.groups) {
+            this.groupCache.set(group.groupCode, group);
+            this.refreshGroupMemberCache(group.groupCode).then().catch(e => this.context.logger.logError(e));
         }
+        this.context.logger.logDebug(`加载${this.groups.length}个群组缓存完成`);
+        // process.pid 调试点
+    }
+
+    async getCoreAndBaseInfo(uids: string[]) {
+        return await this.core.eventWrapper.callNoListenerEvent(
+            'NodeIKernelProfileService/getCoreAndBaseInfo',
+            'nodeStore',
+            uids,
+        );
     }
 
     async fetchGroupEssenceList(groupCode: string) {
@@ -63,15 +62,15 @@ export class NTQQGroupApi {
         return (await data)[1];
     }
 
-    async clearGroupNotifiesUnreadCount(doubt: boolean) {
+    async clearGroupNotifiesUnreadCount(uk: boolean) {
-        return this.context.session.getGroupService().clearGroupNotifiesUnreadCount(doubt);
+        return this.context.session.getGroupService().clearGroupNotifiesUnreadCount(uk);
     }
 
-    async setGroupAvatar(groupCode: string, filePath: string) {
+    async setGroupAvatar(gc: string, filePath: string) {
-        return this.context.session.getGroupService().setHeader(groupCode, filePath);
+        return this.context.session.getGroupService().setHeader(gc, filePath);
     }
 
-    async getGroups(forced: boolean = false) {
+    async getGroups(forced = false) {
         const [, , groupList] = await this.core.eventWrapper.callNormalEventV2(
             'NodeIKernelGroupService/getGroupList',
             'NodeIKernelGroupListener/onGroupListUpdate',
@@ -80,9 +79,9 @@ export class NTQQGroupApi {
         return groupList;
     }
 
-    async getGroupExtFE0Info(groupCodes: Array<string>, forced = true) {
+    async getGroupExtFE0Info(groupCode: string[], forced = true) {
         return this.context.session.getGroupService().getGroupExt0xEF0Info(
-            groupCodes,
+            groupCode,
             [],
             {
                 bindGuildId: 1,
@@ -122,6 +121,24 @@ export class NTQQGroupApi {
         );
     }
 
+    async getGroup(groupCode: string, forced = false) {
+        let group = this.groupCache.get(groupCode.toString());
+        if (!group) {
+            try {
+                const groupList = await this.getGroups(forced);
+                if (groupList.length) {
+                    groupList.forEach(g => {
+                        this.groupCache.set(g.groupCode, g);
+                    });
+                }
+            } catch (e) {
+                return undefined;
+            }
+        }
+        group = this.groupCache.get(groupCode.toString());
+        return group;
+    }
+
     async getGroupMemberAll(groupCode: string, forced = false) {
         return this.context.session.getGroupService().getAllMemberList(groupCode, forced);
     }
@@ -129,35 +146,56 @@ export class NTQQGroupApi {
     async refreshGroupMemberCache(groupCode: string) {
         try {
             const members = await this.getGroupMemberAll(groupCode, true);
-            this.groupMemberCache.set(groupCode, members.result.infos);
+            // 首先填入基础信息
+            const existingMembers = this.groupMemberCache.get(groupCode) ?? new Map<string, GroupMember>();
+            members.result.infos.forEach((value, key) => {
+                existingMembers.set(value.uid, { ...value, ...existingMembers.get(value.uid) });
+            });
+            // 后台补全复杂信息
+            let event = (async () => {
+                let data = (await Promise.allSettled(members.result.ids.map(e => this.core.apis.UserApi.getUserDetailInfo(e.uid)))).filter(e => e.status === 'fulfilled').map(e => e.value);
+                data.forEach(e => {
+                    const existingMember = members.result.infos.get(e.uid);
+                    if (existingMember) {
+                        members.result.infos.set(e.uid, { ...existingMember, ...e });
+                    }
+                });
+                this.groupMemberCache.set(groupCode, members.result.infos);
+            })().then().catch(e => this.context.logger.logError(e));
+            // 处理首次空缺
+            if (!this.groupMemberCache.get(groupCode)) {
+                await event;
+            }
         } catch (e) {
-            this.context.logger.logError(`刷新群成员缓存失败, 群号: ${groupCode}, 错误: ${e}`);
+            this.context.logger.logError(`刷新群成员缓存失败, ${e}`);
         }
-        return this.groupMemberCache;
     }
 
     async getGroupMember(groupCode: string | number, memberUinOrUid: string | number) {
         const groupCodeStr = groupCode.toString();
         const memberUinOrUidStr = memberUinOrUid.toString();
 
-        // 获取群成员缓存
+        // 检查群缓存
         let members = this.groupMemberCache.get(groupCodeStr);
         if (!members) {
-            members = (await this.refreshGroupMemberCache(groupCodeStr)).get(groupCodeStr);
+            await this.refreshGroupMemberCache(groupCodeStr);
         }
 
-        const getMember = () => {
+        function getMember() {
+            let member: GroupMember | undefined;
             if (isNumeric(memberUinOrUidStr)) {
-                return Array.from(members!.values()).find(member => member.uin === memberUinOrUidStr);
+                member = Array.from(members!.values()).find(member => member.uin === memberUinOrUidStr);
             } else {
-                return members!.get(memberUinOrUidStr);
+                member = members!.get(memberUinOrUidStr);
             }
-        };
+            return member;
+        }
+
 
         let member = getMember();
-        // 如果缓存中不存在该成员，尝试刷新缓存
+        // 不存在群友缓存 尝试刷新
         if (!member) {
-            members = (await this.refreshGroupMemberCache(groupCodeStr)).get(groupCodeStr);
+            await this.refreshGroupMemberCache(groupCode.toString());
             member = getMember();
         }
         return member;
@@ -167,26 +205,26 @@ export class NTQQGroupApi {
         return this.context.session.getGroupService().getGroupRecommendContactArkJson(groupCode);
     }
 
-    async creatGroupFileFolder(groupCode: string, folderName: string) {
+    async CreatGroupFileFolder(groupCode: string, folderName: string) {
         return this.context.session.getRichMediaService().createGroupFolder(groupCode, folderName);
     }
 
-    async delGroupFile(groupCode: string, files: Array<string>) {
+    async DelGroupFile(groupCode: string, files: string[]) {
         return this.context.session.getRichMediaService().deleteGroupFile(groupCode, [102], files);
     }
 
-    async delGroupFileFolder(groupCode: string, folderId: string) {
+    async DelGroupFileFolder(groupCode: string, folderId: string) {
         return this.context.session.getRichMediaService().deleteGroupFolder(groupCode, folderId);
     }
 
-    async addGroupEssence(groupCode: string, msgId: string) {
+    async addGroupEssence(GroupCode: string, msgId: string) {
         const MsgData = await this.context.session.getMsgService().getMsgsIncludeSelf({
             chatType: 2,
             guildId: '',
-            peerUid: groupCode,
+            peerUid: GroupCode,
         }, msgId, 1, false);
         const param = {
-            groupCode: groupCode,
+            groupCode: GroupCode,
             msgRandom: parseInt(MsgData.msgList[0].msgRandom),
             msgSeq: parseInt(MsgData.msgList[0].msgSeq),
         };
@@ -197,9 +235,9 @@ export class NTQQGroupApi {
         return this.context.session.getGroupService().kickMemberV2(param);
     }
 
-    async deleteGroupBulletin(groupCode: string, noticeId: string) {
+    async deleteGroupBulletin(GroupCode: string, noticeId: string) {
         const psKey = (await this.core.apis.UserApi.getPSkey(['qun.qq.com'])).domainPskeyMap.get('qun.qq.com')!;
-        return this.context.session.getGroupService().deleteGroupBulletin(groupCode, psKey, noticeId);
+        return this.context.session.getGroupService().deleteGroupBulletin(GroupCode, psKey, noticeId);
     }
 
     async quitGroupV2(GroupCode: string, needDeleteLocalMsg: boolean) {
@@ -210,37 +248,37 @@ export class NTQQGroupApi {
         return this.context.session.getGroupService().quitGroupV2(param);
     }
 
-    async removeGroupEssenceBySeq(groupCode: string, msgRandom: string, msgSeq: string) {
+    async removeGroupEssenceBySeq(GroupCode: string, msgRandom: string, msgSeq: string) {
         const param = {
-            groupCode: groupCode,
+            groupCode: GroupCode,
             msgRandom: parseInt(msgRandom),
             msgSeq: parseInt(msgSeq),
         };
         return this.context.session.getGroupService().removeGroupEssence(param);
     }
 
-    async removeGroupEssence(groupCode: string, msgId: string) {
+    async removeGroupEssence(GroupCode: string, msgId: string) {
         const MsgData = await this.context.session.getMsgService().getMsgsIncludeSelf({
             chatType: 2,
             guildId: '',
-            peerUid: groupCode,
+            peerUid: GroupCode,
         }, msgId, 1, false);
         const param = {
-            groupCode: groupCode,
+            groupCode: GroupCode,
             msgRandom: parseInt(MsgData.msgList[0].msgRandom),
             msgSeq: parseInt(MsgData.msgList[0].msgSeq),
         };
         return this.context.session.getGroupService().removeGroupEssence(param);
     }
 
-    async getSingleScreenNotifies(doubt: boolean, count: number) {
+    async getSingleScreenNotifies(doubt: boolean, num: number) {
         const [, , , notifies] = await this.core.eventWrapper.callNormalEventV2(
             'NodeIKernelGroupService/getSingleScreenNotifies',
             'NodeIKernelGroupListener/onGroupSingleScreenNotifies',
             [
                 doubt,
                 '',
-                count,
+                num,
             ],
         );
         return notifies;
@@ -264,89 +302,95 @@ export class NTQQGroupApi {
         return ret.groupInfos.find(g => g.groupCode === groupCode);
     }
 
-    async getGroupMemberEx(groupCode: string, uid: string, forced: boolean = false, retry: number = 2) {
+    async getGroupMemberEx(GroupCode: string, uid: string, forced = false, retry = 2) {
         const data = await solveAsyncProblem((eventWrapper: NTEventWrapper, GroupCode: string, uid: string, forced = false) => {
             return eventWrapper.callNormalEventV2(
                 'NodeIKernelGroupService/getMemberInfo',
                 'NodeIKernelGroupListener/onMemberInfoChange',
-                [groupCode, [uid], forced],
+                [GroupCode, [uid], forced],
                 (ret) => ret.result === 0,
                 (params, _, members) => params === GroupCode && members.size > 0 && members.has(uid),
                 1,
                 forced ? 2500 : 250
             );
-        }, this.core.eventWrapper, groupCode, uid, forced);
+        }, this.core.eventWrapper, GroupCode, uid, forced);
         if (data && data[3] instanceof Map && data[3].has(uid)) {
             return data[3].get(uid);
         }
         if (retry > 0) {
-            const trydata = await this.getGroupMemberEx(groupCode, uid, true, retry - 1) as GroupMember | undefined;
+            const trydata = await this.getGroupMemberEx(GroupCode, uid, true, retry - 1) as GroupMember | undefined;
             if (trydata) return trydata;
         }
         return undefined;
     }
 
-    async getGroupFileCount(groupCodes: Array<string>) {
+    async getGroupFileCount(group_ids: Array<string>) {
-        return this.context.session.getRichMediaService().batchGetGroupFileCount(groupCodes);
+        return this.context.session.getRichMediaService().batchGetGroupFileCount(group_ids);
     }
 
-    async getArkJsonGroupShare(groupCode: string) {
+    async getArkJsonGroupShare(GroupCode: string) {
         const ret = await this.core.eventWrapper.callNoListenerEvent(
             'NodeIKernelGroupService/getGroupRecommendContactArkJson',
-            groupCode,
+            GroupCode,
         ) as GeneralCallResult & { arkJson: string };
         return ret.arkJson;
     }
 
-    async uploadGroupBulletinPic(groupCode: string, imageurl: string) {
+    //需要异常处理
+    async uploadGroupBulletinPic(GroupCode: string, imageurl: string) {
         const _Pskey = (await this.core.apis.UserApi.getPSkey(['qun.qq.com'])).domainPskeyMap.get('qun.qq.com')!;
-        return this.context.session.getGroupService().uploadGroupBulletinPic(groupCode, _Pskey, imageurl);
+        return this.context.session.getGroupService().uploadGroupBulletinPic(GroupCode, _Pskey, imageurl);
     }
 
-    async handleGroupRequest(notify: GroupNotify, operateType: NTGroupRequestOperateTypes, reason?: string) {
+    async handleGroupRequest(flag: string, operateType: NTGroupRequestOperateTypes, reason?: string) {
+        const flagitem = flag.split('|');
+        const groupCode = flagitem[0];
+        const seq = flagitem[1];
+        const type = parseInt(flagitem[2]);
+
         return this.context.session.getGroupService().operateSysNotify(
             false,
             {
                 operateType: operateType,
                 targetMsg: {
-                    seq: notify.seq,  // 通知序列号
+                    seq: seq,  // 通知序列号
-                    type: notify.type,
+                    type: type,
-                    groupCode: notify.group.groupCode,
+                    groupCode: groupCode,
                     postscript: reason ?? ' ', // 仅传空值可能导致处理失败，故默认给个空格
                 },
             });
     }
 
-    async quitGroup(groupCode: string) {
+    async quitGroup(groupQQ: string) {
-        return this.context.session.getGroupService().quitGroup(groupCode);
+        return this.context.session.getGroupService().quitGroup(groupQQ);
     }
 
-    async kickMember(groupCode: string, kickUids: string[], refuseForever: boolean = false, kickReason: string = '') {
+    async kickMember(groupQQ: string, kickUids: string[], refuseForever: boolean = false, kickReason: string = '') {
-        return this.context.session.getGroupService().kickMember(groupCode, kickUids, refuseForever, kickReason);
+        return this.context.session.getGroupService().kickMember(groupQQ, kickUids, refuseForever, kickReason);
     }
 
-    async banMember(groupCode: string, memList: Array<{ uid: string, timeStamp: number }>) {
+    async banMember(groupQQ: string, memList: Array<{ uid: string, timeStamp: number }>) {
         // timeStamp为秒数, 0为解除禁言
-        return this.context.session.getGroupService().setMemberShutUp(groupCode, memList);
+        return this.context.session.getGroupService().setMemberShutUp(groupQQ, memList);
     }
 
-    async banGroup(groupCode: string, shutUp: boolean) {
+    async banGroup(groupQQ: string, shutUp: boolean) {
-        return this.context.session.getGroupService().setGroupShutUp(groupCode, shutUp);
+        return this.context.session.getGroupService().setGroupShutUp(groupQQ, shutUp);
     }
 
-    async setMemberCard(groupCode: string, memberUid: string, cardName: string) {
+    async setMemberCard(groupQQ: string, memberUid: string, cardName: string) {
-        return this.context.session.getGroupService().modifyMemberCardName(groupCode, memberUid, cardName);
+        return this.context.session.getGroupService().modifyMemberCardName(groupQQ, memberUid, cardName);
     }
 
-    async setMemberRole(groupCode: string, memberUid: string, role: NTGroupMemberRole) {
+    async setMemberRole(groupQQ: string, memberUid: string, role: NTGroupMemberRole) {
-        return this.context.session.getGroupService().modifyMemberRole(groupCode, memberUid, role);
+        return this.context.session.getGroupService().modifyMemberRole(groupQQ, memberUid, role);
     }
 
-    async setGroupName(groupCode: string, groupName: string) {
+    async setGroupName(groupQQ: string, groupName: string) {
-        return this.context.session.getGroupService().modifyGroupName(groupCode, groupName, false);
+        return this.context.session.getGroupService().modifyGroupName(groupQQ, groupName, false);
     }
 
-    async publishGroupBulletin(groupCode: string, content: string, picInfo: {
+    async publishGroupBulletin(groupQQ: string, content: string, picInfo: {
         id: string,
         width: number,
         height: number
@@ -360,11 +404,11 @@ export class NTQQGroupApi {
             pinned: pinned,
             confirmRequired: confirmRequired,
         };
-        return this.context.session.getGroupService().publishGroupBulletin(groupCode, psKey!, data);
+        return this.context.session.getGroupService().publishGroupBulletin(groupQQ, psKey!, data);
     }
 
-    async getGroupRemainAtTimes(groupCode: string) {
+    async getGroupRemainAtTimes(GroupCode: string) {
-        return this.context.session.getGroupService().getGroupRemainAtTimes(groupCode);
+        return this.context.session.getGroupService().getGroupRemainAtTimes(GroupCode);
     }
 
     async getMemberExtInfo(groupCode: string, uin: string) {

src/core/apis/sign.ts

@@ -0,0 +1,25 @@
+import { InstanceContext, NapCatCore } from '..';
+
+export class NTQQMusicSignApi {
+    context: InstanceContext;
+    core: NapCatCore;
+
+    constructor(context: InstanceContext, core: NapCatCore) {
+        this.context = context;
+        this.core = core;
+    }
+    //转换外域名为 https://qq.ugcimg.cn/v1/cpqcbu4b8870i61bde6k7cbmjgejq8mr3in82qir4qi7ielffv5slv8ck8g42novtmev26i233ujtuab6tvu2l2sjgtupfr389191v00s1j5oh5325j5eqi40774jv1i/khovifoh7jrqd6eahoiv7koh8o
+    //https://cgi.connect.qq.com/qqconnectopen/openapi/change_image_url?url=https://th.bing.com/th?id=OSK.b8ed36f1fb1889de6dc84fd81c187773&w=46&h=46&c=11&rs=1&qlt=80&o=6&dpr=2&pid=SANGAM
+
+    //外域名不行得走qgroup中转
+    //https://proxy.gtimg.cn/tx_tls_gate=y.qq.com/music/photo_new/T002R800x800M000000y5gq7449K9I.jpg
+
+    //可外域名
+    //https://pic.ugcimg.cn/500955bdd6657ecc8e82e02d2df06800/jpg1
+
+    //QQ音乐gtimg接口
+    //https://y.gtimg.cn/music/photo_new/T002R800x800M000000y5gq7449K9I.jpg?max_age=2592000
+
+    //还有一处公告上传可以上传高质量图片 持久为qq域名
+}
+

src/core/apis/user.ts

@@ -2,7 +2,6 @@ import { ModifyProfileParams, User, UserDetailSource } from '@/core/types';
 import { RequestUtil } from '@/common/request';
 import { InstanceContext, NapCatCore, ProfileBizType } from '..';
 import { solveAsyncProblem } from '@/common/helper';
-import { Fallback, FallbackUtil } from '@/common/fall-back';
 
 export class NTQQUserApi {
     context: InstanceContext;
@@ -12,15 +11,13 @@ export class NTQQUserApi {
         this.context = context;
         this.core = core;
     }
-
+    //self_tind格式
-    async getCoreAndBaseInfo(uids: string[]) {
+    async createUidFromTinyId(tinyId: string) {
-        return await this.core.eventWrapper.callNoListenerEvent(
+        return this.context.session.getMsgService().createUidFromTinyId(this.core.selfInfo.uin, tinyId);
-            'NodeIKernelProfileService/getCoreAndBaseInfo',
+    }
-            'nodeStore',
+    async getStatusByUid(uid: string) {
-            uids,
+        return this.context.session.getProfileService().getStatus(uid);
-        );
     }
-
     // 默认获取自己的 type = 2 获取别人 type = 1
     async getProfileLike(uid: string, start: number, count: number, type: number = 2) {
         return this.context.session.getProfileLikeService().getBuddyProfileLike({
@@ -93,7 +90,7 @@ export class NTQQUserApi {
         };
         return RetUser;
     }
-
+    
     async getUserDetailInfo(uid: string): Promise<User> {
         let retUser = await solveAsyncProblem(async (uid) => this.fetchUserDetailInfo(uid, UserDetailSource.KDB), uid);
         if (retUser && retUser.uin !== '0') {
@@ -107,19 +104,6 @@ export class NTQQUserApi {
         return retUser;
     }
 
-    async getUserDetailInfoV2(uid: string): Promise<User> {
-        const fallback = new Fallback<User>((user) => FallbackUtil.boolchecker(user, user !== undefined && user.uin !== '0'))
-            .add(() => this.fetchUserDetailInfo(uid, UserDetailSource.KDB))
-            .add(() => this.fetchUserDetailInfo(uid, UserDetailSource.KSERVER));
-        const retUser = await fallback.run().then(async (user) => {
-            if (user && user.uin === '0') {
-                user.uin = await this.core.apis.UserApi.getUidByUinV2(uid) ?? '0';
-            }
-            return user;
-        });
-        return retUser;
-    }
-
     async modifySelfProfile(param: ModifyProfileParams) {
         return this.context.session.getProfileService().modifyDesktopMiniProfile(param);
     }
@@ -177,39 +161,35 @@ export class NTQQUserApi {
         if (!skey) {
             throw new Error('SKey is Empty');
         }
-
         return skey;
     }
 
-    async getUidByUinV2(uin: string) {
+    //后期改成流水线处理
-        if (!uin) {
+    async getUidByUinV2(Uin: string) {
-            return '';
+        let uid = (await this.context.session.getGroupService().getUidByUins([Uin])).uids.get(Uin);
-        }
+        if (uid) return uid;
-
+        uid = (await this.context.session.getProfileService().getUidByUin('FriendsServiceImpl', [Uin])).get(Uin);
-        const fallback =
+        if (uid) return uid;
-            new Fallback<string | undefined>((uid) => FallbackUtil.boolchecker(uid, uid !== undefined && uid.indexOf('*') === -1 && uid !== ''))
+        uid = (await this.context.session.getUixConvertService().getUid([Uin])).uidInfo.get(Uin);
-                .add(() => this.context.session.getUixConvertService().getUid([uin]).then((data) => data.uidInfo.get(uin)))
+        if (uid) return uid;
-                .add(() => this.context.session.getProfileService().getUidByUin('FriendsServiceImpl', [uin]).get(uin))
+        const unverifiedUid = (await this.getUserDetailInfoByUin(Uin)).detail.uid;//从QQ Native 特殊转换
-                .add(() => this.context.session.getGroupService().getUidByUins([uin]).then((data) => data.uids.get(uin)))
+        if (unverifiedUid.indexOf('*') == -1) uid = unverifiedUid;
-                .add(() => this.getUserDetailInfoByUin(uin).then((data) => data.detail.uid));
+        //if (uid) return uid;
-
+        return uid;
-        const uid = await fallback.run().catch(() => '0');
-        return uid ?? '';
     }
 
-    async getUinByUidV2(uid: string) {
+    //后期改成流水线处理
-        if (!uid) {
+    async getUinByUidV2(Uid: string) {
-            return '0';
+        let uin = (await this.context.session.getGroupService().getUinByUids([Uid])).uins.get(Uid);
-        }
+        if (uin && uin !== '0') return uin;
-
+        uin = (await this.context.session.getProfileService().getUinByUid('FriendsServiceImpl', [Uid])).get(Uid);
-        const fallback = new Fallback<string | undefined>((uin) => FallbackUtil.boolchecker(uin, uin !== undefined && uin !== '0' && uin !== ''))
+        if (uin && uin !== '0') return uin;
-            .add(() => this.context.session.getUixConvertService().getUin([uid]).then((data) => data.uinInfo.get(uid)))
+        uin = (await this.context.session.getUixConvertService().getUin([Uid])).uinInfo.get(Uid);
-            .add(() => this.context.session.getProfileService().getUinByUid('FriendsServiceImpl', [uid]).get(uid))
+        if (uin && uin !== '0') return uin;
-            .add(() => this.context.session.getGroupService().getUinByUids([uid]).then((data) => data.uins.get(uid)))
+        uin = (await this.core.apis.FriendApi.getBuddyIdMap(true)).getKey(Uid);
-            .add(() => this.getUserDetailInfo(uid).then((data) => data.uin));
+        if (uin && uin !== '0') return uin;
-
+        uin = (await this.getUserDetailInfo(Uid)).uin; //从QQ Native 转换
-        const uin = await fallback.run().catch(() => '0');
+        return uin;
-        return uin ?? '0';
     }
 
     async getRecentContactListSnapShot(count: number) {

src/core/apis/webapi.ts

@@ -8,7 +8,7 @@ import {
     WebHonorType,
 } from '@/core';
 import { NapCatCore } from '..';
-import { readFileSync } from 'node:fs';
+import { createReadStream, readFileSync, statSync } from 'node:fs';
 import { createHash } from 'node:crypto';
 import { basename } from 'node:path';
 
@@ -366,4 +366,50 @@ export class NTQQWebApi {
 
         return post;
     }
+
+    async uploadQunAlbumSlice(path: string, session: string, skey: string, pskey: string, uin: string, slice_size: number) {
+        const img_size = statSync(path).size;
+        const img_name = basename(path);
+        let seq = 0;
+        let offset = 0;
+        const GTK = this.getBknFromSKey(pskey);
+        const cookie = `p_uin=${uin}; p_skey=${pskey}; skey=${skey}; uin=${uin}`;
+
+        const stream = createReadStream(path, { highWaterMark: slice_size });
+
+        for await (const chunk of stream) {
+            const end = Math.min(offset + chunk.length, img_size);
+            const boundary = `----WebKitFormBoundary${Math.random().toString(36).substring(2)}`;
+            const formData = await RequestUtil.createFormData(boundary, path);
+
+            const api = `https://h5.qzone.qq.com/webapp/json/sliceUpload/FileUpload?seq=${seq}&retry=0&offset=${offset}&end=${end}&total=${img_size}&type=form&g_tk=${GTK}`;
+            const body = {
+                uin: uin,
+                appid: "qun",
+                session: session,
+                offset: offset,
+                data: formData,
+                checksum: "",
+                check_type: 0,
+                retry: 0,
+                seq: seq,
+                end: end,
+                cmd: "FileUpload",
+                slice_size: slice_size,
+                "biz_req.iUploadType": 0
+            };
+
+            const post = await RequestUtil.HttpGetJson(api, 'POST', body, {
+                "Cookie": cookie,
+                "Content-Type": `multipart/form-data; boundary=${boundary}`
+            });
+
+            offset += chunk.length;
+            seq++;
+        }
+    }
+    async uploadQunAlbum(path: string, albumId: string, group: string, skey: string, pskey: string, uin: string) {
+        const session = (await this.createQunAlbumSession(group, albumId, group, path, skey, pskey, uin) as { data: { session: string } }).data.session;
+        return await this.uploadQunAlbumSlice(path, session, skey, pskey, uin, 1024 * 1024);
+    }
 }

src/core/external/appid.json

@@ -98,69 +98,5 @@
     "6.9.61-29927": {
         "appid": 537255836,
         "qua": "V1_MAC_NQ_6.9.61_29927_GW_B"
-    },
-    "9.9.17-30366": {
-        "appid": 537258389,
-        "qua": "V1_WIN_NQ_9.9.17_30366_GW_B"
-    },
-    "3.2.15-30366": {
-        "appid": 537258413,
-        "qua": "V1_LNX_NQ_3.2.15_30366_GW_B"
-    },
-    "6.9.62-30366": {
-        "appid": 537258401,
-        "qua": "V1_MAC_NQ_6.9.62_30366_GW_B"
-    },
-    "9.9.17-30483": {
-        "appid": 537258439,
-        "qua": "V1_WIN_NQ_9.9.17_30483_GW_B"
-    },
-    "6.9.62-30483": {
-        "appid": 537258463,
-        "qua": "V1_MAC_NQ_6.9.62_30483_GW_B"
-    },
-    "3.2.15-30483": {
-        "appid": 537258474,
-        "qua": "V1_LNX_NQ_3.2.15_30483_GW_B"
-    },
-    "9.9.17-30594": {
-        "appid": 537258439,
-        "qua": "V1_WIN_NQ_9.9.17_30594_GW_B"
-    },
-    "6.9.62-30594": {
-        "appid": 537258463,
-        "qua": "V1_MAC_NQ_6.9.62_30594_GW_B"
-    },
-    "3.2.15-30594": {
-        "appid": 537258474,
-        "qua": "V1_LNX_NQ_3.2.15_30594_GW_B"
-    },
-    "9.9.17-30851": {
-        "appid": 537263796,
-        "qua": "V1_WIN_NQ_9.9.17_30851_GW_B"
-    },
-    "3.2.15-30851": {
-        "appid": 537263831,
-        "qua": "V1_LNX_NQ_3.2.15_30851_GW_B"
-    },
-    "6.9.63-30851": {
-        "appid": 537263820,
-        "qua": "V1_MAC_NQ_6.9.63_30851_GW_B"
-    },
-    "9.9.17-30899": {
-        "appid": 537263796,
-        "qua": "V1_WIN_NQ_9.9.17_30899_GW_B"
-    },
-    "3.2.15-30899": {
-        "appid": 537263831,
-        "qua": "V1_LNX_NQ_3.2.15_30899_GW_B"
-    },
-    "6.9.63-30899": {
-        "appid": 537263820,
-        "qua": "V1_MAC_NQ_6.9.63_30899_GW_B"
-    },
-    "9.9.17-31219": {
-        "appid": 537266450,
-        "qua": "V1_WIN_NQ_9.9.17_31219_GW_B"
     }
-}
+}

src/core/external/offset.json

@@ -102,109 +102,5 @@
     "6.9.61-29927-arm64": {
         "send": "4038740",
         "recv": "403AF58"
-    },
-    "9.9.17-30366-x64": {
-        "send": "39AB0B0",
-        "recv": "39AF4E4"
-    },
-    "3.2.15-30366-x64": {
-        "send": "A402380",
-        "recv": "A405C80"
-    },
-    "3.2.15-30366-arm64": {
-        "send": "70C3FA8",
-        "recv": "70C77E0"
-    },
-    "6.9.62-30366-x64": {
-        "send": "4669760",
-        "recv": "466BFCC"
-    },
-    "6.9.62-30366-arm64": {
-        "send": "4189770",
-        "recv": "418BF88"
-    },
-    "9.9.17-30483-x64": {
-        "send": "39AC1B0",
-        "recv": "39B05E4"
-    },
-    "6.9.62-30483-arm64": {
-        "send": "41896B0",
-        "recv": "418bec8"
-    },
-    "6.9.62-30483-x64": {
-        "send": "4669460",
-        "recv": "466BCCC"
-    },
-    "3.2.15-30483-x64": {
-        "send": "A402540",
-        "recv": "A405E40"
-    },
-    "3.2.15-30483-arm64": {
-        "send": "70C40E8",
-        "recv": "70C7920"
-    },
-    "9.9.17-30594-x64": {
-        "send": "39AC1B0",
-        "recv": "39B05E4"
-    },
-    "6.9.62-30594-arm64": {
-        "send": "41896B0",
-        "recv": "418bec8"
-    },
-    "6.9.62-30594-x64": {
-        "send": "4669460",
-        "recv": "466BCCC"
-    },
-    "3.2.15-30594-x64": {
-        "send": "A402540",
-        "recv": "A405E40"
-    },
-    "3.2.15-30594-arm64": {
-        "send": "70C40E8",
-        "recv": "70C7920"
-    },
-    "9.9.17-30851-x64": {
-        "send": "395C150",
-        "recv": "3960584"
-    },
-    "3.2.15-30851-x64": {
-        "send": "A4A03E0",
-        "recv": "A4A3CE0"
-    },
-    "3.2.15-30851-arm64": {
-        "send": "713A318",
-        "recv": "713DB50"
-    },
-    "6.9.63.30851-x64": {
-        "send": "46C8040",
-        "recv": "46CA8AC"
-    },
-    "6.9.63-30851-arm64": {
-        "send": "41DCBD8",
-        "recv": "41DF3F0"
-    },
-    "9.9.17-30899-x64": {
-        "send": "395C150",
-        "recv": "3960584"
-    },
-    "3.2.15-30899-x64": {
-        "send": "A4A03E0",
-        "recv": "A4A3CE0"
-    },
-    "3.2.15-30899-arm64": {
-        "send": "713A318",
-        "recv": "713DB50"
-    },
-    "6.9.63.30899-x64": {
-        "send": "46C8040",
-        "recv": "46CA8AC"
-    },
-    "6.9.63-30899-arm64": {
-        "send": "41DCBD8",
-        "recv": "41DF3F0"
-    },
-    "9.9.17-31219-x64": {
-        "send": "39C1350",
-        "recv": "39C5784"
     }
-}
+}

src/core/helper/adaptSysMessageDecoder.ts

@@ -0,0 +1,49 @@
+// TODO: further refactor in NapCat.Packet v2
+import { NapProtoMsg, ProtoField, ScalarType } from "@napneko/nap-proto-core";
+
+const BodyInner = {
+    msgType: ProtoField(1, ScalarType.UINT32, true),
+    subType: ProtoField(2, ScalarType.UINT32, true)
+};
+
+const NoifyData = {
+    skip: ProtoField(1, ScalarType.BYTES, true),
+    innerData: ProtoField(2, ScalarType.BYTES, true)
+};
+
+const MsgHead = {
+    bodyInner: ProtoField(2, () => BodyInner, true),
+    noifyData: ProtoField(3, () => NoifyData, true)
+};
+
+const Message = {
+    msgHead: ProtoField(1, () => MsgHead)
+};
+
+const SubDetail = {
+    msgSeq: ProtoField(1, ScalarType.UINT32),
+    msgTime: ProtoField(2, ScalarType.UINT32),
+    senderUid: ProtoField(6, ScalarType.STRING)
+};
+
+const RecallDetails = {
+    operatorUid: ProtoField(1, ScalarType.STRING),
+    subDetail: ProtoField(3, () => SubDetail)
+};
+
+const RecallGroup = {
+    type: ProtoField(1, ScalarType.INT32),
+    peerUid: ProtoField(4, ScalarType.UINT32),
+    recallDetails: ProtoField(11, () => RecallDetails),
+    grayTipsSeq: ProtoField(37, ScalarType.UINT32)
+};
+
+export function decodeMessage(buffer: Uint8Array) {
+    const msg = new NapProtoMsg(Message);
+    return msg.decode(buffer);
+}
+
+export function decodeRecallGroup(buffer: Uint8Array){
+    const msg = new NapProtoMsg(RecallGroup);
+    return msg.decode(buffer);
+}

src/core/helper/msg.ts

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

src/core/helper/status.ts

@@ -1,138 +0,0 @@
-import os from "node:os";
-import EventEmitter from "node:events";
-
-export interface SystemStatus {
-    cpu: {
-        model: string,
-        speed: string
-        usage: {
-            system: string
-            qq: string
-        },
-        core: number
-    },
-    memory: {
-        total: string
-        usage: {
-            system: string
-            qq: string
-        }
-    },
-    arch: string
-}
-
-export class StatusHelper {
-    private psCpuUsage = process.cpuUsage();
-    private psCurrentTime = process.hrtime();
-    private cpuTimes = os.cpus().map(cpu => cpu.times);
-
-    private replaceNaN(value: number) {
-        return isNaN(value) ? 0 : value;
-    }
-
-    private sysCpuInfo() {
-        const currentTimes = os.cpus().map(cpu => cpu.times);
-        const { total, active } = currentTimes.map((times, index) => {
-            const prevTimes = this.cpuTimes[index];
-            const totalCurrent = times.user + times.nice + times.sys + times.idle + times.irq;
-            const totalPrev = prevTimes.user + prevTimes.nice + prevTimes.sys + prevTimes.idle + prevTimes.irq;
-            const activeCurrent = totalCurrent - times.idle;
-            const activePrev = totalPrev - prevTimes.idle;
-            return {
-                total: totalCurrent - totalPrev,
-                active: activeCurrent - activePrev
-            };
-        }).reduce((acc, cur) => ({
-            total: acc.total + cur.total,
-            active: acc.active + cur.active
-        }), { total: 0, active: 0 });
-        this.cpuTimes = currentTimes;
-        return {
-            usage: this.replaceNaN(((active / total) * 100)).toFixed(2),
-            model: os.cpus()[0].model,
-            speed: os.cpus()[0].speed,
-            core: os.cpus().length
-        };
-    }
-
-    private sysMemoryUsage() {
-        const { total, free } = { total: os.totalmem(), free: os.freemem() };
-        return ((total - free) / 1024 / 1024).toFixed(2);
-    }
-
-    private qqUsage() {
-        const mem = process.memoryUsage();
-        const numCpus = os.cpus().length;
-        const usageDiff = process.cpuUsage(this.psCpuUsage);
-        const endTime = process.hrtime(this.psCurrentTime);
-        this.psCpuUsage = process.cpuUsage();
-        this.psCurrentTime = process.hrtime();
-        const usageMS = (usageDiff.user + usageDiff.system) / 1e3;
-        const totalMS = endTime[0] * 1e3 + endTime[1] / 1e6;
-        const normPercent = (usageMS / totalMS / numCpus) * 100;
-        return {
-            cpu: this.replaceNaN(normPercent).toFixed(2),
-            memory: ((mem.heapTotal + mem.external + mem.arrayBuffers) / 1024 / 1024).toFixed(2)
-        };
-    }
-
-    systemStatus(): SystemStatus {
-        const qqUsage = this.qqUsage();
-        const sysCpuInfo = this.sysCpuInfo();
-        return {
-            cpu: {
-                core: sysCpuInfo.core,
-                model: sysCpuInfo.model,
-                speed: (sysCpuInfo.speed / 1000).toFixed(2),
-                usage: {
-                    system: sysCpuInfo.usage,
-                    qq: qqUsage.cpu
-                },
-            },
-            memory: {
-                total: (os.totalmem() / 1024 / 1024).toFixed(2),
-                usage: {
-                    system: this.sysMemoryUsage(),
-                    qq: qqUsage.memory
-                }
-            },
-            arch: `${os.platform()} ${os.arch()} ${os.release()}`
-        };
-    }
-}
-
-class StatusHelperSubscription extends EventEmitter {
-    private statusHelper: StatusHelper;
-    private interval: NodeJS.Timeout | null = null;
-
-    constructor(time: number = 3000) {
-        super();
-        this.statusHelper = new StatusHelper();
-        this.on('newListener', (event: string) => {
-            if (event === 'statusUpdate' && this.listenerCount('statusUpdate') === 0) {
-                this.startInterval(time);
-            }
-        });
-        this.on('removeListener', (event: string) => {
-            if (event === 'statusUpdate' && this.listenerCount('statusUpdate') === 0) {
-                this.stopInterval();
-            }
-        });
-    }
-
-    private startInterval(time: number) {
-        this.interval ??= setInterval(() => {
-            const status = this.statusHelper.systemStatus();
-            this.emit('statusUpdate', status);
-        }, time);
-    }
-
-    private stopInterval() {
-        if (this.interval) {
-            clearInterval(this.interval);
-            this.interval = null;
-        }
-    }
-}
-
-export const statusHelperSubscription = new StatusHelperSubscription();

src/core/index.ts

@@ -152,7 +152,6 @@ export class NapCatCore {
     // Renamed from 'InitDataListener'
     async initNapCatCoreListeners() {
         const msgListener = new NodeIKernelMsgListener();
-
         msgListener.onKickedOffLine = (Info: KickedOffLineInfo) => {
             // 下线通知
             this.context.logger.logError('[KickedOffLine] [' + Info.tipsTitle + '] ' + Info.tipsDesc);

src/core/listeners/NodeIKernelGroupListener.ts

@@ -1,4 +1,4 @@
-import { DataSource, Group, GroupDetailInfo, GroupListUpdateType, GroupMember, GroupNotify, ShutUpGroupMember } from '@/core/types';
+import { DataSource, Group, GroupListUpdateType, GroupMember, GroupNotify, ShutUpGroupMember } from '@/core/types';
 
 export class NodeIKernelGroupListener {
     onGroupListInited(listEmpty: boolean): any { }
@@ -28,7 +28,7 @@ export class NodeIKernelGroupListener {
     onGroupConfMemberChange(...args: unknown[]): any {
     }
 
-    onGroupDetailInfoChange(detailInfo: GroupDetailInfo): any {
+    onGroupDetailInfoChange(...args: unknown[]): any {
     }
 
     onGroupExtListUpdate(...args: unknown[]): any {

src/core/packet/clientSession.ts

@@ -23,9 +23,7 @@ export class PacketClientSession {
     get operation() {
         return this.context.operation;
     }
-    get client() {
+
-        return this.context.client;
-    }
     // TODO: global message element adapter (?
     get msgConverter() {
         return this.context.msgConverter;

src/core/packet/context/operationContext.ts

@@ -21,7 +21,7 @@ export class PacketOperationContext {
     }
 
     async GroupPoke(groupUin: number, uin: number) {
-        const req = trans.SendPoke.build(uin, groupUin);
+        const req = trans.SendPoke.build(groupUin, uin);
         await this.context.client.sendOidbPacket(req);
     }
 

src/core/packet/entities/miniApp.ts

@@ -3,7 +3,6 @@ export interface MiniAppReqCustomParams {
     desc: string;
     picUrl: string;
     jumpUrl: string;
-    webUrl?: string;
 }
 
 export interface MiniAppReqTemplateParams {

src/core/packet/message/element.ts

@@ -124,7 +124,7 @@ export class PacketMsgReplyElement extends IPacketMsgElement<SendReplyElement> {
     }
 
     get isGroupReply(): boolean {
-        return this.messageClientSeq === 0;
+        return this.messageClientSeq !== 0;
     }
 
     buildElement(): NapProtoEncodeStructType<typeof Elem>[] {

src/core/packet/transformer/action/GetMiniAppAdaptShareInfo.ts

@@ -30,7 +30,7 @@ class GetMiniAppAdaptShareInfo extends PacketTransformer<typeof proto.MiniAppAda
                 shareType: req.shareType,
                 versionId: req.versionId,
                 withShareTicket: req.withShareTicket,
-                webURL: req.webUrl ?? "",
+                webURL: "",
                 appidRich: Buffer.alloc(0),
                 template: {
                     templateId: "",

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

@@ -3,16 +3,16 @@ import { ProtoField, ScalarType } from "@napneko/nap-proto-core";
 export const GroupAdminExtra = {
     adminUid: ProtoField(1, ScalarType.STRING),
     isPromote: ProtoField(2, ScalarType.BOOL),
-};
+}
 
 export const GroupAdminBody = {
     extraDisable: ProtoField(1, () => GroupAdminExtra),
     extraEnable: ProtoField(2, () => GroupAdminExtra),
-};
+}
 
 export const GroupAdmin = {
     groupUin: ProtoField(1, ScalarType.UINT32),
     flag: ProtoField(2, ScalarType.UINT32),
     isPromote: ProtoField(3, ScalarType.BOOL),
     body: ProtoField(4, () => GroupAdminBody),
-};
+}

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

@@ -54,32 +54,16 @@ export const PushMsg = {
     generalFlag: ProtoField(9, ScalarType.INT32, true),
 };
 
-export const GroupChangeInfo = {
-    operator: ProtoField(1, () => GroupChangeOperator, true),
-};
-
-export const GroupChangeOperator = {
-    operatorUid: ProtoField(1, ScalarType.STRING, 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),
-    operatorInfo: ProtoField(5, ScalarType.BYTES, true),
+    operatorUid: ProtoField(5, ScalarType.STRING, true),
     increaseType: ProtoField(6, ScalarType.UINT32),
     field7: ProtoField(7, ScalarType.BYTES, true),
 };
 
-export const GroupInvite = {
-    groupUin: ProtoField(1, ScalarType.UINT32),
-    field2: ProtoField(2, ScalarType.UINT32),
-    field3: ProtoField(2, ScalarType.UINT32),
-    field4: ProtoField(2, ScalarType.UINT32),
-    invitorUid: ProtoField(5, ScalarType.STRING),
-};
-
 export const PushMsgBody = {
     responseHead: ProtoField(1, () => ResponseHead),
     contentHead: ProtoField(2, () => ContentHead),

src/core/services/NodeIKernelGroupService.ts

@@ -149,7 +149,7 @@ export interface NodeIKernelGroupService {
 
     getGroupExtList(force: boolean): Promise<GeneralCallResult>;
 
-    getGroupDetailInfo(groupCode: string, groupInfoSource: GroupInfoSource): Promise<GeneralCallResult>;
+    getGroupDetailInfo(groupCode: string, groupInfoSource: GroupInfoSource): Promise<unknown>;
 
     getMemberExtInfo(param: GroupExtParam): Promise<unknown>;//req
 
@@ -187,13 +187,13 @@ export interface NodeIKernelGroupService {
 
     destroyGroup(groupCode: string): void;
 
-    getSingleScreenNotifies(doubt: boolean, startSeq: string, count: number): Promise<GeneralCallResult>;
+    getSingleScreenNotifies(doubted: boolean, start_seq: string, num: number): Promise<GeneralCallResult>;
 
     clearGroupNotifies(groupCode: string): void;
 
-    getGroupNotifiesUnreadCount(doubt: boolean): Promise<GeneralCallResult>;
+    getGroupNotifiesUnreadCount(unknown: boolean): Promise<GeneralCallResult>;
 
-    clearGroupNotifiesUnreadCount(doubt: boolean): void;
+    clearGroupNotifiesUnreadCount(unknown: boolean): void;
 
     operateSysNotify(
         doubt: boolean,

src/core/services/NodeIKernelMsgService.ts

@@ -4,7 +4,6 @@ import { GeneralCallResult } from '@/core/services/common';
 import { MsgReqType, QueryMsgsParams, TmpChatInfoApi } from '@/core/types/msg';
 
 export interface NodeIKernelMsgService {
-    buildMultiForwardMsg(req: { srcMsgIds: Array<string>, srcContact: Peer }): Promise<GeneralCallResult & { rspInfo: { elements: unknown } }>;
 
     generateMsgUniqueId(chatType: number, time: string): string;
 

src/core/services/NodeIKernelProfileService.ts

@@ -4,14 +4,14 @@ import { GeneralCallResult } from '@/core/services/common';
 
 export interface NodeIKernelProfileService {
     getOtherFlag(callfrom: string, uids: string[]): Promise<Map<string, any>>;
-
+    
     getVasInfo(callfrom: string, uids: string[]): Promise<Map<string, any>>;
 
     getRelationFlag(callfrom: string, uids: string[]): Promise<Map<string, any>>;
 
-    getUidByUin(callfrom: string, uin: Array<string>): Map<string, string>;
+    getUidByUin(callfrom: string, uin: Array<string>): Promise<Map<string, string>>;
 
-    getUinByUid(callfrom: string, uid: Array<string>): Map<string, string>;
+    getUinByUid(callfrom: string, uid: Array<string>): Promise<Map<string, string>>;
 
     getCoreAndBaseInfo(callfrom: string, uids: string[]): Promise<Map<string, SimpleInfo>>;
 

src/core/services/NodeIKernelSearchService.ts

@@ -16,7 +16,7 @@ export interface NodeIKernelSearchService {
         penetrate: string
     }): Promise<GeneralCallResult>;// needs 1 arguments
 
-    searchLocalInfo(keywords: string, type: number/*4*/): unknown;
+    searchLocalInfo(keywords: string, unknown: number/*4*/): unknown;
 
     cancelSearchLocalInfo(...args: any[]): unknown;// needs 3 arguments
 

src/core/types/element.ts

@@ -29,7 +29,6 @@ export interface TextElement {
 }
 
 export interface FaceElement {
-    pokeType?: number;
     faceIndex: number;
     faceType: FaceType;
     faceText?: string;
@@ -56,7 +55,6 @@ export interface GrayTipElement {
     aioOpGrayTipElement: TipAioOpGrayTipElement;
     groupElement: TipGroupElement;
     xmlElement: {
-        busiId: string;
         content: string;
         templId: string;
     };

src/core/types/group.ts

@@ -17,160 +17,7 @@ export enum GroupInfoSource {
     KRECENTCONTACT,
     KMOREPANEL
 }
-export interface GroupDetailInfo {
+
-    groupCode: string;
-    groupUin: string;
-    ownerUid: string;
-    ownerUin: string;
-    groupFlag: number;
-    groupFlagExt: number;
-    maxMemberNum: number;
-    memberNum: number;
-    groupOption: number;
-    classExt: number;
-    groupName: string;
-    fingerMemo: string;
-    groupQuestion: string;
-    certType: number;
-    richFingerMemo: string;
-    tagRecord: any[];
-    shutUpAllTimestamp: number;
-    shutUpMeTimestamp: number;
-    groupTypeFlag: number;
-    privilegeFlag: number;
-    groupSecLevel: number;
-    groupFlagExt3: number;
-    isConfGroup: number;
-    isModifyConfGroupFace: number;
-    isModifyConfGroupName: number;
-    groupFlagExt4: number;
-    groupMemo: string;
-    cmdUinMsgSeq: number;
-    cmdUinJoinTime: number;
-    cmdUinUinFlag: number;
-    cmdUinMsgMask: number;
-    groupSecLevelInfo: number;
-    cmdUinPrivilege: number;
-    cmdUinFlagEx2: number;
-    appealDeadline: number;
-    remarkName: string;
-    isTop: boolean;
-    groupFace: number;
-    groupGeoInfo: {
-        ownerUid: string;
-        SetTime: number;
-        CityId: number;
-        Longitude: string;
-        Latitude: string;
-        GeoContent: string;
-        poiId: string;
-    };
-    certificationText: string;
-    cmdUinRingtoneId: number;
-    longGroupName: string;
-    autoAgreeJoinGroupUserNumForConfGroup: number;
-    autoAgreeJoinGroupUserNumForNormalGroup: number;
-    cmdUinFlagExt3Grocery: number;
-    groupCardPrefix: {
-        introduction: string;
-        rptPrefix: any[];
-    };
-    groupExt: {
-        groupInfoExtSeq: number;
-        reserve: number;
-        luckyWordId: string;
-        lightCharNum: number;
-        luckyWord: string;
-        starId: number;
-        essentialMsgSwitch: number;
-        todoSeq: number;
-        blacklistExpireTime: number;
-        isLimitGroupRtc: number;
-        companyId: number;
-        hasGroupCustomPortrait: number;
-        bindGuildId: string;
-        groupOwnerId: {
-            memberUin: string;
-            memberUid: string;
-            memberQid: string;
-        };
-        essentialMsgPrivilege: number;
-        msgEventSeq: string;
-        inviteRobotSwitch: number;
-        gangUpId: string;
-        qqMusicMedalSwitch: number;
-        showPlayTogetherSwitch: number;
-        groupFlagPro1: string;
-        groupBindGuildIds: {
-            guildIds: any[];
-        };
-        viewedMsgDisappearTime: string;
-        groupExtFlameData: {
-            switchState: number;
-            state: number;
-            dayNums: any[];
-            version: number;
-            updateTime: string;
-            isDisplayDayNum: boolean;
-        };
-        groupBindGuildSwitch: number;
-        groupAioBindGuildId: string;
-        groupExcludeGuildIds: {
-            guildIds: any[];
-        };
-        fullGroupExpansionSwitch: number;
-        fullGroupExpansionSeq: string;
-        inviteRobotMemberSwitch: number;
-        inviteRobotMemberExamine: number;
-        groupSquareSwitch: number;
-    };
-    msgLimitFrequency: number;
-    hlGuildAppid: number;
-    hlGuildSubType: number;
-    isAllowRecallMsg: number;
-    confUin: string;
-    confMaxMsgSeq: number;
-    confToGroupTime: number;
-    groupSchoolInfo: {
-        location: string;
-        grade: number;
-        school: string;
-    };
-    activeMemberNum: number;
-    groupGrade: number;
-    groupCreateTime: number;
-    subscriptionUin: string;
-    subscriptionUid: string;
-    noFingerOpenFlag: number;
-    noCodeFingerOpenFlag: number;
-    isGroupFreeze: number;
-    allianceId: string;
-    groupExtOnly: {
-        tribeId: number;
-        moneyForAddGroup: number;
-    };
-    isAllowConfGroupMemberModifyGroupName: number;
-    isAllowConfGroupMemberNick: number;
-    isAllowConfGroupMemberAtAll: number;
-    groupClassText: string;
-    groupFreezeReason: number;
-    headPortraitSeq: number;
-    groupHeadPortrait: {
-        portraitCnt: number;
-        portraitInfo: any[];
-        defaultId: number;
-        verifyingPortraitCnt: number;
-        verifyingPortraitInfo: any[];
-    };
-    cmdUinJoinMsgSeq: number;
-    cmdUinJoinRealMsgSeq: number;
-    groupAnswer: string;
-    groupAdminMaxNum: number;
-    inviteNoAuthNumLimit: string;
-    hlGuildOrgId: number;
-    isAllowHlGuildBinary: number;
-    localExitGroupReason: number;
-}
 export interface GroupExt0xEF0InfoFilter {
     bindGuildId: number;
     blacklistExpireTime: number;

src/core/types/index.ts

@@ -9,5 +9,4 @@ export * from './sign';
 export * from './element';
 export * from './constant';
 export * from './graytip';
-export * from './emoji';
+export * from './emoji';
-export * from './service';

src/core/types/msg.ts

@@ -508,7 +508,7 @@ export interface RawMessage {
  */
 export interface QueryMsgsParams {
     chatInfo: Peer;
-    filterMsgType: Array<{ type: NTMsgType, subType: Array<number> }>;
+    filterMsgType: [];
     filterSendersUid: string[];
     filterMsgFromTime: string;
     filterMsgToTime: string;

src/core/types/service.ts

@@ -1,35 +0,0 @@
-export enum LoginErrorCode {
-    KLOGINERRORACCOUNTNOTUIN = 140022018,
-    KLOGINERRORACCOUNTORPASSWORDERROR = 140022013,
-    KLOGINERRORBLACKACCOUNT = 150022021,
-    KLOGINERRORDEFAULT = 140022000,
-    KLOGINERROREXPIRETICKET = 140022014,
-    KLOGINERRORFROZEN = 140022005,
-    KLOGINERRORILLAGETICKET = 140022016,
-    KLOGINERRORINVAILDCOOKIE = 140022012,
-    KLOGINERRORINVALIDPARAMETER = 140022001,
-    KLOGINERRORKICKEDTICKET = 140022015,
-    KLOGINERRORMUTIPLEPASSWORDINCORRECT = 150022029,
-    KLOGINERRORNEEDUPDATE = 140022004,
-    KLOGINERRORNEEDVERIFYREALNAME = 140022019,
-    KLOGINERRORNEWDEVICE = 140022010,
-    KLOGINERRORNICEACCOUNTEXPIRED = 150022020,
-    KLOGINERRORNICEACCOUNTPARENTCHILDEXPIRED = 150022025,
-    KLOGINERRORPASSWORD = 2,
-    KLOGINERRORPROOFWATER = 140022008,
-    KLOGINERRORPROTECT = 140022006,
-    KLOGINERRORREFUSEPASSOWRDLOGIN = 140022009,
-    KLOGINERRORREMINDCANAELLATEDSTATUS = 150022028,
-    KLOGINERRORSCAN = 1,
-    KLOGINERRORSCCESS = 0,
-    KLOGINERRORSECBEAT = 140022017,
-    KLOGINERRORSMSINVALID = 150022026,
-    KLOGINERRORSTRICK = 140022007,
-    KLOGINERRORSYSTEMFAILED = 140022002,
-    KLOGINERRORTGTGTEXCHAGEA1FORBID = 150022027,
-    KLOGINERRORTIMEOUTRETRY = 140022003,
-    KLOGINERRORTOOMANYTIMESTODAY = 150022023,
-    KLOGINERRORTOOOFTEN = 150022022,
-    KLOGINERRORUNREGISTERED = 150022024,
-    KLOGINERRORUNUSUALDEVICE = 140022011,
-}

src/framework/liteloader.cjs

@@ -1,5 +1,5 @@
 //LiteLoader需要提供部分IPC接口，以便于其他插件调用
-const { ipcMain, BrowserWindow } = require('electron');
+const { ipcMain } = require('electron');
 const napcat = require('./napcat.cjs');
 const { shell } = require('electron');
 ipcMain.handle('napcat_get_webtoken', async (event, arg) => {
@@ -13,14 +13,4 @@ ipcMain.handle('napcat_get_reactweb', async (event, arg) => {
     let port = url.port;
     let token = url.searchParams.get('token');
     return `https://napcat.152710.xyz/web_login?back=http://127.0.0.1:${port}&token=${token}`;
-});
-
-ipcMain.on('napcat_open_inner_url', (event, url) => {
-    const win = new BrowserWindow({
-        autoHideMenuBar: true,
-    });
-    win.loadURL(url);
-    win.webContents.setWindowOpenHandler(details => {
-        win.loadURL(details.url)
-    })
 });

src/framework/napcat.ts

@@ -27,7 +27,6 @@ export async function NCoreInitFramework(
     process.on('uncaughtException', (err) => {
         console.log('[NapCat] [Error] Unhandled Exception:', err.message);
     });
-
     process.on('unhandledRejection', (reason, promise) => {
         console.log('[NapCat] [Error] unhandledRejection:', reason);
     });

src/framework/preload.cjs

@@ -6,9 +6,6 @@ const napcat = {
     openExternalUrl: async (url) => {
         ipcRenderer.send('open_external_url', url);
     },
-    openInnerUrl: async (url) => {
-        ipcRenderer.send('napcat_open_inner_url', url);
-    },
     getWebUiUrlReact: async () => {
         return ipcRenderer.invoke('napcat_get_reactweb');
     }

src/framework/renderer.js

@@ -24,7 +24,7 @@ export const onSettingWindowCreated = async (view) => {
     `;
 
     view.querySelector('.nc_openwebui').addEventListener('click', () => {
-        window.napcat.openInnerUrl(webui);
+        window.open(webui, '_blank');
     });
     view.querySelector('.nc_openwebui_ex').addEventListener('click', () => {
         window.napcat.openExternalUrl(webui);

src/onebot/action/OneBotAction.ts

@@ -29,7 +29,7 @@ export class OB11Response {
 }
 
 export abstract class OneBotAction<PayloadType, ReturnDataType> {
-    actionName: typeof ActionName[keyof typeof ActionName] = ActionName.Unknown;
+    actionName: ActionName = ActionName.Unknown;
     core: NapCatCore;
     private validate: ValidateFunction<any> | undefined = undefined;
     payloadSchema: any = undefined;
@@ -83,5 +83,5 @@ export abstract class OneBotAction<PayloadType, ReturnDataType> {
         }
     }
 
-    abstract _handle(payload: PayloadType, adaptername: string): Promise<ReturnDataType>;
+    abstract _handle(payload: PayloadType, adaptername: string): PromiseLike<ReturnDataType>;
-}
+}

src/onebot/action/extends/GetClientkey.ts

@@ -1,14 +0,0 @@
-import { ActionName } from '@/onebot/action/router';
-import { OneBotAction } from '../OneBotAction';
-
-interface GetClientkeyResponse {
-    clientkey?: string;
-}
-
-export class GetClientkey extends OneBotAction<void, GetClientkeyResponse> {
-    actionName = ActionName.GetClientkey;
-
-    async _handle() {
-        return { clientkey: (await this.core.apis.UserApi.forceFetchClientKey()).clientKey };
-    }
-}

src/onebot/action/extends/GetGroupAddRequest.ts

@@ -1,37 +1,33 @@
 import { GroupNotifyMsgStatus } from '@/core';
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
-import { Notify } from '@/onebot/types';
 
-export default class GetGroupAddRequest extends OneBotAction<null, Notify[] | null> {
+interface OB11GroupRequestNotify {
+    group_id: number,
+    user_id: number,
+    flag: string
+}
+
+export default class GetGroupAddRequest extends OneBotAction<null, OB11GroupRequestNotify[] | null> {
     actionName = ActionName.GetGroupIgnoreAddRequest;
 
-    async _handle(payload: null): Promise<Notify[] | null> {
+    async _handle(payload: null): Promise<OB11GroupRequestNotify[] | null> {
-        const NTQQUserApi = this.core.apis.UserApi;
+        const ignoredNotifies = await this.core.apis.GroupApi.getSingleScreenNotifies(true, 10);
-        const NTQQGroupApi = this.core.apis.GroupApi;
+        const retData: any = {
-        const ignoredNotifies = await NTQQGroupApi.getSingleScreenNotifies(true, 10);
+            join_requests: await Promise.all(
-        const retData: Notify[] = [];
+                ignoredNotifies
-
+                    .filter(notify => notify.type === 7)
-        const notifyPromises = ignoredNotifies
+                    .map(async SSNotify => ({
-            .filter(notify => notify.type === 7)
+                        request_id: SSNotify.seq,
-            .map(async SSNotify => {
+                        requester_uin: await this.core.apis.UserApi.getUinByUidV2(SSNotify.user1?.uid),
-                const invitorUin = SSNotify.user1?.uid ? +await NTQQUserApi.getUinByUidV2(SSNotify.user1.uid) : 0;
+                        requester_nick: SSNotify.user1?.nickName,
-                const actorUin = SSNotify.user2?.uid ? +await NTQQUserApi.getUinByUidV2(SSNotify.user2.uid) : 0;
+                        group_id: SSNotify.group?.groupCode,
-                retData.push({
+                        group_name: SSNotify.group?.groupName,
-                    request_id: +SSNotify.seq,
+                        checked: SSNotify.status !== GroupNotifyMsgStatus.KUNHANDLE,
-                    invitor_uin: invitorUin,
+                        actor: await this.core.apis.UserApi.getUinByUidV2(SSNotify.user2?.uid) || 0,
-                    invitor_nick: SSNotify.user1?.nickName,
+                    }))),
-                    group_id: +SSNotify.group?.groupCode,
+        };
-                    message: SSNotify?.postscript,
-                    group_name: SSNotify.group?.groupName,
-                    checked: SSNotify.status !== GroupNotifyMsgStatus.KUNHANDLE,
-                    actor: actorUin,
-                    requester_nick: SSNotify.user1?.nickName,
-                });
-            });
-
-        await Promise.all(notifyPromises);
 
         return retData;
     }
-}
+}

src/onebot/action/extends/GetMiniAppArk.ts

@@ -11,8 +11,7 @@ const SchemaData = Type.Union([
         desc: Type.String(),
         picUrl: Type.String(),
         jumpUrl: Type.String(),
-        webUrl: Type.Optional(Type.String()),
+        rawArkData: Type.Optional(Type.Union([Type.Boolean(), Type.String()]))
-        rawArkData: Type.Optional(Type.Union([Type.String()]))
     }),
     Type.Object({
         title: Type.String(),
@@ -20,7 +19,6 @@ const SchemaData = Type.Union([
         picUrl: Type.String(),
         jumpUrl: Type.String(),
         iconUrl: Type.String(),
-        webUrl: Type.Optional(Type.String()),
         appId: Type.String(),
         scene: Type.Union([Type.Number(), Type.String()]),
         templateType: Type.Union([Type.Number(), Type.String()]),
@@ -30,7 +28,7 @@ const SchemaData = Type.Union([
         versionId: Type.String(),
         sdkId: Type.String(),
         withShareTicket: Type.Union([Type.Number(), Type.String()]),
-        rawArkData: Type.Optional(Type.Union([Type.String()]))
+        rawArkData: Type.Optional(Type.Union([Type.Boolean(), Type.String()]))
     })
 ]);
 type Payload = Static<typeof SchemaData>;
@@ -47,8 +45,7 @@ export class GetMiniAppArk extends GetPacketStatusDepends<Payload, {
             title: payload.title,
             desc: payload.desc,
             picUrl: payload.picUrl,
-            jumpUrl: payload.jumpUrl,
+            jumpUrl: payload.jumpUrl
-            webUrl: payload.webUrl,
         } as MiniAppReqCustomParams;
         if ('type' in payload) {
             reqParam = MiniAppInfoHelper.generateReq(customParams, MiniAppInfo.get(payload.type)!.template);
@@ -66,13 +63,13 @@ export class GetMiniAppArk extends GetPacketStatusDepends<Payload, {
                     verType: +verType,
                     shareType: +shareType,
                     versionId: versionId,
-                    withShareTicket: +withShareTicket,
+                    withShareTicket: +withShareTicket
                 }
             );
         }
         const arkData = await this.core.apis.PacketApi.pkt.operation.GetMiniAppAdaptShareInfo(reqParam);
         return {
-            data: payload.rawArkData === 'true' ? arkData : MiniAppInfoHelper.RawToSend(arkData)
+            data: payload.rawArkData ? arkData : MiniAppInfoHelper.RawToSend(arkData)
         };
     }
 }

src/onebot/action/extends/OCRImage.ts

@@ -1,6 +1,6 @@
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
-import { checkFileExist, uriToLocalFile } from '@/common/file';
+import { checkFileExist, uri2local } from '@/common/file';
 import fs from 'fs';
 import { Static, Type } from '@sinclair/typebox';
 
@@ -10,34 +10,30 @@ const SchemaData = Type.Object({
 
 type Payload = Static<typeof SchemaData>;
 
-class OCRImageBase extends OneBotAction<Payload, any> {
+export class OCRImage extends OneBotAction<Payload, any> {
+    actionName = ActionName.OCRImage;
     payloadSchema = SchemaData;
 
     async _handle(payload: Payload) {
-        const { path, success } = await uriToLocalFile(this.core.NapCatTempPath, payload.image);
+        const { path, success } = (await uri2local(this.core.NapCatTempPath, payload.image));
         if (!success) {
-            throw new Error(`OCR ${payload.image}失败, image字段可能格式不正确`);
+            throw new Error(`OCR ${payload.image}失败,image字段可能格式不正确`);
         }
         if (path) {
-            try {
+            await checkFileExist(path, 5000); // 避免崩溃
-                await checkFileExist(path, 5000); // 避免崩溃
+            const ret = await this.core.apis.SystemApi.ocrImage(path);
-                const ret = await this.core.apis.SystemApi.ocrImage(path);
+            fs.unlink(path, () => { });
-                if (!ret) {
+
-                    throw new Error(`OCR ${payload.image}失败`);
+            if (!ret) {
-                }
+                throw new Error(`OCR ${payload.image}失败`);
-                return ret.result;
-            } finally {
-                fs.unlink(path, () => { });
             }
+            return ret.result;
         }
-        throw new Error(`OCR ${payload.image}失败, 文件可能不存在`);
+        fs.unlink(path, () => { });
+        throw new Error(`OCR ${payload.image}失败,文件可能不存在`);
     }
 }
 
-export class OCRImage extends OCRImageBase {
+export class IOCRImage extends OCRImage {
-    actionName = ActionName.OCRImage;
-}
-
-export class IOCRImage extends OCRImageBase {
     actionName = ActionName.IOCRImage;
-}
+}

src/onebot/action/extends/SendPacket.ts

@@ -1,21 +0,0 @@
-import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
-import { ActionName } from '@/onebot/action/router';
-import { Static, Type } from '@sinclair/typebox';
-
-const SchemaData = Type.Object({
-    cmd: Type.String(),
-    data: Type.String(),
-    rsp: Type.Union([Type.String(), Type.Boolean()], { default: true }),
-});
-
-type Payload = Static<typeof SchemaData>;
-
-export class SendPacket extends GetPacketStatusDepends<Payload, any> {
-    payloadSchema = SchemaData;
-    actionName = ActionName.SendPacket;
-    async _handle(payload: Payload) {
-        const rsp = typeof payload.rsp === 'boolean' ? payload.rsp : payload.rsp === 'true';
-        const data = await this.core.apis.PacketApi.pkt.client.sendOidbPacket({ cmd: payload.cmd, data: payload.data as any }, rsp);
-        return typeof data === 'object' ? data.toString('hex') : undefined;
-    }
-}

src/onebot/action/extends/SetGroupSign.ts

@@ -8,18 +8,14 @@ const SchemaData = Type.Object({
 
 type Payload = Static<typeof SchemaData>;
 
-class SetGroupSignBase extends GetPacketStatusDepends<Payload, any> {
+export class SetGroupSign extends GetPacketStatusDepends<Payload, any> {
+    actionName = ActionName.SetGroupSign;
     payloadSchema = SchemaData;
 
     async _handle(payload: Payload) {
         return await this.core.apis.PacketApi.pkt.operation.GroupSign(+payload.group_id);
     }
 }
-
+export class SendGroupSign extends SetGroupSign {
-export class SetGroupSign extends SetGroupSignBase {
-    actionName = ActionName.SetGroupSign;
-}
-
-export class SendGroupSign extends SetGroupSignBase {
     actionName = ActionName.SendGroupSign;
 }

src/onebot/action/extends/SetQQAvatar.ts

@@ -1,7 +1,7 @@
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
 import fs from 'node:fs/promises';
-import { checkFileExist, uriToLocalFile } from '@/common/file';
+import { checkFileExist, uri2local } from '@/common/file';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
@@ -14,7 +14,7 @@ export default class SetAvatar extends OneBotAction<Payload, null> {
     actionName = ActionName.SetQQAvatar;
     payloadSchema = SchemaData;
     async _handle(payload: Payload): Promise<null> {
-        const { path, success } = (await uriToLocalFile(this.core.NapCatTempPath, payload.file));
+        const { path, success } = (await uri2local(this.core.NapCatTempPath, payload.file));
         if (!success) {
             throw new Error(`头像${payload.file}设置失败,file字段可能格式不正确`);
         }

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

@@ -13,6 +13,6 @@ export class CreateGroupFileFolder extends  OneBotAction<Payload, any>  {
     actionName = ActionName.GoCQHTTP_CreateGroupFileFolder;
     payloadSchema = SchemaData;
     async _handle(payload: Payload) {
-        return (await this.core.apis.GroupApi.creatGroupFileFolder(payload.group_id.toString(), payload.folder_name)).resultWithGroupItem;
+        return (await this.core.apis.GroupApi.CreatGroupFileFolder(payload.group_id.toString(), payload.folder_name)).resultWithGroupItem;
     }
 }

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

@@ -17,6 +17,6 @@ export class DeleteGroupFile extends OneBotAction<Payload, any> {
     async _handle(payload: Payload) {
         const data = FileNapCatOneBotUUID.decodeModelId(payload.file_id);
         if (!data) throw new Error('Invalid file_id');
-        return await this.core.apis.GroupApi.delGroupFile(payload.group_id.toString(), [data.fileId]);
+        return await this.core.apis.GroupApi.DelGroupFile(payload.group_id.toString(), [data.fileId]);
     }
 }

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

@@ -14,7 +14,7 @@ export class DeleteGroupFileFolder extends OneBotAction<Payload, any> {
     actionName = ActionName.GoCQHTTP_DeleteGroupFileFolder;
     payloadSchema = SchemaData;
     async _handle(payload: Payload) {
-        return (await this.core.apis.GroupApi.delGroupFileFolder(
+        return (await this.core.apis.GroupApi.DelGroupFileFolder(
             payload.group_id.toString(), payload.folder ?? payload.folder_id ?? '')).groupFileCommonResult;
     }
 }

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

@@ -2,7 +2,7 @@ import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
 import fs from 'fs';
 import { join as joinPath } from 'node:path';
-import { calculateFileMD5, uriToLocalFile } from '@/common/file';
+import { calculateFileMD5, httpDownload } from '@/common/file';
 import { randomUUID } from 'crypto';
 import { Static, Type } from '@sinclair/typebox';
 
@@ -26,20 +26,17 @@ export default class GoCQHTTPDownloadFile extends OneBotAction<Payload, FileResp
     async _handle(payload: Payload): Promise<FileResponse> {
         const isRandomName = !payload.name;
         const name = payload.name || randomUUID();
-        let result: Awaited<ReturnType<typeof uriToLocalFile>>;
+        const filePath = joinPath(this.core.NapCatTempPath, name);
 
         if (payload.base64) {
-            result = await uriToLocalFile(this.core.NapCatTempPath, `base64://${payload.base64}`, name);
+            fs.writeFileSync(filePath, payload.base64, 'base64');
         } else if (payload.url) {
             const headers = this.getHeaders(payload.headers);
-            result = await uriToLocalFile(this.core.NapCatTempPath, payload.url, name, headers);
+            const buffer = await httpDownload({ url: payload.url, headers: headers });
+            fs.writeFileSync(filePath, Buffer.from(buffer), 'binary');
         } else {
             throw new Error('不存在任何文件, 无法下载');
         }
-        if (!result.success) {
-            throw new Error(result.errMsg);
-        }
-        const filePath = result.path;
         if (fs.existsSync(filePath)) {
 
             if (isRandomName) {

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

@@ -1,4 +1,4 @@
-import { checkFileExist, uriToLocalFile } from '@/common/file';
+import { checkFileExist, uri2local } from '@/common/file';
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
 import { unlink } from 'node:fs/promises';
@@ -28,7 +28,7 @@ export class SendGroupNotice extends OneBotAction<Payload, null> {
             const {
                 path,
                 success,
-            } = (await uriToLocalFile(this.core.NapCatTempPath, payload.image));
+            } = (await uri2local(this.core.NapCatTempPath, payload.image));
             if (!success) {
                 throw new Error(`群公告${payload.image}设置失败,image字段可能格式不正确`);
             }

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

@@ -1,6 +1,6 @@
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
-import { checkFileExistV2, uriToLocalFile } from '@/common/file';
+import { checkFileExistV2, uri2local } from '@/common/file';
 import { Static, Type } from '@sinclair/typebox';
 import fs from 'node:fs/promises';
 const SchemaData = Type.Object({
@@ -15,7 +15,7 @@ export default class SetGroupPortrait extends OneBotAction<Payload, any> {
     payloadSchema = SchemaData;
 
     async _handle(payload: Payload): Promise<any> {
-        const { path, success } = (await uriToLocalFile(this.core.NapCatTempPath, payload.file));
+        const { path, success } = (await uri2local(this.core.NapCatTempPath, payload.file));
         if (!success) {
             throw new Error(`头像${payload.file}设置失败,file字段可能格式不正确`);
         }

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

@@ -2,7 +2,7 @@ import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
 import { ChatType, Peer } from '@/core/types';
 import fs from 'fs';
-import { uriToLocalFile } from '@/common/file';
+import { uri2local } from '@/common/file';
 import { SendMessageContext } from '@/onebot/api';
 import { Static, Type } from '@sinclair/typebox';
 
@@ -25,7 +25,7 @@ export default class GoCQHTTPUploadGroupFile extends OneBotAction<Payload, null>
         if (fs.existsSync(file)) {
             file = `file://${file}`;
         }
-        const downloadResult = await uriToLocalFile(this.core.NapCatTempPath, file);
+        const downloadResult = await uri2local(this.core.NapCatTempPath, file);
         const peer: Peer = {
             chatType: ChatType.KCHATTYPEGROUP,
             peerUid: payload.group_id.toString(),

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

@@ -2,7 +2,7 @@ import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
 import { ChatType, Peer, SendFileElement } from '@/core/types';
 import fs from 'fs';
-import { uriToLocalFile } from '@/common/file';
+import { uri2local } from '@/common/file';
 import { SendMessageContext } from '@/onebot/api';
 import { ContextMode, createContext } from '@/onebot/action/msg/SendMsg';
 import { Static, Type } from '@sinclair/typebox';
@@ -36,7 +36,7 @@ export default class GoCQHTTPUploadPrivateFile extends OneBotAction<Payload, nul
         if (fs.existsSync(file)) {
             file = `file://${file}`;
         }
-        const downloadResult = await uriToLocalFile(this.core.NapCatTempPath, file);
+        const downloadResult = await uri2local(this.core.NapCatTempPath, file);
         if (!downloadResult.success) {
             throw new Error(downloadResult.errMsg);
         }

src/onebot/action/group/GetGroupIgnoredNotifies.ts

@@ -1,44 +1,26 @@
 import { GroupNotifyMsgStatus } from '@/core';
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
-import { Notify } from '@/onebot/types';
+export class GetGroupIgnoredNotifies extends OneBotAction<void, any> {
-
-interface RetData {
-    InvitedRequest: Notify[];
-    join_requests: Notify[];
-}
-
-export class GetGroupIgnoredNotifies extends OneBotAction<void, RetData> {
     actionName = ActionName.GetGroupIgnoredNotifies;
 
-    async _handle(): Promise<RetData> {
+    async _handle(payload: void) {
-        const SingleScreenNotifies = await this.core.apis.GroupApi.getSingleScreenNotifies(false, 50);
+        const ignoredNotifies = await this.core.apis.GroupApi.getSingleScreenNotifies(true, 10);
-        const retData: RetData = { InvitedRequest: [], join_requests: [] };
+        const retData: any = {
-
+            join_requests: await Promise.all(
-        const notifyPromises = SingleScreenNotifies.map(async (SSNotify) => {
+                ignoredNotifies
-            const invitorUin = SSNotify.user1?.uid ? +await this.core.apis.UserApi.getUinByUidV2(SSNotify.user1.uid) : 0;
+                    .filter(notify => notify.type === 7)
-            const actorUin = SSNotify.user2?.uid ? +await this.core.apis.UserApi.getUinByUidV2(SSNotify.user2.uid) : 0;
+                    .map(async SSNotify => ({
-            const commonData = {
+                        request_id: SSNotify.seq,
-                request_id: +SSNotify.seq,
+                        requester_uin: await this.core.apis.UserApi.getUinByUidV2(SSNotify.user1?.uid),
-                invitor_uin: invitorUin,
+                        requester_nick: SSNotify.user1?.nickName,
-                invitor_nick: SSNotify.user1?.nickName,
+                        group_id: SSNotify.group?.groupCode,
-                group_id: +SSNotify.group?.groupCode,
+                        group_name: SSNotify.group?.groupName,
-                message: SSNotify?.postscript,
+                        checked: SSNotify.status !== GroupNotifyMsgStatus.KUNHANDLE,
-                group_name: SSNotify.group?.groupName,
+                        actor: await this.core.apis.UserApi.getUinByUidV2(SSNotify.user2?.uid) || 0,
-                checked: SSNotify.status !== GroupNotifyMsgStatus.KUNHANDLE,
+                    }))),
-                actor: actorUin,
+        };
-                requester_nick: SSNotify.user1?.nickName,
-            };
-
-            if (SSNotify.type === 1) {
-                retData.InvitedRequest.push(commonData);
-            } else if (SSNotify.type === 7) {
-                retData.join_requests.push(commonData);
-            }
-        });
-
-        await Promise.all(notifyPromises);
 
         return retData;
     }
-}
+}

src/onebot/action/group/GetGroupInfo.ts

@@ -17,13 +17,14 @@ class GetGroupInfo extends OneBotAction<Payload, OB11Group> {
     async _handle(payload: Payload) {
         const group = (await this.core.apis.GroupApi.getGroups()).find(e => e.groupCode == payload.group_id.toString());
         if (!group) {
-            const data = await this.core.apis.GroupApi.fetchGroupDetail(payload.group_id.toString());
+            const data = await this.core.apis.GroupApi.searchGroup(payload.group_id.toString());
+            if (!data) throw new Error('Group not found');
             return {
-                ...data,
+                ...data.searchGroupInfo,
                 group_id: +payload.group_id,
-                group_name: data.groupName,
+                group_name: data.searchGroupInfo.groupName,
-                member_count: data.memberNum,
+                member_count: data.searchGroupInfo.memberNum,
-                max_member_count: data.maxMemberNum,
+                max_member_count: data.searchGroupInfo.maxMemberNum,
             };
         }
         return OB11Construct.group(group);

src/onebot/action/group/GetGroupMemberInfo.ts

@@ -29,14 +29,13 @@ class GetGroupMemberInfo extends OneBotAction<Payload, OB11GroupMember> {
     async _handle(payload: Payload) {
         const isNocache = this.parseBoolean(payload.no_cache ?? true);
         const uid = await this.getUid(payload.user_id);
-        const groupMember = this.core.apis.GroupApi.groupMemberCache.get(payload.group_id.toString())?.get(uid);
+        const [member, info] = await Promise.all([
-        let [member, info] = await Promise.all([
             this.core.apis.GroupApi.getGroupMemberEx(payload.group_id.toString(), uid, isNocache),
             this.core.apis.UserApi.getUserDetailInfo(uid),
         ]);
-        if (!member || !groupMember) throw new Error(`群(${payload.group_id})成员${payload.user_id}不存在`);
+        if (!member) throw new Error(`群(${payload.group_id})成员${payload.user_id}不存在`);
         if (info) {
-            member = { ...groupMember, ...member, ...info };
+            Object.assign(member, info);
         } else {
             this.core.context.logger.logDebug(`获取群成员详细信息失败, 只能返回基础信息`);
         }

src/onebot/action/group/GetGroupMemberList.ts

@@ -21,8 +21,7 @@ export class GetGroupMemberList extends OneBotAction<Payload, OB11GroupMember[]>
         const memberCache = this.core.apis.GroupApi.groupMemberCache;
         let groupMembers = memberCache.get(groupIdStr);
         if (noCache || !groupMembers) {
-            this.core.apis.GroupApi.refreshGroupMemberCache(groupIdStr).then().catch();
+            await this.core.apis.GroupApi.refreshGroupMemberCache(groupIdStr);
-            //下次刷新
             groupMembers = memberCache.get(groupIdStr);
             if (!groupMembers) {
                 throw new Error(`Failed to get group member list for group ${groupIdStr}`);

src/onebot/action/group/GroupPoke.ts

@@ -14,6 +14,6 @@ export class GroupPoke extends GetPacketStatusDepends<Payload, any> {
     payloadSchema = SchemaData;
 
     async _handle(payload: Payload) {
-        await this.core.apis.PacketApi.pkt.operation.GroupPoke(+payload.group_id, +payload.user_id);
+        await this.core.apis.PacketApi.pkt.operation.GroupPoke(+payload.user_id, +payload.group_id);
     }
 }

src/onebot/action/group/SendGroupAiRecord.ts

@@ -1,6 +1,6 @@
 import { ActionName } from '@/onebot/action/router';
 import { GetPacketStatusDepends } from "@/onebot/action/packet/GetPacketStatus";
-import { uriToLocalFile } from "@/common/file";
+import { uri2local } from "@/common/file";
 import { ChatType, Peer } from "@/core";
 import { AIVoiceChatType } from "@/core/packet/entities/aiChat";
 import { Static, Type } from '@sinclair/typebox';
@@ -21,9 +21,15 @@ export class SendGroupAiRecord extends GetPacketStatusDepends<Payload, {
     payloadSchema = SchemaData;
 
     async _handle(payload: Payload) {
-        await this.core.apis.PacketApi.pkt.operation.GetAiVoice(+payload.group_id, payload.character, payload.text, AIVoiceChatType.Sound);
+        const rawRsp = await this.core.apis.PacketApi.pkt.operation.GetAiVoice(+payload.group_id, payload.character, payload.text, AIVoiceChatType.Sound);
-        return {
+        const url = await this.core.apis.PacketApi.pkt.operation.GetGroupPttUrl(+payload.group_id, rawRsp.msgInfoBody[0].index);
-            message_id: 0  // can't get message_id from GetAiVoice
+        const { path, errMsg, success } = (await uri2local(this.core.NapCatTempPath, url));
-        };
+        if (!success) {
+            throw new Error(errMsg);
+        }
+        const peer = { chatType: ChatType.KCHATTYPEGROUP, peerUid: payload.group_id.toString() } as Peer;
+        const element = await this.core.apis.FileApi.createValidSendPttElement(path);
+        const sendRes = await this.obContext.apis.MsgApi.sendMsgWithOb11UniqueId(peer, [element], [path]);
+        return { message_id: sendRes.id ?? -1 };
     }
 }

src/onebot/action/group/SendGroupMsg.ts

@@ -1,9 +1,9 @@
-import { ContextMode, SendMsgBase } from '@/onebot/action/msg/SendMsg';
+import SendMsg, { ContextMode } from '@/onebot/action/msg/SendMsg';
 import { ActionName, BaseCheckResult } from '@/onebot/action/router';
 import { OB11PostSendMsg } from '@/onebot/types';
 
 // 未检测参数
-class SendGroupMsg extends SendMsgBase {
+class SendGroupMsg extends SendMsg {
     actionName = ActionName.SendGroupMsg;
     contextMode: ContextMode = ContextMode.Group;
 

src/onebot/action/group/SetGroupAddRequest.ts

@@ -4,9 +4,9 @@ import { ActionName } from '@/onebot/action/router';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    flag: Type.Union([Type.String(), Type.Number()]),
+    flag: Type.String(),
     approve: Type.Optional(Type.Union([Type.Boolean(), Type.String()])),
-    reason: Type.Optional(Type.Union([Type.String({ default: ' ' }), Type.Null()])),
+    reason: Type.Union([Type.String({ default: ' ' }), Type.Null()]),
 });
 
 type Payload = Static<typeof SchemaData>;
@@ -18,25 +18,10 @@ export default class SetGroupAddRequest extends OneBotAction<Payload, null> {
     async _handle(payload: Payload): Promise<null> {
         const flag = payload.flag.toString();
         const approve = payload.approve?.toString() !== 'false';
-        const reason = payload.reason ?? ' ';
+        await this.core.apis.GroupApi.handleGroupRequest(flag,
-        let invite_notify = this.obContext.apis.MsgApi.notifyGroupInvite.get(flag);
-        const notify = invite_notify ?? await this.findNotify(flag);
-        if (!notify) {
-            throw new Error('No such request');
-        }
-        await this.core.apis.GroupApi.handleGroupRequest(
-            notify,
             approve ? NTGroupRequestOperateTypes.KAGREE : NTGroupRequestOperateTypes.KREFUSE,
-            reason,
+            payload.reason ?? ' ',
         );
         return null;
     }
-
+}
-    private async findNotify(flag: string) {
-        let notify = (await this.core.apis.GroupApi.getSingleScreenNotifies(false, 100)).find(e => e.seq == flag);
-        if (!notify) {
-            notify = (await this.core.apis.GroupApi.getSingleScreenNotifies(true, 100)).find(e => e.seq == flag);
-        }
-        return notify;
-    }
-}

src/onebot/action/group/SetGroupBan.ts

@@ -18,7 +18,7 @@ export default class SetGroupBan extends OneBotAction<Payload, null> {
         const uid = await this.core.apis.UserApi.getUidByUinV2(payload.user_id.toString());
         if (!uid) throw new Error('uid error');
         await this.core.apis.GroupApi.banMember(payload.group_id.toString(),
-            [{ uid: uid, timeStamp: +payload.duration }]);
+            [{ uid: uid, timeStamp: +payload.duration}]);
         return null;
     }
 }

src/onebot/action/index.ts

@@ -102,11 +102,11 @@ import { SendGroupAiRecord } from "@/onebot/action/group/SendGroupAiRecord";
 import { GetAiCharacters } from "@/onebot/action/extends/GetAiCharacters";
 import { GetGuildList } from './guild/GetGuildList';
 import { GetGuildProfile } from './guild/GetGuildProfile';
-import { GetClientkey } from './extends/GetClientkey';
-import { SendPacket } from './extends/SendPacket';
-import { SendPoke } from "@/onebot/action/packet/SendPoke";
 
-export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCore) {
+
+export type ActionMap = Map<string, OneBotAction<any, any>>;
+
+export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCore): ActionMap {
 
     const actionHandlers = [
         new GetGroupInfoEx(obContext, core),
@@ -126,7 +126,6 @@ export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCo
         new GetGroupRootFiles(obContext, core),
         new SetGroupSign(obContext, core),
         new SendGroupSign(obContext, core),
-        new GetClientkey(obContext, core),
         // onebot11
         new SendLike(obContext, core),
         new GetMsg(obContext, core),
@@ -220,33 +219,13 @@ export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCo
         new GetAiRecord(obContext, core),
         new SendGroupAiRecord(obContext, core),
         new GetAiCharacters(obContext, core),
-        new SendPacket(obContext, core),
-        new SendPoke(obContext, core),
     ];
-
+    const actionMap = new Map();
-    type HandlerUnion = typeof actionHandlers[number];
+    for (const action of actionHandlers) {
-    type MapType = {
+        actionMap.set(action.actionName, action);
-        [H in HandlerUnion as H['actionName']]: H;
+        actionMap.set(action.actionName + '_async', action);
-    } & {
+        actionMap.set(action.actionName + '_rate_limited', action);
-        [H in HandlerUnion as `${H['actionName']}_async`]: H;
-    } & {
-        [H in HandlerUnion as `${H['actionName']}_rate_limited`]: H;
-    };
-
-    const _map = new Map<keyof MapType, HandlerUnion>();
-
-    actionHandlers.forEach(h => {
-        _map.set(h.actionName as keyof MapType, h);
-        _map.set(`${h.actionName}_async` as keyof MapType, h);
-        _map.set(`${h.actionName}_rate_limited` as keyof MapType, h);
-    });
-
-    function get<K extends keyof MapType>(key: K): MapType[K];
-    function get<K extends keyof MapType>(key: K): null;
-    function get<K extends keyof MapType>(key: K): HandlerUnion | null | MapType[K] {
-        return _map.get(key as keyof MapType) ?? null;
     }
 
-    return { get };
+    return actionMap;
 }
-export type ActionMap = ReturnType<typeof createActionMap>

src/onebot/action/msg/SendMsg.ts

@@ -88,7 +88,8 @@ function getSpecialMsgNum(payload: OB11PostSendMsg, msgType: OB11MessageDataType
     return 0;
 }
 
-export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
+export class SendMsg extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
+    actionName = ActionName.SendMsg;
     contextMode = ContextMode.Normal;
 
     protected async check(payload: OB11PostSendMsg): Promise<BaseCheckResult> {
@@ -378,6 +379,4 @@ export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
     }
 }
 
-export default class SendMsg extends SendMsgBase {
+export default SendMsg;
-    actionName = ActionName.SendMsg;
-}

src/onebot/action/msg/SendPrivateMsg.ts

@@ -1,9 +1,9 @@
-import { ContextMode, SendMsgBase } from './SendMsg';
+import SendMsg, { ContextMode } from './SendMsg';
 import { ActionName, BaseCheckResult } from '@/onebot/action/router';
 import { OB11PostSendMsg } from '@/onebot/types';
 
 // 未检测参数
-class SendPrivateMsg extends SendMsgBase {
+class SendPrivateMsg extends SendMsg {
     actionName = ActionName.SendPrivateMsg;
     contextMode: ContextMode = ContextMode.Private;
 

src/onebot/action/packet/GetPacketStatus.ts

@@ -3,6 +3,8 @@ import { ActionName, BaseCheckResult } from '@/onebot/action/router';
 
 
 export abstract class GetPacketStatusDepends<PT, RT> extends OneBotAction<PT, RT> {
+    actionName = ActionName.GetPacketStatus;
+
     protected async check(payload: PT): Promise<BaseCheckResult>{
         if (!this.core.apis.PacketApi.available) {
             return {
@@ -16,8 +18,6 @@ export abstract class GetPacketStatusDepends<PT, RT> extends OneBotAction<PT, RT
 }
 
 export class GetPacketStatus extends GetPacketStatusDepends<any, null> {
-    actionName = ActionName.GetPacketStatus;
-
     async _handle(payload: any) {
         return null;
     }

src/onebot/action/packet/SendPoke.ts

@@ -1,23 +0,0 @@
-import { ActionName } from '@/onebot/action/router';
-import { GetPacketStatusDepends } from "@/onebot/action/packet/GetPacketStatus";
-import { Static, Type } from '@sinclair/typebox';
-
-const SchemaData = Type.Object({
-    group_id: Type.Optional(Type.Union([Type.Number(), Type.String()])),
-    user_id: Type.Union([Type.Number(), Type.String()]),
-});
-
-type Payload = Static<typeof SchemaData>;
-
-export class SendPoke extends GetPacketStatusDepends<Payload, any> {
-    actionName = ActionName.SendPoke;
-    payloadSchema = SchemaData;
-
-    async _handle(payload: Payload) {
-        if (payload.group_id) {
-            await this.core.apis.PacketApi.pkt.operation.GroupPoke(+payload.group_id, +payload.user_id);
-        } else {
-            await this.core.apis.PacketApi.pkt.operation.FriendPoke(+payload.user_id);
-        }
-    }
-}