release: 2.6.24

launcher/launcher-win10.bat

@@ -33,7 +33,7 @@ if not exist "%QQpath%" (
     exit /b
 )
 set NAPCAT_MAIN_PATH=%NAPCAT_MAIN_PATH:\=/%
-echo (async () =^> {await import("file:///%NAPCAT_MAIN_PATH%")})() > %NAPCAT_LOAD_PATH%
+echo (async () =^> {await import("file:///%NAPCAT_MAIN_PATH%")})() > "%NAPCAT_LOAD_PATH%"
 
 "%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%" %1
 

manifest.json

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

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "2.6.21",
+  "version": "2.6.24",
   "scripts": {
     "build:framework": "vite build --mode framework",
     "build:shell": "vite build --mode shell",
@@ -13,7 +13,6 @@
   "devDependencies": {
     "@babel/preset-typescript": "^7.24.7",
     "@log4js-node/log4js-api": "^1.0.2",
-    "@protobuf-ts/runtime": "^2.9.4",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-typescript": "^11.1.6",
     "@types/cors": "^2.8.17",
@@ -30,24 +29,24 @@
     "typescript": "^5.3.3",
     "vite": "^5.2.6",
     "vite-plugin-cp": "^4.0.8",
-    "vite-tsconfig-paths": "^4.3.2"
-  },
-  "dependencies": {
+    "vite-tsconfig-paths": "^4.3.2",
+    "@protobuf-ts/runtime": "^2.9.4",
     "ajv": "^8.13.0",
-    "@protobuf-ts/plugin": "^2.9.4",
-    "async-mutex": "^0.5.0",
+    "fast-xml-parser": "^4.3.6",
     "chalk": "^5.3.0",
     "commander": "^12.1.0",
-    "cors": "^2.8.5",
-    "express": "^5.0.0-beta.2",
-    "fast-xml-parser": "^4.3.6",
+    "async-mutex": "^0.5.0",
     "file-type": "^19.0.0",
-    "fluent-ffmpeg": "^2.1.2",
-    "image-size": "^1.1.1",
     "json-schema-to-ts": "^3.1.0",
-    "log4js": "^6.9.1",
+    "image-size": "^1.1.1",
+    "cors": "^2.8.5"
+  },
+  "dependencies": {
     "qrcode-terminal": "^0.12.0",
+    "fluent-ffmpeg": "^2.1.2",
+    "express": "^5.0.0-beta.2",
+    "log4js": "^6.9.1",
     "silk-wasm": "^3.6.1",
     "ws": "^8.18.0"
   }
-}
+}

src/common/qq-basic-info.ts

@@ -53,26 +53,22 @@ export class QQBasicInfoWrapper {
     }
 
     //此方法不要直接使用
-    getQUAInternal() {
-        switch (systemPlatform) {
-        case 'linux':
-            return `V1_LNX_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`;
-        case 'darwin':
-            return `V1_MAC_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`;
-        default:
-            return `V1_WIN_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`;
-        }
+    getQUAFallback() {
+        const platformMapping: Partial<Record<NodeJS.Platform, string>> = {
+            win32: `V1_WIN_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`,
+            darwin: `V1_MAC_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`,
+            linux: `V1_LNX_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`,
+        };
+        return platformMapping[systemPlatform] ?? (platformMapping.win32)!;
     }
 
-    getAppidInternal() {
-        switch (systemPlatform) {
-        case 'linux':
-            return '537246140';
-        case 'darwin':
-            return '537246140';
-        default:
-            return '537246092';
-        }
+    getAppIdFallback() {
+        const platformMapping: Partial<Record<NodeJS.Platform, string>> = {
+            win32: '537246092',
+            darwin: '537246140',
+            linux: '537246140',
+        };
+        return platformMapping[systemPlatform] ?? '537246092';
     }
 
     getAppidV2(): { appid: string; qua: string } {
@@ -88,6 +84,6 @@ export class QQBasicInfoWrapper {
         // else
         this.context.logger.log(`[QQ版本兼容性检测] 获取Appid异常 请检测NapCat/QQNT是否正常`);
         this.context.logger.log(`[QQ版本兼容性检测] ${fullVersion} 版本兼容性不佳，可能会导致一些功能无法正常使用`,);
-        return { appid: this.getAppidInternal(), qua: this.getQUAInternal() };
+        return { appid: this.getAppIdFallback(), qua: this.getQUAFallback() };
     }
 }

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '2.6.21';
+export const napCatVersion = '2.6.24';

src/core/apis/file.ts

@@ -396,7 +396,9 @@ export class NTQQFileApi {
                 return IMAGE_HTTP_HOST + `/download?appid=${imageAppid}&fileid=${imageFileId}&rkey=${rkey}`;
             }
 
-        } else if (fileMd5 || md5HexStr) {
+        }
+        //到这里说明可能是旧客户端
+        if (fileMd5 || md5HexStr) {
             return `${IMAGE_HTTP_HOST}/gchatpic_new/0/0-0-${(fileMd5 ?? md5HexStr)!.toUpperCase()}/0`;
         }
 

src/core/index.ts

@@ -20,11 +20,11 @@ import { LogLevel, LogWrapper } from '@/common/log';
 import { NodeIKernelLoginService } from '@/core/services';
 import { QQBasicInfoWrapper } from '@/common/qq-basic-info';
 import { NapCatPathWrapper } from '@/common/path';
-import path, { resolve } from 'node:path';
+import path from 'node:path';
 import fs from 'node:fs';
 import { hostname, systemName, systemVersion } from '@/common/system';
 import { NTEventWrapper } from '@/common/event';
-import { ChatType, DataSource, GroupMember, KickedOffLineInfo, Peer, SelfInfo, SelfStatusInfo } from '@/core/entities';
+import { DataSource, GroupMember, KickedOffLineInfo, SelfInfo, SelfStatusInfo } from '@/core/entities';
 import { NapCatConfigLoader } from '@/core/helper/config';
 import os from 'node:os';
 import { NodeIKernelGroupListener, NodeIKernelMsgListener, NodeIKernelProfileListener } from '@/core/listeners';
@@ -257,19 +257,12 @@ export async function genSessionConfig(
 ): Promise<WrapperSessionInitConfig> {
     const downloadPath = path.join(account_path, 'NapCat', 'temp');
     fs.mkdirSync(downloadPath, { recursive: true });
-    //os.platform() 
-    let systemPlatform = PlatformType.KWINDOWS;
-    switch (os.platform()) {
-        case 'win32':
-            systemPlatform = PlatformType.KWINDOWS;
-            break;
-        case 'darwin':
-            systemPlatform = PlatformType.KMAC;
-            break;
-        case 'linux':
-            systemPlatform = PlatformType.KLINUX;
-            break;
-    }
+    const platformMapping: Partial<Record<NodeJS.Platform, PlatformType>> = {
+        win32: PlatformType.KWINDOWS,
+        darwin: PlatformType.KMAC,
+        linux: PlatformType.KLINUX,
+    };
+    const systemPlatform = platformMapping[os.platform()] ?? PlatformType.KWINDOWS;
     return {
         selfUin,
         selfUid,

src/onebot/api/group.ts

@@ -139,8 +139,7 @@ export class OneBotGroupApi {
                     }
                     if (element.grayTipElement.jsonGrayTipElement.busiId == 2407) {
                         const type = json.items[json.items.length - 1]?.txt;
-                        switch (type) {
-                        case "头衔": {
+                        if (type === "头衔") {
                             const memberUin = json.items[1].param[0];
                             const title = json.items[3].txt;
                             logger.logDebug('收到群成员新头衔消息', json);
@@ -150,11 +149,10 @@ export class OneBotGroupApi {
                                 parseInt(memberUin),
                                 title,
                             );
-                        }
-                        case "移出":
+                        } else if (type === "移出") {
                             logger.logDebug('收到机器人被踢消息', json);
                             return;
-                        default:
+                        } else {
                             logger.logWarn('收到未知的灰条消息', json);
                         }
                     }

src/onebot/index.ts

@@ -275,7 +275,7 @@ export class NapCatOneBot11Adapter {
         msgListener.onRecvSysMsg = (msg) => {
             this.apis.MsgApi.parseSysMessage(msg).then((event) => {
                 if (event) this.networkManager.emitEvent(event);
-            }).catch(e => this.context.logger.logError.bind(this.context.logger)('constructSysMessage error: ', e));
+            }).catch(e => this.context.logger.logError.bind(this.context.logger)('constructSysMessage error: ', e, '\n Parse Hex:', Buffer.from(msg).toString('hex')));
         };
 
         msgListener.onInputStatusPush = async data => {

src/shell/napcat.ts

@@ -69,18 +69,12 @@ export async function NCoreInitShell() {
         const dataPathGlobal = path.resolve(dataPath, './nt_qq/global');
         return [dataPath, dataPathGlobal];
     })();
-    let systemPlatform = PlatformType.KWINDOWS;
-    switch (os.platform()) {
-    case 'win32':
-        systemPlatform = PlatformType.KWINDOWS;
-        break;
-    case 'darwin':
-        systemPlatform = PlatformType.KMAC;
-        break;
-    case 'linux':
-        systemPlatform = PlatformType.KLINUX;
-        break;
-    }
+    const platformMapping: Partial<Record<NodeJS.Platform, PlatformType>> = {
+        win32: PlatformType.KWINDOWS,
+        darwin: PlatformType.KMAC,
+        linux: PlatformType.KLINUX,
+    };
+    const systemPlatform = platformMapping[os.platform()] ?? PlatformType.KWINDOWS;
     if (!basicInfoWrapper.QQVersionAppid || !basicInfoWrapper.QQVersionQua) throw new Error('QQVersionAppid or QQVersionQua  is not defined');
     // from initConfig
     engine.initWithDeskTopConfig(

src/webui/ui/NapCat.ts

@@ -30,7 +30,7 @@ async function onSettingWindowCreated(view: Element) {
                 SettingItem(
                     '<span id="napcat-update-title">Napcat</span>',
                     undefined,
-                    SettingButton('V2.6.21', 'napcat-update-button', 'secondary'),
+                    SettingButton('V2.6.24', 'napcat-update-button', 'secondary'),
                 ),
             ]),
             SettingList([

static/assets/renderer.js

@@ -164,7 +164,7 @@ async function onSettingWindowCreated(view) {
         SettingItem(
           '<span id="napcat-update-title">Napcat</span>',
           void 0,
-          SettingButton("V2.6.21", "napcat-update-button", "secondary")
+          SettingButton("V2.6.24", "napcat-update-button", "secondary")
         )
       ]),
       SettingList([