Add 42941 version mappings to external JSON files

Added new entries for version 42941 to appid.json, napi2native.json, and packet.json, including mappings for x64 and arm64 architectures. This update ensures support for the latest client versions and their corresponding identifiers and packet mappings.

README.md

@@ -43,7 +43,7 @@ _Modern protocol-side framework implemented based on NTQQ._
 
 **首次使用**请务必查看如下文档看使用教程
 
-> 项目非盈利，对接问题/基础问题/下层框架问题 请自行搜索解决，本项目社区不提供此类解答。
+> 项目非盈利，涉及 对接问题/基础问题/下层框架问题 请自行搜索解决，本项目社区不提供此类解答。
 
 ## Link
 

packages/napcat-common/src/helper.ts

@@ -268,7 +268,8 @@ export async function getLatestTag (): Promise<string> {
   if (!latest) {
     throw new Error('No tags found');
   }
-  return latest;
+  // 去掉开头的 v
+  return latest.replace(/^v/, '');
 }
 
 

packages/napcat-core/adapters/NodeIDependsAdapter.ts

@@ -5,7 +5,7 @@ export class NodeIDependsAdapter {
 
   }
 
-  onMSFSsoError (_args: unknown) {
+  onMSFSsoError (_code: number, _desc: string) {
 
   }
 

packages/napcat-core/external/appid.json

@@ -466,5 +466,37 @@
   "6.9.85-42086": {
     "appid": 537320237,
     "qua": "V1_MAC_NQ_6.9.85_42086_GW_B"
+  },
+  "9.9.23-42430": {
+    "appid": 537320212,
+    "qua": "V1_WIN_NQ_9.9.23_42430_GW_B"
+  },
+  "9.9.25-42744": {
+    "appid": 537328470,
+    "qua": "V1_WIN_NQ_9.9.23_42744_GW_B"
+  },
+  "6.9.86-42744": {
+    "appid": 537328495,
+    "qua": "V1_MAC_NQ_6.9.85_42744_GW_B"
+  },
+  "9.9.25-42905": {
+    "appid": 537328521,
+    "qua": "V1_WIN_NQ_9.9.25_42905_GW_B"
+  },
+  "6.9.86-42905": {
+    "appid": 537328546,
+    "qua": "V1_MAC_NQ_6.9.86_42905_GW_B"
+  },
+  "3.2.22-42941": {
+    "appid": 537328659,
+    "qua": "V1_LNX_NQ_3.2.22_42941_GW_B"
+  },
+  "9.9.25-42941": {
+    "appid": 537328623,
+    "qua": "V1_WIN_NQ_9.9.25_42941_GW_B"
+  },
+  "6.9.86-42941": {
+    "appid": 537328648,
+    "qua": "V1_MAC_NQ_6.9.86_42941_GW_B"
   }
 }

packages/napcat-core/external/napi2native.json

@@ -90,5 +90,41 @@
   "3.2.21-42086-x64": {
     "send": "5B42CF0",
     "recv": "2FDA6F0"
+  },
+  "9.9.23-42430-x64": {
+    "send": "0A01A34",
+    "recv": "1D1CFF9"
+  },
+  "9.9.25-42744-x64": {
+    "send": "0A0D104",
+    "recv": "1D3E7F9"
+  },
+  "6.9.85-42744-arm64": {
+    "send": "23DFEF0",
+    "recv": "095FD80"
+  },
+  "9.9.25-42905-x64": {
+    "send": "0A12E74",
+    "recv": "1D450FD"
+  },
+  "6.9.86-42905-arm64": {
+    "send": "2342408",
+    "recv": "09639B8"
+  },
+  "3.2.22-42941-x64": {
+    "send": "5BC1630",
+    "recv": "3011E00"
+  },
+  "3.2.22-42941-arm64": {
+    "send": "3DC90AC",
+    "recv": "1497A70"
+  },
+  "9.9.25-42941-x64": {
+    "send": "0A131D4",
+    "recv": "1D4547D"
+  },
+  "6.9.86-42941-arm64": {
+    "send": "2346108",
+    "recv": "09675F0"
   }
 }

packages/napcat-core/external/packet.json

@@ -602,5 +602,41 @@
   "3.2.21-42086-arm64": {
     "send": "6B13038",
     "recv": "6B169C8"
+  },
+  "9.9.23-42430-x64": {
+    "send": "2C9A4A0",
+    "recv": "2C9DA20"
+  },
+  "9.9.25-42744-x64": {
+    "send": "2CD8E40",
+    "recv": "2CDC3C0"
+  },
+  "6.9.86-42744-arm64": {
+    "send": "3DCC840",
+    "recv": "3DCF150"
+  },
+  "9.9.25-42905-x64": {
+    "send": "2CE46A0",
+    "recv": "2CE7C20"
+  },
+  "6.9.86-42905-arm64": {
+    "send": "3DD6098",
+    "recv": "3DD89A8"
+  },
+  "3.2.22-42941-x64": {
+    "send": "A8AD8A0",
+    "recv": "A8B1320"
+  },
+  "9.9.25-42941-x64": {
+    "send": "2CE4DA0",
+    "recv": "2CE8320"
+  },
+  "3.2.22-42941-arm64": {
+    "send": "6BC95E8",
+    "recv": "6BCCF78"
+  },
+  "6.9.86-42941-arm64": {
+    "send": "3DDDAD0",
+    "recv": "3DE03E0"
   }
 }

packages/napcat-core/listeners/NodeIKernelStorageCleanListener.ts

@@ -3,7 +3,7 @@ export class NodeIKernelStorageCleanListener {
 
   }
 
-  onScanCacheProgressChanged (_args: unknown): any {
+  onScanCacheProgressChanged (_current_progress: number, _total_progress: number): any {
 
   }
 
@@ -11,7 +11,7 @@ export class NodeIKernelStorageCleanListener {
 
   }
 
-  onFinishScan (_args: unknown): any {
+  onFinishScan (_sizes: Array<`${number}`>): any {
 
   }
 

packages/napcat-core/services/NodeIKernelStorageCleanService.ts

@@ -3,39 +3,56 @@ import { GeneralCallResult } from './common';
 
 export interface NodeIKernelStorageCleanService {
 
-  addKernelStorageCleanListener(listener: NodeIKernelStorageCleanListener): number;
+  addKernelStorageCleanListener (listener: NodeIKernelStorageCleanListener): number;
 
-  removeKernelStorageCleanListener(listenerId: number): void;
+  removeKernelStorageCleanListener (listenerId: number): void;
+  // [
+  // "hotUpdate",
+  // [
+  //   "C:\\Users\\nanaeo\\AppData\\Roaming\\QQ\\packages"
+  // ]
+  // ],
+  // [
+  // "tmp",
+  // [
+  //   "C:\\Users\\nanaeo\\AppData\\Roaming\\QQ\\tmp"
+  // ]
+  // ],
+  // [
+  // "SilentCacheappSessionPartation9212",
+  // [
+  //   "C:\\Users\\nanaeo\\AppData\\Roaming\\QQ\\Partitions\\qqnt_9212"
+  // ]
+  // ]
+  addCacheScanedPaths (paths: Map<`tmp` | `SilentCacheappSessionPartation9212` | `hotUpdate`, unknown>): unknown;
 
-  addCacheScanedPaths(arg: unknown): unknown;
+  addFilesScanedPaths (arg: unknown): unknown;
 
-  addFilesScanedPaths(arg: unknown): unknown;
-
-  scanCache(): Promise<GeneralCallResult & {
-    size: string[]
+  scanCache (): Promise<GeneralCallResult & {
+    size: string[];
   }>;
 
-  addReportData(arg: unknown): unknown;
+  addReportData (arg: unknown): unknown;
 
-  reportData(): unknown;
+  reportData (): unknown;
 
-  getChatCacheInfo(arg1: unknown, arg2: unknown, arg3: unknown, arg4: unknown): unknown;
+  getChatCacheInfo (arg1: unknown, arg2: unknown, arg3: unknown, arg4: unknown): unknown;
 
-  getFileCacheInfo(arg1: unknown, arg2: unknown, arg3: unknown, arg44: unknown, args5: unknown): unknown;
+  getFileCacheInfo (arg1: unknown, arg2: unknown, arg3: unknown, arg44: unknown, args5: unknown): unknown;
 
-  clearChatCacheInfo(arg1: unknown, arg2: unknown): unknown;
+  clearChatCacheInfo (arg1: unknown, arg2: unknown): unknown;
 
-  clearCacheDataByKeys(arg: unknown): unknown;
+  clearCacheDataByKeys (keys: Array<string>): Promise<GeneralCallResult>;
 
-  setSilentScan(arg: unknown): unknown;
+  setSilentScan (is_silent: boolean): unknown;
 
-  closeCleanWindow(): unknown;
+  closeCleanWindow (): unknown;
 
-  clearAllChatCacheInfo(): unknown;
+  clearAllChatCacheInfo (): unknown;
 
-  endScan(arg: unknown): unknown;
+  endScan (arg: unknown): unknown;
 
-  addNewDownloadOrUploadFile(arg: unknown): unknown;
+  addNewDownloadOrUploadFile (arg: unknown): unknown;
 
-  isNull(): boolean;
+  isNull (): boolean;
 }

packages/napcat-vite/vite-plugin-version.js

@@ -26,7 +26,7 @@ export default function vitePluginNapcatVersion () {
         const data = JSON.parse(fs.readFileSync(cacheFile, 'utf8'));
         if (data?.tag) return data.tag;
       }
-    } catch {}
+    } catch { }
     return null;
   }
 
@@ -36,7 +36,7 @@ export default function vitePluginNapcatVersion () {
         cacheFile,
         JSON.stringify({ tag, time: new Date().toISOString() }, null, 2)
       );
-    } catch {}
+    } catch { }
   }
 
   async function fetchLatestTag () {
@@ -58,7 +58,7 @@ export default function vitePluginNapcatVersion () {
             try {
               const json = JSON.parse(data);
               if (Array.isArray(json) && json[0]?.name) {
-                resolve(json[0].name);
+                resolve(json[0].name.replace(/^v/, ''));
               } else reject(new Error('Invalid GitHub tag response'));
             } catch (e) {
               reject(e);
@@ -79,7 +79,7 @@ export default function vitePluginNapcatVersion () {
       return tag;
     } catch (e) {
       console.warn('[vite-plugin-napcat-version] Failed to fetch tag:', e.message);
-      return cached ?? 'v0.0.0';
+      return cached ?? '0.0.0';
     }
   }
 
@@ -110,7 +110,7 @@ export default function vitePluginNapcatVersion () {
             lastTag = tag;
             ctx.server?.ws.send({ type: 'full-reload' });
           }
-        } catch {}
+        } catch { }
       }
     },
   };

packages/napcat-webui-frontend/.gitignore

@@ -26,7 +26,5 @@ dist-ssr
 # NPM LOCK files
 package-lock.json
 yarn.lock
-pnpm-lock.yaml
-
 
 dist.zip

packages/napcat-webui-frontend/src/components/sidebar/index.tsx

@@ -1,7 +1,7 @@
 import { Button } from '@heroui/button';
 import { Image } from '@heroui/image';
 import clsx from 'clsx';
-import { motion } from 'motion/react';
+import { AnimatePresence, motion } from 'motion/react';
 import React from 'react';
 import { IoMdLogOut } from 'react-icons/io';
 import { MdDarkMode, MdLightMode } from 'react-icons/md';
@@ -18,10 +18,11 @@ import Menus from './menus';
 interface SideBarProps {
   open: boolean
   items: MenuItem[]
+  onClose?: () => void
 }
 
 const SideBar: React.FC<SideBarProps> = (props) => {
-  const { open, items } = props;
+  const { open, items, onClose } = props;
   const { toggleTheme, isDark } = useTheme();
   const { revokeAuth } = useAuth();
   const dialog = useDialog();
@@ -33,60 +34,75 @@ const SideBar: React.FC<SideBarProps> = (props) => {
     });
   };
   return (
-    <motion.div
-      className={clsx(
-        'overflow-hidden fixed top-0 left-0 h-full z-50 bg-background md:bg-transparent md:static shadow-md md:shadow-none rounded-r-md md:rounded-none'
-      )}
-      initial={{ width: 0 }}
-      animate={{ width: open ? '16rem' : 0 }}
-      transition={{
-        type: open ? 'spring' : 'tween',
-        stiffness: 150,
-        damping: open ? 15 : 10,
-      }}
-      style={{ overflow: 'hidden' }}
-    >
-      <motion.div className='w-64 flex flex-col items-stretch h-full transition-transform duration-300 ease-in-out z-30 relative float-right'>
-        <div className='flex justify-center items-center my-2 gap-2'>
-          <Image radius='none' height={40} src={logo} className='mb-2' />
-          <div
-            className={clsx(
-              'flex items-center font-bold',
-              '!text-2xl shiny-text'
-            )}
-          >
-            NapCat
-          </div>
-        </div>
-        <div className='overflow-y-auto flex flex-col flex-1 px-4'>
-          <Menus items={items} />
-          <div className='mt-auto mb-10 md:mb-0'>
-            <Button
-              className='w-full'
-              color='primary'
-              radius='full'
-              variant='light'
-              onPress={toggleTheme}
-              startContent={
-                !isDark ? <MdLightMode size={16} /> : <MdDarkMode size={16} />
-              }
+    <>
+      <AnimatePresence initial={false}>
+        {open && (
+          <motion.div
+            className='fixed inset-y-0 left-64 right-0 bg-black/20 backdrop-blur-[1px] z-40 md:hidden'
+            aria-hidden='true'
+            onClick={onClose}
+            initial={{ opacity: 0 }}
+            animate={{ opacity: 1 }}
+            exit={{ opacity: 0, transition: { duration: 0.15 } }}
+            transition={{ duration: 0.2, delay: 0.15 }}
+          />
+        )}
+      </AnimatePresence>
+      <motion.div
+        className={clsx(
+          'overflow-hidden fixed top-0 left-0 h-full z-50 bg-background md:bg-transparent md:static shadow-md md:shadow-none rounded-r-md md:rounded-none'
+        )}
+        initial={{ width: 0 }}
+        animate={{ width: open ? '16rem' : 0 }}
+        transition={{
+          type: open ? 'spring' : 'tween',
+          stiffness: 150,
+          damping: open ? 15 : 10,
+        }}
+        style={{ overflow: 'hidden' }}
+      >
+        <motion.div className='w-64 flex flex-col items-stretch h-full transition-transform duration-300 ease-in-out z-30 relative float-right'>
+          <div className='flex justify-center items-center my-2 gap-2'>
+            <Image radius='none' height={40} src={logo} className='mb-2' />
+            <div
+              className={clsx(
+                'flex items-center font-bold',
+                '!text-2xl shiny-text'
+              )}
             >
-              切换主题
-            </Button>
-            <Button
-              className='w-full mb-2'
-              color='primary'
-              radius='full'
-              variant='light'
-              onPress={onRevokeAuth}
-              startContent={<IoMdLogOut size={16} />}
-            >
-              退出登录
-            </Button>
+              NapCat
+            </div>
           </div>
-        </div>
+          <div className='overflow-y-auto flex flex-col flex-1 px-4'>
+            <Menus items={items} />
+            <div className='mt-auto mb-10 md:mb-0'>
+              <Button
+                className='w-full'
+                color='primary'
+                radius='full'
+                variant='light'
+                onPress={toggleTheme}
+                startContent={
+                  !isDark ? <MdLightMode size={16} /> : <MdDarkMode size={16} />
+                }
+              >
+                切换主题
+              </Button>
+              <Button
+                className='w-full mb-2'
+                color='primary'
+                radius='full'
+                variant='light'
+                onPress={onRevokeAuth}
+                startContent={<IoMdLogOut size={16} />}
+              >
+                退出登录
+              </Button>
+            </div>
+          </div>
+        </motion.div>
       </motion.div>
-    </motion.div>
+    </>
   );
 };
 

packages/napcat-webui-frontend/src/components/system_info.tsx

@@ -218,12 +218,12 @@ const NewVersionTip = (props: NewVersionTipProps) => {
                 <div className='text-sm space-x-2'>
                   <span>当前版本</span>
                   <Chip color='primary' variant='flat'>
-                    {currentVersion}
+                    v{currentVersion}
                   </Chip>
                 </div>
                 <div className='text-sm space-x-2'>
                   <span>最新版本</span>
-                  <Chip color='primary'>{latestVersion}</Chip>
+                  <Chip color='primary'>v{latestVersion}</Chip>
                 </div>
                 {updating && (
                   <div className='flex justify-center'>

packages/napcat-webui-frontend/src/layouts/default.tsx

@@ -85,7 +85,11 @@ const Layout: React.FC<{ children: React.ReactNode; }> = ({ children }) => {
         backgroundSize: 'cover',
       }}
     >
-      <SideBar items={menus} open={openSideBar} />
+      <SideBar
+        items={menus}
+        open={openSideBar}
+        onClose={() => setOpenSideBar(false)}
+      />
       <div
         ref={contentRef}
         className={clsx(
@@ -107,7 +111,7 @@ const Layout: React.FC<{ children: React.ReactNode; }> = ({ children }) => {
         >
           <motion.div
             className={clsx(
-              'mr-1 ease-in-out ml-0 md:relative',
+              'mr-1 ease-in-out ml-0 md:relative z-50 md:z-auto',
               openSideBar && 'pl-2 absolute',
               'md:!ml-0 md:pl-0'
             )}

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

@@ -1,5 +1,4 @@
 import { Card, CardBody } from '@heroui/card';
-import { Button } from '@heroui/button';
 import { Image } from '@heroui/image';
 import { Link } from '@heroui/link';
 import { Skeleton } from '@heroui/skeleton';
@@ -8,7 +7,6 @@ import { useRequest } from 'ahooks';
 import { useMemo } from 'react';
 import { BsTelegram, BsTencentQq } from 'react-icons/bs';
 import { IoDocument } from 'react-icons/io5';
-import toast from 'react-hot-toast';
 
 import HoverTiltedCard from '@/components/hover_titled_card';
 import NapCatRepoInfo from '@/components/napcat_repo_info';
@@ -23,40 +21,6 @@ import WebUIManager from '@/controllers/webui_manager';
 function VersionInfo () {
   const { data, loading, error } = useRequest(WebUIManager.GetNapCatVersion);
 
-  // 更新NapCat
-  const { run: updateNapCat, loading: updating } = useRequest(
-    WebUIManager.UpdateNapCat,
-    {
-      manual: true,
-      onSuccess: (response) => {
-        console.log('UpdateNapCat onSuccess response:', response);
-        console.log('response.code:', response.code);
-        console.log('response.data:', response.data);
-        console.log('response.message:', response.message);
-
-        if (response.code === 0) {
-          const message = response.data?.message || '更新完成';
-          console.log('显示消息:', message);
-          toast.success(message, {
-            duration: 5000,
-          });
-        } else {
-          console.log('显示错误消息:', response.message || '更新失败');
-          toast.error(response.message || '更新失败');
-        }
-      },
-      onError: (error) => {
-        toast.error('更新失败: ' + error.message);
-      },
-    }
-  );
-
-  const handleUpdate = () => {
-    if (!updating) {
-      updateNapCat();
-    }
-  };
-
   return (
     <div className='flex items-center gap-4'>
       <div className='flex items-center gap-2 text-2xl font-bold'>
@@ -84,16 +48,6 @@ function VersionInfo () {
               />
             )}
       </div>
-      <Button
-        color="primary"
-        variant="solid"
-        size="sm"
-        isLoading={updating}
-        onPress={handleUpdate}
-        isDisabled={updating}
-      >
-        {updating ? '更新中...' : '更新'}
-      </Button>
     </div>
   );
 }