chore: refactor path config

src/common/config-base.ts

@@ -22,10 +22,15 @@ export abstract class ConfigBase<T> {
     }
 
     getConfigPath(pathName: string | undefined): string {
-        const suffix = pathName ? `_${pathName}` : '';
+        if (!pathName) {
-        const filename = `${this.name}${suffix}.json`;
+            const filename = `${this.name}.json`;
+            const mainPath = this.core.context.pathWrapper.binaryPath;
+            return path.join(mainPath, 'config', filename);
+        } else {
+            const filename = `${this.name}_${pathName}.json`;
             return path.join(this.configPath, filename);
         }
+    }
 
     read(): T {
         const logger = this.core.context.logger;

src/common/helper.ts

@@ -156,9 +156,13 @@ export function getDefaultQQVersionConfigInfo(): QQVersionConfigType {
     };
 }
 
+export function getQQPackageInfoPath(exePath: string = ''): string {
+    return path.join(path.dirname(exePath), 'resources', 'app', 'package.json');
+}
+
 export function getQQVersionConfigPath(exePath: string = ''): string | undefined {
     let configVersionInfoPath;
-    if (os.platform() !== 'linux') {
+    if (os.platform() === 'win32') {
         configVersionInfoPath = path.join(path.dirname(exePath), 'resources', 'app', 'versions', 'config.json');
     } else {
         const userPath = os.homedir();

src/common/path.ts

@@ -1,6 +1,7 @@
 import path, { dirname } from 'path';
 import { fileURLToPath } from 'url';
 import fs from 'fs';
+import os from 'os';
 
 export class NapCatPathWrapper {
     binaryPath: string;
@@ -11,17 +12,19 @@ export class NapCatPathWrapper {
 
     constructor(mainPath: string = dirname(fileURLToPath(import.meta.url))) {
         this.binaryPath = mainPath;
-        this.logsPath = path.join(this.binaryPath, 'logs');
+        let writePath: string;
-        this.configPath = path.join(this.binaryPath, 'config');
+        writePath = this.binaryPath;
-        this.cachePath = path.join(this.binaryPath, 'cache');
+        this.logsPath = path.join(writePath, 'logs');
+        this.configPath = path.join(writePath, 'config');
+        this.cachePath = path.join(writePath, 'cache');
         this.staticPath = path.join(this.binaryPath, 'static');
-        if (fs.existsSync(this.logsPath)) {
+        if (!fs.existsSync(this.logsPath)) {
             fs.mkdirSync(this.logsPath, { recursive: true });
         }
-        if (fs.existsSync(this.configPath)) {
+        if (!fs.existsSync(this.configPath)) {
             fs.mkdirSync(this.configPath, { recursive: true });
         }
-        if (fs.existsSync(this.cachePath)) {
+        if (!fs.existsSync(this.cachePath)) {
             fs.mkdirSync(this.cachePath, { recursive: true });
         }
     }

src/common/qq-basic-info.ts

@@ -1,7 +1,6 @@
-import path from 'node:path';
 import fs from 'node:fs';
 import { systemPlatform } from '@/common/system';
-import { getDefaultQQVersionConfigInfo, getQQVersionConfigPath } from './helper';
+import { getDefaultQQVersionConfigInfo, getQQPackageInfoPath, getQQVersionConfigPath } from './helper';
 import AppidTable from '@/core/external/appid.json';
 import { LogWrapper } from './log';
 
@@ -20,7 +19,7 @@ export class QQBasicInfoWrapper {
         //基础目录获取
         this.context = context;
         this.QQMainPath = process.execPath;
-        this.QQPackageInfoPath = path.join(path.dirname(this.QQMainPath), 'resources', 'app', 'package.json');
+        this.QQPackageInfoPath = getQQPackageInfoPath(this.QQMainPath);
         this.QQVersionConfigPath = getQQVersionConfigPath(this.QQMainPath);
 
         //基础信息获取 无快更则启用默认模板填充
@@ -53,9 +52,21 @@ export class QQBasicInfoWrapper {
 
     //此方法不要直接使用
     getQUAInternal() {
-        return systemPlatform === 'linux'
+        switch (systemPlatform) {
-            ? `V1_LNX_NQ_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`
+            case 'linux':
-            : `V1_WIN_NQ_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`;
+                return `V1_LNX_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`;              
+            default:
+                return `V1_WIN_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`;
+        }
+    }
+
+    getAppidInternal() {
+        switch (systemPlatform) {
+            case 'linux':
+                return '537243600';
+            default:
+                return '537243538';
+        }
     }
 
     getAppidV2(): { appid: string; qua: string } {
@@ -71,6 +82,6 @@ export class QQBasicInfoWrapper {
         // else
         this.context.logger.log(`[QQ版本兼容性检测] 获取Appid异常 请检测NapCat/QQNT是否正常`);
         this.context.logger.log(`[QQ版本兼容性检测] ${fullVersion} 版本兼容性不佳，可能会导致一些功能无法正常使用`,);
-        return { appid: systemPlatform === 'linux' ? '537243600' : '537243441', qua: this.getQUAInternal() };
+        return { appid: this.getAppidInternal(), qua: this.getQUAInternal() };
     }
 }

src/core/index.ts

@@ -42,9 +42,11 @@ export enum NapCatCoreWorkingEnv {
 }
 
 export function loadQQWrapper(QQVersion: string): WrapperNodeApi {
-    let wrapperNodePath = path.resolve(path.dirname(process.execPath), './resources/app/wrapper.node');
+    let appPath;
+    appPath = path.resolve(path.dirname(process.execPath), './resources/app');
+    let wrapperNodePath = path.resolve(appPath, 'wrapper.node');
     if (!fs.existsSync(wrapperNodePath)) {
-        wrapperNodePath = path.join(path.dirname(process.execPath), `resources/app/versions/${QQVersion}/wrapper.node`);
+        wrapperNodePath = path.join(appPath, `versions/${QQVersion}/wrapper.node`);
     }
     const nativemodule: any = { exports: {} };
     process.dlopen(nativemodule, wrapperNodePath);

src/shell/napcat.ts

@@ -49,12 +49,15 @@ export async function NCoreInitShell() {
     const session = new wrapper.NodeIQQNTWrapperSession();
 
     // from get dataPath
+    const [dataPath, dataPathGlobal] = (() => {
         let dataPath = wrapper.NodeQQNTWrapperUtil.getNTUserDataInfoConfig();
         if (!dataPath) {
             dataPath = path.resolve(os.homedir(), './.config/QQ');
             fs.mkdirSync(dataPath, { recursive: true });
         }
         const dataPathGlobal = path.resolve(dataPath, './nt_qq/global');
+        return [dataPath, dataPathGlobal];
+    })();
 
     // from initConfig
     engine.initWithDeskTopConfig(
@@ -115,7 +118,7 @@ export async function NCoreInitShell() {
             const realBase64 = pngBase64QrcodeData.replace(/^data:image\/\w+;base64,/, '');
             const buffer = Buffer.from(realBase64, 'base64');
             logger.logWarn('请扫描下面的二维码，然后在手Q上授权登录：');
-            const qrcodePath = path.join(pathWrapper.binaryPath, 'qrcode.png');
+            const qrcodePath = path.join(pathWrapper.cachePath, 'qrcode.png');
             qrcode.generate(qrcodeUrl, { small: true }, (res) => {
                 logger.logWarn([
                     '\n',