Merge branch 'main' into pr/1569

packages/napcat-core/external/appid.json

@@ -518,5 +518,13 @@
   "9.9.26-44725": {
     "appid": 537337569,
     "qua": "V1_WIN_NQ_9.9.26_44725_GW_B"
+  },
+  "9.9.27-45627": {
+    "appid": 537340060,
+    "qua": "V1_WIN_NQ_9.9.26_45627_GW_B"
+  },
+  "6.9.88-44725": {
+    "appid": 537337594,
+    "qua": "V1_MAC_NQ_6.9.88_44725_GW_B"
   }
 }

packages/napcat-core/external/napi2native.json

@@ -154,5 +154,17 @@
   "9.9.26-44725-x64": {
     "send": "0A18D0C",
     "recv": "1D4BF0D"
+  },
+  "9.9.27-45627-x64": {
+    "send": "0A697CC",
+    "recv": "1E86AC1"
+  },
+  "6.9.88-44725-x64": {
+    "send": "2756EF6",
+    "recv": "0A36152"
+  },
+  "6.9.88-44725-arm64": {
+    "send": "2313C68",
+    "recv": "09693E4"
   }
 }

packages/napcat-core/external/packet.json

@@ -662,5 +662,17 @@
   "9.9.26-44725-x64": {
     "send": "2CEBB20",
     "recv": "2CEF0A0"
+  },
+  "9.9.27-45627-x64": {
+    "send": "2E59CC0",
+    "recv": "2E5D240"
+  },
+  "6.9.88-44725-x64": {
+    "send": "451FE90",
+    "recv": "4522A40"
+  },
+  "6.9.88-44725-arm64": {
+    "send": "3D79168",
+    "recv": "3D7BA78"
   }
 }

packages/napcat-core/packet/context/operationContext.ts

@@ -95,12 +95,15 @@ export class PacketOperationContext {
         .filter(Boolean)
     );
     const res = await Promise.allSettled(reqList);
-    this.context.logger.info(`上传资源${res.length}个，失败${res.filter((r) => r.status === 'rejected').length}个`);
-    res.forEach((result, index) => {
-      if (result.status === 'rejected') {
-        this.context.logger.error(`上传第${index + 1}个资源失败：${result.reason.stack}`);
-      }
-    });
+    const failedCount = res.filter((r) => r.status === 'rejected').length;
+    if (failedCount > 0) {
+      this.context.logger.warn(`上传资源${res.length}个，失败${failedCount}个`);
+      res.forEach((result, index) => {
+        if (result.status === 'rejected') {
+          this.context.logger.error(`上传第${index + 1}个资源失败：${result.reason.stack}`);
+        }
+      });
+    }
   }
 
   async UploadImage (img: PacketMsgPicElement) {

packages/napcat-webui-backend/src/api/BackupConfig.ts

@@ -0,0 +1,151 @@
+import { RequestHandler } from 'express';
+import { existsSync, readdirSync, writeFileSync, readFileSync } from 'node:fs';
+import { join, normalize } from 'node:path';
+import { webUiPathWrapper } from '@/napcat-webui-backend/index';
+import { WebUiDataRuntime } from '@/napcat-webui-backend/src/helper/Data';
+import { sendError, sendSuccess } from '@/napcat-webui-backend/src/utils/response';
+import compressing from 'compressing';
+import { Readable } from 'node:stream';
+
+// 使用compressing库进行流式压缩导出
+export const BackupExportConfigHandler: RequestHandler = async (_req, res) => {
+  const isLogin = WebUiDataRuntime.getQQLoginStatus();
+  if (!isLogin) {
+    return sendError(res, 'Not Login');
+  }
+
+  try {
+    const configPath = webUiPathWrapper.configPath;
+
+    if (!existsSync(configPath)) {
+      return sendError(res, '配置目录不存在');
+    }
+
+    const formatDate = (date: Date) => {
+      return date.toISOString().replace(/[:.]/g, '-');
+    };
+    const zipFileName = `config_backup_${formatDate(new Date())}.zip`;
+
+    // 设置响应头
+    res.setHeader('Content-Type', 'application/zip');
+    res.setHeader('Content-Disposition', `attachment; filename="${zipFileName}"`);
+
+    // 使用compressing的Stream API进行流式压缩
+    const stream = new compressing.zip.Stream();
+
+    // 添加目录下的所有文件到压缩流（单层平坦结构）
+    const entries = readdirSync(configPath, { withFileTypes: true });
+    for (const entry of entries) {
+      if (entry.isFile()) {
+        const entryPath = join(configPath, entry.name);
+        stream.addEntry(entryPath, { relativePath: entry.name });
+      }
+    }
+
+    // 管道传输到响应
+    stream.pipe(res);
+
+    // 处理流错误
+    stream.on('error', (err) => {
+      console.error('压缩流错误:', err);
+      if (!res.headersSent) {
+        sendError(res, '流式压缩失败');
+      }
+    });
+
+  } catch (error) {
+    const msg = (error as Error).message;
+    console.error('导出配置失败:', error);
+    if (!res.headersSent) {
+      return sendError(res, `导出配置失败: ${msg}`);
+    }
+  }
+};
+
+// 从内存Buffer流式解压，返回文件名和内容的映射
+async function extractZipToMemory (buffer: Buffer): Promise<Map<string, Buffer>> {
+  return new Promise((resolve, reject) => {
+    const files = new Map<string, Buffer>();
+    const bufferStream = Readable.from(buffer);
+    const uncompressStream = new compressing.zip.UncompressStream();
+
+    uncompressStream.on('entry', (header, stream, next) => {
+      // 只处理文件，忽略目录
+      if (header.type === 'file') {
+        const chunks: Buffer[] = [];
+        stream.on('data', (chunk) => chunks.push(Buffer.from(chunk)));
+        stream.on('end', () => {
+          // 取文件名（忽略路径中的目录部分）
+          const fileName = header.name.split('/').pop() || header.name;
+          files.set(fileName, Buffer.concat(chunks));
+          next();
+        });
+        stream.on('error', (err) => {
+          console.error(`读取文件失败: ${header.name}`, err);
+          next();
+        });
+      } else {
+        stream.resume();
+        next();
+      }
+    });
+
+    uncompressStream.on('finish', () => resolve(files));
+    uncompressStream.on('error', reject);
+
+    bufferStream.pipe(uncompressStream);
+  });
+}
+
+// 导入配置 - 流式处理，完全在内存中解压
+export const BackupImportConfigHandler: RequestHandler = async (req, res) => {
+  // 检查是否有文件上传（multer memoryStorage 模式下文件在 req.file.buffer）
+  if (!req.file || !req.file.buffer) {
+    return sendError(res, '请选择要导入的配置文件');
+  }
+
+  try {
+    const configPath = webUiPathWrapper.configPath;
+
+    // 从内存中解压zip
+    const extractedFiles = await extractZipToMemory(req.file.buffer);
+
+    if (extractedFiles.size === 0) {
+      return sendError(res, '配置文件为空或格式不正确');
+    }
+
+    // 备份当前配置到内存
+    const backupFiles = new Map<string, Buffer>();
+    if (existsSync(configPath)) {
+      const currentFiles = readdirSync(configPath, { withFileTypes: true });
+      for (const entry of currentFiles) {
+        if (entry.isFile()) {
+          const filePath = join(configPath, entry.name);
+          backupFiles.set(entry.name, readFileSync(filePath));
+        }
+      }
+    }
+
+    // 写入新的配置文件
+    for (const [fileName, content] of extractedFiles) {
+      // 防止路径穿越攻击
+      const destPath = join(configPath, fileName);
+      const normalizedPath = normalize(destPath);
+      if (!normalizedPath.startsWith(normalize(configPath))) {
+        continue;
+      }
+      writeFileSync(destPath, content);
+    }
+
+    return sendSuccess(res, {
+      message: '配置导入成功，重启后生效~',
+      filesImported: extractedFiles.size,
+      filesBackedUp: backupFiles.size
+    });
+
+  } catch (error) {
+    console.error('导入配置失败:', error);
+    const msg = (error as Error).message;
+    return sendError(res, `导入配置失败: ${msg}`);
+  }
+};

packages/napcat-webui-backend/src/router/OB11Config.ts

@@ -1,11 +1,24 @@
 import { Router } from 'express';
+import multer from 'multer';
 
 import { OB11GetConfigHandler, OB11SetConfigHandler } from '@/napcat-webui-backend/src/api/OB11Config';
+import { BackupExportConfigHandler, BackupImportConfigHandler } from '@/napcat-webui-backend/src/api/BackupConfig';
 
 const router: Router = Router();
+
+// 使用内存存储，配合流式处理
+const upload = multer({
+  storage: multer.memoryStorage()
+});
+
 // router:读取配置
 router.post('/GetConfig', OB11GetConfigHandler);
 // router:写入配置
 router.post('/SetConfig', OB11SetConfigHandler);
+// router:导出配置
+router.get('/ExportConfig', BackupExportConfigHandler);
+// router:导入配置
+router.post('/ImportConfig', upload.single('configFile'), BackupImportConfigHandler);
 
 export { router as OB11ConfigRouter };
+

packages/napcat-webui-frontend/src/pages/dashboard/config/backup.tsx

@@ -0,0 +1,129 @@
+import { Button } from '@heroui/button';
+import toast from 'react-hot-toast';
+import { LuDownload, LuUpload } from 'react-icons/lu';
+import { requestServerWithFetch } from '@/utils/request';
+
+// 导入配置
+const handleImportConfig = async (event: React.ChangeEvent<HTMLInputElement>) => {
+  const file = event.target.files?.[0];
+  if (!file) return;
+
+  // 检查文件类型
+  if (!file.name.endsWith('.zip')) {
+    toast.error('请选择zip格式的配置文件');
+    return;
+  }
+
+  try {
+    const formData = new FormData();
+    formData.append('configFile', file);
+
+    const response = await requestServerWithFetch('/OB11Config/ImportConfig', {
+      method: 'POST',
+      body: formData,
+    });
+
+    if (!response.ok) {
+      const errorData = await response.json();
+      throw new Error(errorData.message || '导入配置失败');
+    }
+
+    const result = await response.json();
+    // 检查是否成功导入
+    if (result.code === 0) {
+      toast.success(result.data?.message || '配置导入成功。');
+    } else {
+      toast.error(`配置导入失败: ${result.data?.message || '未知错误'}`);
+    }
+
+  } catch (error) {
+    const msg = (error as Error).message;
+    toast.error(`导入配置失败: ${msg}`);
+  } finally {
+    // 重置文件输入
+    event.target.value = '';
+  }
+};
+
+// 导出配置
+const handleExportConfig = async () => {
+  try {
+    const response = await requestServerWithFetch('/OB11Config/ExportConfig', {
+      method: 'GET',
+    });
+
+    if (!response.ok) {
+      throw new Error('导出配置失败');
+    }
+
+    // 创建下载链接
+    const blob = await response.blob();
+    const url = window.URL.createObjectURL(blob);
+    const a = document.createElement('a');
+    a.href = url;
+    const fileName = response.headers.get('Content-Disposition')?.split('=')[1]?.replace(/"/g, '') || 'config_backup.zip';
+    a.download = fileName;
+    document.body.appendChild(a);
+    a.click();
+    window.URL.revokeObjectURL(url);
+    document.body.removeChild(a);
+
+    toast.success('配置导出成功');
+  } catch (error) {
+    const msg = (error as Error).message;
+
+    toast.error(`导出配置失败: ${msg}`);
+  }
+};
+
+const BackupConfigCard: React.FC = () => {
+  return (
+    <div className='space-y-6'>
+      <div>
+        <h3 className='text-lg font-medium mb-4'>备份与恢复</h3>
+        <p className='text-sm text-default-500 mb-4'>
+          您可以通过导入/导出配置文件来备份和恢复NapCat的所有设置
+        </p>
+
+        <div className='flex flex-wrap gap-3'>
+          <Button
+            isIconOnly
+            className="bg-primary hover:bg-primary/90 text-white"
+            radius='full'
+            onPress={handleExportConfig}
+            title="导出配置"
+          >
+            <LuDownload size={20} />
+          </Button>
+          <label className="cursor-pointer">
+            <input
+              type="file"
+              accept=".zip"
+              onChange={handleImportConfig}
+              className="hidden"
+            />
+            <Button
+              isIconOnly
+              className="bg-primary hover:bg-primary/90 text-white"
+              radius='full'
+              as="span"
+              title="导入配置"
+            >
+              <LuUpload size={20} />
+            </Button>
+          </label>
+        </div>
+
+        <div className='mt-4 p-3 bg-warning/10 border border-warning/20 rounded-lg'>
+          <div className='flex items-start gap-2'>
+            <p className='text-sm text-warning'>
+              导入配置会覆盖当前所有设置，请谨慎操作。导入前建议先导出当前配置作为备份。
+            </p>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default BackupConfigCard;

packages/napcat-webui-frontend/src/pages/dashboard/config/index.tsx

@@ -13,6 +13,7 @@ import ServerConfigCard from './server';
 import SSLConfigCard from './ssl';
 import ThemeConfigCard from './theme';
 import WebUIConfigCard from './webui';
+import BackupConfigCard from './backup';
 
 export interface ConfigPageProps {
   children?: React.ReactNode;
@@ -108,6 +109,11 @@ export default function ConfigPage () {
             <ThemeConfigCard />
           </ConfigPageItem>
         </Tab>
+        <Tab title='备份与恢复' key='backup'>
+          <ConfigPageItem>
+            <BackupConfigCard />
+          </ConfigPageItem>
+        </Tab>
       </Tabs>
     </section>
   );

packages/napcat-webui-frontend/src/pages/dashboard/network.tsx

@@ -2,10 +2,9 @@ import { Button } from '@heroui/button';
 import { useDisclosure } from '@heroui/modal';
 import { Tab, Tabs } from '@heroui/tabs';
 import clsx from 'clsx';
-import { useEffect, useMemo, useRef, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import toast from 'react-hot-toast';
 import { IoMdRefresh } from 'react-icons/io';
-import { FiDownload, FiUpload } from 'react-icons/fi';
 
 import AddButton from '@/components/button/add_button';
 import HTTPClientDisplayCard from '@/components/display_card/http_client';
@@ -56,9 +55,7 @@ export default function NetworkPage () {
     deleteNetworkConfig,
     enableNetworkConfig,
     enableDebugNetworkConfig,
-    updateSingleConfig,
   } = useConfig();
-  const fileInputRef = useRef<HTMLInputElement>(null);
   const [activeField, setActiveField] =
     useState<keyof OneBotConfig['network']>('httpServers');
   const [activeName, setActiveName] = useState<string>('');
@@ -102,45 +99,6 @@ export default function NetworkPage () {
     onOpen();
   };
 
-  // 导出网络配置
-  const handleExport = () => {
-    const blob = new Blob([JSON.stringify(config.network, null, 2)], { type: 'application/json' });
-    const link = document.createElement('a');
-    link.href = URL.createObjectURL(blob);
-    link.download = `network-config-${Date.now()}.json`;
-    link.click();
-    URL.revokeObjectURL(link.href);
-    toast.success('导出成功');
-  };
-
-  // 导入网络配置
-  const handleFileChange = async (e: React.ChangeEvent<HTMLInputElement>) => {
-    const file = e.target.files?.[0];
-    if (!file) return;
-    e.target.value = '';
-
-    try {
-      const data = JSON.parse(await file.text()) as OneBotConfig['network'];
-      const keys: (keyof OneBotConfig['network'])[] = ['httpServers', 'httpClients', 'httpSseServers', 'websocketServers', 'websocketClients'];
-      if (keys.some(k => !Array.isArray(data[k]))) throw new Error('配置格式错误');
-
-      dialog.confirm({
-        title: '导入配置',
-        content: '确定导入？这将覆盖现有网络配置。',
-        onConfirm: async () => {
-          try {
-            await updateSingleConfig('network', data);
-            toast.success('导入成功');
-          } catch (err) {
-            toast.error(`导入失败: ${(err as Error).message}`);
-          }
-        },
-      });
-    } catch (err) {
-      toast.error(`解析失败: ${(err as Error).message}`);
-    }
-  };
-
   const onDelete = async (
     field: keyof OneBotConfig['network'],
     name: string
@@ -415,21 +373,6 @@ export default function NetworkPage () {
         <PageLoading loading={loading} />
         <div className='flex mb-6 items-center gap-4'>
           <AddButton onOpen={handleClickCreate} />
-          <Button
-            className="bg-default-100/50 hover:bg-default-200/50 text-default-700 backdrop-blur-md"
-            startContent={<FiUpload size={18} />}
-            onPress={handleExport}
-          >
-            导出
-          </Button>
-          <Button
-            className="bg-default-100/50 hover:bg-default-200/50 text-default-700 backdrop-blur-md"
-            startContent={<FiDownload size={18} />}
-            onPress={() => fileInputRef.current?.click()}
-          >
-            导入
-          </Button>
-          <input ref={fileInputRef} type="file" accept=".json" className="hidden" onChange={handleFileChange} />
           <Button
             isIconOnly
             className="bg-default-100/50 hover:bg-default-200/50 text-default-700 backdrop-blur-md"