release: 2.3.7

feat: 允许保存的token自动填写

.editorconfig

@@ -17,5 +17,8 @@ charset = utf-8
 indent_style = space
 indent_size = 4
 
+[*.bat]
+charset = latin1
+
 # Unfortunately, EditorConfig doesn't support space configuration inside import braces directly.
 # You'll need to rely on your linter/formatter like ESLint or Prettier for that.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -10,6 +10,7 @@ body:
         在提交新的 Bug 反馈前，请确保您：
         * 已经搜索了现有的 issues，并且没有找到可以解决您问题的方法
         * 不与现有的某一 issue 重复
+        * 不涉及[已经停止维护的特性](https://github.com/NapNeko/NapCatQQ?tab=readme-ov-file#挥别昨日)，例如 CQ 码
   - type: input
     id: system-version
     attributes:
@@ -78,4 +79,4 @@ body:
     attributes:
       label: OneBot 客户端运行日志
       description: 粘贴 OneBot 客户端的相关日志内容到此处
-      render: shell
+      render: shell

README.md

@@ -9,6 +9,8 @@ NapCatQQ (aka 猫猫框架) 是现代化的基于 NTQQ 的 Bot 协议端实现
 ## 猫猫技能
 - [x] **高性能**：1K+ 群聊数目、20 线程并行发送消息毫无压力 
 - [x] **多种启动方式**：支持以无头、LiteLoader 插件、仅 QQ GUI 三种方式启动
+- [x] **多平台支持**: 覆盖 Windows / Linux (可选 Docker) / Android Termux / MacOS
+- [x] **安装简单**: 支持一键脚本/程序自动部署/镜像部署等多种覆盖范围
 - [x] **低占用**：无头模式占用资源极低，适合在服务器上运行
 - [x] **超多接口**：实现大部分 OneBot 和 go-cqhttp 接口，超多扩展 API
 - [x] **WebUI**：自带 WebUI 支持，远程管理更加便捷
@@ -26,14 +28,16 @@ NapCatQQ (aka 猫猫框架) 是现代化的基于 NTQQ 的 Bot 协议端实现
 [Telegram Link](https://t.me/+nLZEnpne-pQ1OWFl)
 
 ## 猫猫朋友
-感谢 [LLOneBot](https://github.com/LLOneBot/LLOneBot) 提供初始版本基础
+感谢 [LLOneBot](https://github.com/LLOneBot/LLOneBot) 提供部分参考
 
 感谢 [Lagrange](https://github.com/LagrangeDev/Lagrange.Core) 对本项目的大力支持
 
+不过最最重要的 还是需要感谢屏幕前的你哦~
+
 ---
 
 ## 约法三章
 > [!CAUTION]\
 > **请不要在 QQ 官方群聊和任何影响力较大的简中互联网平台（包括但不限于: 哔哩哔哩，微博，知乎，抖音等）发布和讨论*任何*与本项目存在相关性的信息**
 
-任何使用本仓库代码的地方，都应当严格遵守[本仓库开源许可](./LICENSE)。**此外，禁止任何项目未经授权二次分发或基于 NapCat 代码开发。**
+任何使用本仓库代码的地方，都应当严格遵守[本仓库开源许可](./LICENSE)。**此外，禁止任何项目未经授权二次分发或基于 NapCat 代码开发。**

launcher/launcher-win10.bat

@@ -0,0 +1,40 @@
+@echo off
+chcp 65001
+net session >nul 2>&1
+if %errorLevel% == 0 (
+    echo Administrator mode detected.
+) else (
+    echo Please run this script in administrator mode.
+    powershell -Command "Start-Process 'cmd.exe' -ArgumentList '/c cd /d \"%cd%\" && \"%~f0\"' -Verb runAs" 
+    exit
+)
+
+set NAPCAT_PATCH_PATH=%cd%\patchNapCat.js
+set NAPCAT_LOAD_PATH=%cd%\loadNapCat.js
+set NAPCAT_INJECT_PATH=%cd%\NapCatWinBootHook.dll
+set NAPCAT_LAUNCHER_PATH=%cd%\NapCatWinBootMain.exe
+set NAPCAT_MAIN_PATH=%cd%\napcat.mjs
+:loop_read
+for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do (
+    set RetString=%%b
+    goto :napcat_boot
+)
+
+:napcat_boot
+for %%a in ("%RetString%") do (
+    set "pathWithoutUninstall=%%~dpa"
+)
+
+SET QQPath=%pathWithoutUninstall%QQ.exe
+
+if not exist "%QQpath%" (
+    echo provided QQ path is invalid: %QQpath%
+    pause
+    exit /b
+)
+set NAPCAT_MAIN_PATH=%NAPCAT_MAIN_PATH:\=/%
+echo (async () =^> {await import("file:///%NAPCAT_MAIN_PATH%")})() > %NAPCAT_LOAD_PATH%
+
+"%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%"
+
+REM "%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%" 123456

launcher/launcher.bat

@@ -0,0 +1,41 @@
+@echo off
+chcp 65001
+net session >nul 2>&1
+if %errorLevel% == 0 (
+    echo Administrator mode detected.
+) else (
+    echo Please run this script in administrator mode.
+    powershell -Command "Start-Process 'wt.exe' -ArgumentList 'cmd /c cd /d \"%cd%\" && \"%~f0\"' -Verb runAs"
+    exit
+)
+
+set NAPCAT_PATCH_PATH=%cd%\patchNapCat.js
+set NAPCAT_LOAD_PATH=%cd%\loadNapCat.js
+set NAPCAT_INJECT_PATH=%cd%\NapCatWinBootHook.dll
+set NAPCAT_LAUNCHER_PATH=%cd%\NapCatWinBootMain.exe
+set NAPCAT_MAIN_PATH=%cd%\napcat.mjs
+:loop_read
+for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do (
+    set RetString=%%b
+    goto :napcat_boot
+)
+
+:napcat_boot
+for %%a in ("%RetString%") do (
+    set "pathWithoutUninstall=%%~dpa"
+)
+
+SET QQPath=%pathWithoutUninstall%QQ.exe
+
+if not exist "%QQpath%" (
+    echo provided QQ path is invalid: %QQpath%
+    pause
+    exit /b
+)
+
+set NAPCAT_MAIN_PATH=%NAPCAT_MAIN_PATH:\=/%
+echo (async () =^> {await import("file:///%NAPCAT_MAIN_PATH%")})() > %NAPCAT_LOAD_PATH%
+
+"%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%"
+
+REM "%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%" 123456

launcher/loadNapCat.js

@@ -0,0 +1,5 @@
+const path = require('path');
+const CurrentPath = path.dirname(__filename);
+(async () => {
+    await import("file://" + path.join(CurrentPath, './napcat/napcat.mjs'));
+})();

launcher/patchNapCat.js

@@ -0,0 +1 @@
+require('./launcher.node').load('external_index', module);

manifest.json

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

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "2.2.43",
+  "version": "2.3.7",
   "scripts": {
     "build:framework": "vite build --mode framework",
     "build:shell": "vite build --mode shell",

src/common/config-base.ts

@@ -22,9 +22,14 @@ export abstract class ConfigBase<T> {
     }
 
     getConfigPath(pathName: string | undefined): string {
-        const suffix = pathName ? `_${pathName}` : '';
-        const filename = `${this.name}${suffix}.json`;
-        return path.join(this.configPath, filename);
+        if (!pathName) {
+            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 {

src/common/helper.ts

@@ -37,7 +37,7 @@ export class FileNapCatOneBotUUID {
         if (!uuid.startsWith('NapCatOneBot|ModelIdFile|')) return undefined;
         const data = uuid.split('|');
         if (data.length !== 6) return undefined;
-        const [, , chatType, peerUid, modelId,fileId] = data;
+        const [, , chatType, peerUid, modelId, fileId] = data;
         return {
             peer: {
                 chatType: chatType as any,
@@ -156,10 +156,22 @@ export function getDefaultQQVersionConfigInfo(): QQVersionConfigType {
     };
 }
 
+export function getQQPackageInfoPath(exePath: string = ''): string {
+    if (os.platform() === 'darwin') {
+        return path.join(path.dirname(exePath), '..', 'Resources', 'app', 'package.json');
+    } else {
+        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 if (os.platform() === 'darwin') {
+        const userPath = os.homedir();
+        const appDataPath = path.resolve(userPath, './Library/Application Support/QQ');
+        configVersionInfoPath = path.resolve(appDataPath, './versions/config.json');
     } else {
         const userPath = os.homedir();
         const appDataPath = path.resolve(userPath, './.config/QQ');

src/common/log.ts

@@ -167,7 +167,8 @@ export function rawMessageToText(msg: RawMessage, recursiveLevel = 0): string {
     function msgElementToText(element: MessageElement) {
         if (element.textElement) {
             if (element.textElement.atType === AtType.notAt) {
-                return element.textElement.content;
+                const originalContentLines = element.textElement.content.split('\n');
+                return `${originalContentLines[0]}${originalContentLines.length > 1 ? ' ...' : ''}`;
             } else if (element.textElement.atType === AtType.atAll) {
                 return `@全体成员`;
             } else if (element.textElement.atType === AtType.atUser) {
@@ -189,7 +190,7 @@ export function rawMessageToText(msg: RawMessage, recursiveLevel = 0): string {
         }
 
         if (element.picElement) {
-            return `[图片 ${element.picElement.fileName}]`;
+            return '[图片]';
         }
 
         if (element.fileElement) {
@@ -197,7 +198,7 @@ export function rawMessageToText(msg: RawMessage, recursiveLevel = 0): string {
         }
 
         if (element.videoElement) {
-            return `[视频 ${element.videoElement.fileName}]`;
+            return '[视频]';
         }
 
         if (element.pttElement) {
@@ -205,7 +206,7 @@ export function rawMessageToText(msg: RawMessage, recursiveLevel = 0): string {
         }
 
         if (element.arkElement) {
-            return `[卡片消息 ${element.arkElement.bytesData}]`;
+            return '[卡片消息]';
         }
 
         if (element.faceElement) {
@@ -213,19 +214,19 @@ export function rawMessageToText(msg: RawMessage, recursiveLevel = 0): string {
         }
 
         if (element.marketFaceElement) {
-            return `[商城表情 ${element.marketFaceElement.faceName}]`;
+            return element.marketFaceElement.faceName;
         }
 
         if (element.markdownElement) {
-            return `[Markdown ${element.markdownElement.content}]`;
+            return '[Markdown 消息]';
         }
 
         if (element.multiForwardMsgElement) {
-            return `[转发消息]`;
+            return '[转发消息]';
         }
 
         if (element.elementType === ElementType.GreyTip) {
-            return `[灰条消息]`; // TODO: resolve the text
+            return '[灰条消息]';
         }
 
         return `[未实现 (ElementType = ${element.elementType})]`;

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,23 @@ export class NapCatPathWrapper {
 
     constructor(mainPath: string = dirname(fileURLToPath(import.meta.url))) {
         this.binaryPath = mainPath;
-        this.logsPath = path.join(this.binaryPath, 'logs');
-        this.configPath = path.join(this.binaryPath, 'config');
-        this.cachePath = path.join(this.binaryPath, 'cache');
+        let writePath: string;
+        if (os.platform() === 'darwin') {
+            writePath = path.join(os.homedir(), 'Library', 'Application Support', 'QQ', 'NapCat');
+        } else {
+            writePath = this.binaryPath;
+        }
+        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,25 @@ export class QQBasicInfoWrapper {
 
     //此方法不要直接使用
     getQUAInternal() {
-        return systemPlatform === 'linux'
-            ? `V1_LNX_NQ_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`
-            : `V1_WIN_NQ_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`;
+        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`;
+        }
+    }
+
+    getAppidInternal() {
+        switch (systemPlatform) {
+            case 'linux':
+                return '537243600';
+            case 'darwin':
+                return '537243441';
+            default:
+                return '537243538';
+        }
     }
 
     getAppidV2(): { appid: string; qua: string } {
@@ -71,6 +86,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/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '2.2.43';
+export const napCatVersion = '2.3.7';

src/core/apis/file.ts

@@ -298,65 +298,6 @@ export class NTQQFileApi {
         });
     }
 
-    async addFileCache(peer: Peer, msgId: string, msgSeq: string, senderUid: string, elemId: string, elemType: string, fileSize: string, fileName: string) {
-        let GroupData;
-        let BuddyData;
-        if (peer.chatType === ChatType.KCHATTYPEGROUP) {
-            GroupData =
-                [{
-                    groupCode: peer.peerUid,
-                    isConf: false,
-                    hasModifyConfGroupFace: true,
-                    hasModifyConfGroupName: true,
-                    groupName: 'NapCat.Cached',
-                    remark: 'NapCat.Cached',
-                }];
-        } else if (peer.chatType === ChatType.KCHATTYPEC2C) {
-            BuddyData = [{
-                category_name: 'NapCat.Cached',
-                peerUid: peer.peerUid,
-                peerUin: peer.peerUid,
-                remark: 'NapCat.Cached',
-            }];
-        } else {
-            return undefined;
-        }
-
-        return this.context.session.getSearchService().addSearchHistory({
-            type: 4,
-            contactList: [],
-            id: -1,
-            groupInfos: [],
-            msgs: [],
-            fileInfos: [
-                {
-                    chatType: peer.chatType,
-                    buddyChatInfo: BuddyData || [],
-                    discussChatInfo: [],
-                    groupChatInfo: GroupData || [],
-                    dataLineChatInfo: [],
-                    tmpChatInfo: [],
-                    msgId: msgId,
-                    msgSeq: msgSeq,
-                    msgTime: Math.floor(Date.now() / 1000).toString(),
-                    senderUid: senderUid,
-                    senderNick: 'NapCat.Cached',
-                    senderRemark: 'NapCat.Cached',
-                    senderCard: 'NapCat.Cached',
-                    elemId: elemId,
-                    elemType: elemType,
-                    fileSize: fileSize,
-                    filePath: '',
-                    fileName: fileName,
-                    hits: [{
-                        start: 12,
-                        end: 14,
-                    }],
-                },
-            ],
-        });
-    }
-
     async searchForFile(keys: string[]): Promise<SearchResultItem | undefined> {
         const randomResultId = 100000 + Math.floor(Math.random() * 10000);
         let searchId = 0;

src/core/apis/group.ts

@@ -1,5 +1,4 @@
 import {
-    ChatType,
     GeneralCallResult,
     Group,
     GroupMember,
@@ -10,8 +9,9 @@ import {
     MemberExtSourceType,
     NapCatCore,
 } from '@/core';
-import { isNumeric, runAllWithTimeout } from '@/common/helper';
+import { isNumeric, solveAsyncProblem } from '@/common/helper';
 import { LimitedHashTable } from '@/common/message-unique';
+import { NTEventWrapper } from '@/common/event';
 
 export class NTQQGroupApi {
     context: InstanceContext;
@@ -248,7 +248,7 @@ export class NTQQGroupApi {
             'NodeIKernelGroupListener/onMemberInfoChange',
             1,
             forced ? 5000 : 250,
-            (params) => params === GroupCode,
+            (params, _, members) => params === GroupCode && members.size > 0,
         );
         const retData = await (
             this.core.eventWrapper
@@ -265,14 +265,34 @@ export class NTQQGroupApi {
         }
         return member;
     }
-
+    async getGroupMemberEx(GroupCode: string, uid: string, forced = false, retry = 2) {
+        let data = await solveAsyncProblem((eventWrapper: NTEventWrapper, GroupCode: string, uid: string, forced = false) => {
+            return eventWrapper.callNormalEventV2(
+                'NodeIKernelGroupService/getMemberInfo',
+                'NodeIKernelGroupListener/onMemberInfoChange',
+                [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);
+        if (data && data[3] instanceof Map && data[3].has(uid)) {
+            return data[3].get(uid);
+        }
+        if (retry > 0) {
+            let trydata = await this.getGroupMemberEx(GroupCode, uid, true, retry - 1) as GroupMember | undefined;
+            if (trydata) return trydata;
+        }
+        return undefined;
+    }
     async getGroupMembersV2(groupQQ: string, num = 3000): Promise<Map<string, GroupMember>> {
         const groupService = this.context.session.getGroupService();
         const sceneId = groupService.createMemberListScene(groupQQ, 'groupMemberList_MainWindow');
         const listener = this.core.eventWrapper.registerListen(
             'NodeIKernelGroupListener/onMemberListChange',
             1,
-            500,
+            5000,
             (params) => params.sceneId === sceneId,
         );
         try {

src/core/apis/msg.ts

@@ -113,7 +113,7 @@ export class NTQQMsgApi {
         return await this.context.session.getMsgService().getMsgsBySeqList(peer, msgSeqList);
     }
     async getMsgBySeqExFirstMsg(peer: Peer, rootMsgId: string, replyMsgId: string) {
-        let reply = await this.context.session.getMsgService().getSourceOfReplyMsgV2(peer, rootMsgId, replyMsgId);
+        const reply = await this.context.session.getMsgService().getSourceOfReplyMsgV2(peer, rootMsgId, replyMsgId);
         console.log(reply);
     }
     async getMsgExBySeq(peer: Peer, msgSeq: string) {
@@ -164,6 +164,18 @@ export class NTQQMsgApi {
         }, msgIds);
     }
 
+    async recallMsgV2(peer: Peer, msgId: string) {
+        await this.core.eventWrapper.callNormalEventV2(
+            'NodeIKernelMsgService/recallMsg',
+            'NodeIKernelMsgListener/onMsgInfoListUpdate',
+            [peer, [msgId]],
+            () => true,
+            (updatedList) => updatedList.find(m => m.msgId === msgId && m.recallTime !== '0') !== undefined,
+            1,
+            1000,
+        );
+    }
+
     async PrepareTempChat(toUserUid: string, GroupCode: string, nickname: string) {
         return this.context.session.getMsgService().prepareTempChat({
             chatType: ChatType.KCHATTYPETEMPC2CFROMGROUP,

src/core/apis/user.ts

@@ -75,7 +75,6 @@ export class NTQQUserApi {
             (profile) => profile.uid === uid,
         );
         const RetUser: User = {
-            ...profile.simpleInfo.coreInfo,
             ...profile.simpleInfo.status,
             ...profile.simpleInfo.vasInfo,
             ...profile.commonExt,
@@ -83,17 +82,22 @@ export class NTQQUserApi {
             qqLevel: profile.commonExt?.qqLevel,
             age: profile.simpleInfo.baseInfo.age,
             pendantId: '',
+            ...profile.simpleInfo.coreInfo
         };
         return RetUser;
     }
 
     async getUserDetailInfo(uid: string): Promise<User> {
-        const retUser = await solveAsyncProblem(async (uid) => this.fetchUserDetailInfo(uid, UserDetailSource.KDB), uid);
+        let retUser = await solveAsyncProblem(async (uid) => this.fetchUserDetailInfo(uid, UserDetailSource.KDB), uid);
         if (retUser && retUser.uin !== '0') {
             return retUser;
         }
         this.context.logger.logDebug('[NapCat] [Mark] getUserDetailInfo Mode1 Failed.');
-        return this.fetchUserDetailInfo(uid, UserDetailSource.KSERVER);
+        retUser = await this.fetchUserDetailInfo(uid, UserDetailSource.KSERVER);
+        if (retUser && retUser.uin === '0') {
+            retUser.uin = await this.core.apis.UserApi.getUidByUinV2(uid) ?? '0';
+        }
+        return retUser;
     }
 
     async modifySelfProfile(param: ModifyProfileParams) {

src/core/apis/webapi.ts

@@ -131,20 +131,53 @@ export class NTQQWebApi {
     //   return await res.json();
     // }
 
-    async setGroupNotice(GroupCode: string, Content: string) {
+    async setGroupNotice(
+        GroupCode: string,
+        Content: string,
+        pinned: number = 0,
+        type: number = 1,
+        is_show_edit_card: number = 1,
+        tip_window_type: number = 1,
+        confirm_required: number = 1,
+        picId: string = '',
+        imgWidth: number = 540,
+        imgHeight: number = 300,
+    ) {
+        interface SetNoticeRetSuccess {
+            ec: number;
+            em: string;
+            id: number;
+            ltsm: number;
+            new_fid: string;
+            read_only: number;
+            role: number;
+            srv_code: number;
+        }
+
         const cookieObject = await this.core.apis.UserApi.getCookies('qun.qq.com');
-        let ret: any = undefined;
+
         try {
-            ret = await RequestUtil.HttpGetJson<any>(
-                `https://web.qun.qq.com/cgi-bin/announce/add_qun_notice${new URLSearchParams({
+            let settings = JSON.stringify({
+                is_show_edit_card: is_show_edit_card,
+                tip_window_type: tip_window_type,
+                confirm_required: confirm_required
+            });
+            const externalParam = {
+                pic: picId,
+                imgWidth: imgWidth.toString(),
+                imgHeight: imgHeight.toString(),
+            };
+            let ret: SetNoticeRetSuccess = await RequestUtil.HttpGetJson<SetNoticeRetSuccess>(
+                `https://web.qun.qq.com/cgi-bin/announce/add_qun_notice?${new URLSearchParams({
                     bkn: this.getBknFromCookie(cookieObject),
                     qid: GroupCode,
                     text: Content,
-                    pinned: '0',
-                    type: '1',
-                    settings: '{"is_show_edit_card":1,"tip_window_type":1,"confirm_required":1}',
+                    pinned: pinned.toString(),
+                    type: type.toString(),
+                    settings: settings,
+                    ...(picId === '' ? {} : externalParam)
                 }).toString()}`,
-                'GET',
+                'POST',
                 '',
                 { 'Cookie': this.cookieToString(cookieObject) }
             );

src/core/external/appid.json

@@ -6,5 +6,9 @@
     "9.9.15-27597": {
         "appid": 537243441,
         "qua": "V1_WIN_NQ_9.9.15_27597_GW_B"
+    },
+    "6.9.53-27597": {
+        "appid": 537243538,
+        "qua": "V1_MAC_NQ_6.9.53_27597_GW_B" 
     }
 }

src/core/index.ts

@@ -42,9 +42,15 @@ export enum NapCatCoreWorkingEnv {
 }
 
 export function loadQQWrapper(QQVersion: string): WrapperNodeApi {
-    let wrapperNodePath = path.resolve(path.dirname(process.execPath), './resources/app/wrapper.node');
+    let appPath;
+    if (os.platform() === 'darwin') {
+        appPath = path.resolve(path.dirname(process.execPath), '../Resources/app');
+    } else {
+        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/onebot/action/OB11Response.ts

@@ -1,6 +1,6 @@
 import { OB11Return } from '../types';
 
-import { isNull } from '../../common/helper';
+import { isNull } from '@/common/helper';
 
 export class OB11Response {
     static res<T>(data: T, status: string, retcode: number, message: string = ''): OB11Return<T> {

src/onebot/action/extends/GetGroupAddRequest.ts

@@ -11,7 +11,7 @@ export default class GetGroupAddRequest extends BaseAction<null, OB11GroupReques
     actionName = ActionName.GetGroupIgnoreAddRequest;
 
     async _handle(payload: null): Promise<OB11GroupRequestNotify[] | null> {
-        const data = await this.core.apis.GroupApi.getGroupIgnoreNotifies();
+        // const data = await this.core.apis.GroupApi.getGroupIgnoreNotifies();
         // log(data);
         // const notifies: GroupNotify[] = data.notifies.filter(notify => notify.status === GroupNotifyStatus.WAIT_HANDLE);
         // const returnData: OB11GroupRequestNotify[] = [];

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

@@ -1,6 +1,7 @@
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
+
 const SchemaData = {
     type: 'object',
     properties: {

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

@@ -2,6 +2,7 @@ import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 import { FileNapCatOneBotUUID } from '@/common/helper';
+
 const SchemaData = {
     type: 'object',
     properties: {

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

@@ -2,6 +2,7 @@ import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 import { OB11Entities } from '@/onebot/entities';
+
 const SchemaData = {
     type: 'object',
     properties: {

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

@@ -11,7 +11,10 @@ const SchemaData = {
         content: { type: 'string' },
         image: { type: 'string' },
         pinned: { type: ['number', 'string'] },
+        type: { type: ['number', 'string'] },
         confirm_required: { type: ['number', 'string'] },
+        is_show_edit_card: { type: ['number', 'string'] },
+        tip_window_type: { type: ['number', 'string'] },
     },
     required: ['group_id', 'content'],
 } as const satisfies JSONSchema;
@@ -22,6 +25,7 @@ export class SendGroupNotice extends BaseAction<Payload, null> {
     actionName = ActionName.GoCQHTTP_SendGroupNotice;
 
     async _handle(payload: Payload) {
+
         let UploadImage: { id: string, width: number, height: number } | undefined = undefined;
         if (payload.image) {
             //公告图逻辑
@@ -47,12 +51,28 @@ export class SendGroupNotice extends BaseAction<Payload, null> {
             }
             UploadImage = ImageUploadResult.picInfo;
         }
-        const noticePinned = +(payload.pinned ?? 0);
-        const noticeConfirmRequired = +(payload.confirm_required ?? 0);
-        const publishGroupBulletinResult = await this.core.apis.GroupApi.publishGroupBulletin(payload.group_id.toString(), payload.content, UploadImage, noticePinned, noticeConfirmRequired);
 
-        if (publishGroupBulletinResult.result != 0) {
-            throw `设置群公告失败,错误信息:${publishGroupBulletinResult.errMsg}`;
+        const noticeType = +(payload.type ?? 1);
+        const noticePinned = +(payload.pinned ?? 0);
+
+        const noticeShowEditCard = +(payload.is_show_edit_card ?? 0);
+        const noticeTipWindowType = +(payload.tip_window_type ?? 0);
+        const noticeConfirmRequired = +(payload.confirm_required ?? 1);
+        //const publishGroupBulletinResult = await this.core.apis.GroupApi.publishGroupBulletin(payload.group_id.toString(), payload.content, UploadImage, noticePinned, noticeConfirmRequired);
+        const publishGroupBulletinResult = await this.core.apis.WebApi.setGroupNotice(
+            payload.group_id.toString(),
+            payload.content,
+            noticePinned,
+            noticeType,
+            noticeShowEditCard,
+            noticeTipWindowType,
+            noticeConfirmRequired,
+            UploadImage?.id,
+            UploadImage?.width,
+            UploadImage?.height
+        );
+        if (!publishGroupBulletinResult || publishGroupBulletinResult.ec != 0) {
+            throw `设置群公告失败,错误信息:${publishGroupBulletinResult?.em}`;
         }
         return null;
     }

src/onebot/action/group/GetGroupMemberInfo.ts

@@ -26,7 +26,7 @@ class GetGroupMemberInfo extends BaseAction<Payload, OB11GroupMember> {
         const uid = await this.core.apis.UserApi.getUidByUinV2(payload.user_id.toString());
         if (!uid) throw new Error(`Uin2Uid Error ${payload.user_id}不存在`);
         const [member, info] = await Promise.allSettled([
-            this.core.apis.GroupApi.getGroupMemberV2(payload.group_id.toString(), uid, isNocache),
+            this.core.apis.GroupApi.getGroupMemberEx(payload.group_id.toString(), uid, isNocache),
             this.core.apis.UserApi.getUserDetailInfo(uid),
         ]);
         if (member.status !== 'fulfilled') throw new Error(`群(${payload.group_id})成员${payload.user_id}获取失败 ${member.reason}`);

src/onebot/api/msg.ts

@@ -115,6 +115,7 @@ export class OneBotMsgApi {
                         file_id: encodedFileId,
                         url: await this.core.apis.FileApi.getImageUrl(element),
                         file_size: element.fileSize,
+                        file_unique: element.fileName
                     },
                 };
             } catch (e: any) {
@@ -129,20 +130,6 @@ export class OneBotMsgApi {
                 peerUid: msg.peerUid,
                 guildId: '',
             };
-            await this.core.apis.FileApi.addFileCache(
-                {
-                    peerUid: msg.peerUid,
-                    chatType: msg.chatType,
-                    guildId: '',
-                },
-                msg.msgId,
-                msg.msgSeq,
-                msg.senderUid,
-                elementWrapper.elementId,
-                elementWrapper.elementType.toString(),
-                element.fileSize,
-                element.fileName,
-            );
             return {
                 type: OB11MessageDataType.file,
                 data: {
@@ -151,6 +138,7 @@ export class OneBotMsgApi {
                     url: element.filePath,
                     file_id: FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId),
                     file_size: element.fileSize,
+                    file_unique: element.fileName,
                 },
             };
         },
@@ -182,20 +170,6 @@ export class OneBotMsgApi {
         },
 
         marketFaceElement: async (_, msg, elementWrapper) => {
-            await this.core.apis.FileApi.addFileCache(
-                {
-                    peerUid: msg.peerUid,
-                    chatType: msg.chatType,
-                    guildId: '',
-                },
-                msg.msgId,
-                msg.msgSeq,
-                msg.senderUid,
-                elementWrapper.elementId,
-                elementWrapper.elementType.toString(),
-                '0',
-                'marketface',
-            );
             const peer = {
                 chatType: msg.chatType,
                 peerUid: msg.peerUid,
@@ -208,6 +182,7 @@ export class OneBotMsgApi {
                     file_id: FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId),
                     path: elementWrapper.elementId,
                     url: elementWrapper.elementId,
+                    file_unique: _.key
                 },
             };
         },
@@ -283,21 +258,6 @@ export class OneBotMsgApi {
                 videoDownUrl = element.filePath;
             }
 
-            await this.core.apis.FileApi.addFileCache(
-                {
-                    peerUid: msg.peerUid,
-                    chatType: msg.chatType,
-                    guildId: '',
-                },
-                msg.msgId,
-                msg.msgSeq,
-                msg.senderUid,
-                elementWrapper.elementId,
-                elementWrapper.elementType.toString(),
-                element.fileSize ?? '0',
-                element.fileName,
-            );
-
             return {
                 type: OB11MessageDataType.video,
                 data: {
@@ -306,6 +266,7 @@ export class OneBotMsgApi {
                     url: videoDownUrl,
                     file_id: FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId),
                     file_size: element.fileSize,
+                    file_unique: element.fileName,
                 },
             };
         },
@@ -316,20 +277,6 @@ export class OneBotMsgApi {
                 peerUid: msg.peerUid,
                 guildId: '',
             };
-            await this.core.apis.FileApi.addFileCache(
-                {
-                    peerUid: msg.peerUid,
-                    chatType: msg.chatType,
-                    guildId: '',
-                },
-                msg.msgId,
-                msg.msgSeq,
-                msg.senderUid,
-                elementWrapper.elementId,
-                elementWrapper.elementType.toString(),
-                element.fileSize || '0',
-                element.fileUuid || '',
-            );
             return {
                 type: OB11MessageDataType.voice,
                 data: {
@@ -730,8 +677,10 @@ export class OneBotMsgApi {
             if (ret.result === 0) {
                 resMsg.group_id = parseInt(ret.tmpChatInfo!.groupCode);
                 resMsg.sender.nickname = ret.tmpChatInfo!.fromNick;
+                resMsg.temp_source = resMsg.group_id;
             } else {
                 resMsg.group_id = 284840486; //兜底数据
+                resMsg.temp_source = resMsg.group_id;
                 resMsg.sender.nickname = '临时会话';
             }
         }

src/onebot/cqcode.ts

@@ -66,10 +66,7 @@ export function encodeCQCode(data: OB11MessageData) {
 
     let result = '[CQ:' + data.type;
     for (const name in data.data) {
-        const value =
-            // eslint-disable-next-line
-            // @ts-ignore
-            data.data[name];
+        const value = (data.data as any)[name];
         if (value === undefined) {
             continue;
         }

src/onebot/index.ts

@@ -43,9 +43,6 @@ import { OB11FriendRecallNoticeEvent } from '@/onebot/event/notice/OB11FriendRec
 import { OB11GroupRecallNoticeEvent } from '@/onebot/event/notice/OB11GroupRecallNoticeEvent';
 import { LRUCache } from '@/common/lru-cache';
 import { NodeIKernelRecentContactListener } from '@/core/listeners/NodeIKernelRecentContactListener';
-import { SysMessage } from '@/core/proto/SysMessage';
-import { GreyTipWrapper } from '@/core/proto/GreyTipWrapper';
-import { EmojiLikeToOthersWrapper1 } from '@/core/proto/EmojiLikeToOthers';
 
 //OneBot实现类
 export class NapCatOneBot11Adapter {
@@ -101,7 +98,7 @@ export class NapCatOneBot11Adapter {
         if (ob11Config.http.enablePost) {
             ob11Config.http.postUrls.forEach(url => {
                 this.networkManager.registerAdapter(new OB11ActiveHttpAdapter(
-                    url, ob11Config.token, this.core, this,
+                    url, ob11Config.http.secret, this.core, this,
                 ));
             });
         }
@@ -171,7 +168,7 @@ export class NapCatOneBot11Adapter {
             if (now.http.enablePost) {
                 now.http.postUrls.forEach(url => {
                     this.networkManager.registerAdapterAndOpen(new OB11ActiveHttpAdapter(
-                        url, now.token, this.core, this,
+                        url, now.http.secret, this.core, this,
                     ));
                 });
             } else {
@@ -185,7 +182,7 @@ export class NapCatOneBot11Adapter {
                 );
                 for (const url of added) {
                     await this.networkManager.registerAdapterAndOpen(new OB11ActiveHttpAdapter(
-                        url, now.token, this.core, this,
+                        url, now.http.secret, this.core, this,
                     ));
                 }
             }
@@ -241,33 +238,35 @@ export class NapCatOneBot11Adapter {
     private initMsgListener() {
         const msgListener = new NodeIKernelMsgListener();
 
-        msgListener.onRecvSysMsg = async msg => {
-            // const sysMsg = SysMessage.fromBinary(Uint8Array.from(msg));
-            // if (sysMsg.msgSpec.length === 0) {
-            //     return;
-            // }
-            // const { msgType, subType, subSubType } = sysMsg.msgSpec[0];
-            // if (msgType === 732 && subType === 16 && subSubType === 16) {
-            //     const greyTip = GreyTipWrapper.fromBinary(Uint8Array.from(sysMsg.bodyWrapper!.wrappedBody.slice(7)));
-            //     if (greyTip.subTypeId === 36) {
-            //         const emojiLikeToOthers = EmojiLikeToOthersWrapper1
-            //             .fromBinary(greyTip.rest)
-            //             .wrapper!
-            //             .body!;
-            //         if (emojiLikeToOthers.attributes?.operation !== 1) { // Un-like
-            //             return;
-            //         }
-            //         const eventOrEmpty = await this.apis.GroupApi.createGroupEmojiLikeEvent(
-            //             greyTip.groupCode.toString(),
-            //             await this.core.apis.UserApi.getUinByUidV2(emojiLikeToOthers.attributes!.senderUid),
-            //             emojiLikeToOthers.msgSpec!.msgSeq.toString(),
-            //             emojiLikeToOthers.attributes!.emojiId,
-            //         );
-            //         // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-            //         eventOrEmpty && await this.networkManager.emitEvent(eventOrEmpty);
-            //     }
-            // }
+        /*
+        msgListener.onRecvSysMsg = async () => {
+            const sysMsg = SysMessage.fromBinary(Uint8Array.from(msg));
+            if (sysMsg.msgSpec.length === 0) {
+                return;
+            }
+            const { msgType, subType, subSubType } = sysMsg.msgSpec[0];
+            if (msgType === 732 && subType === 16 && subSubType === 16) {
+                const greyTip = GreyTipWrapper.fromBinary(Uint8Array.from(sysMsg.bodyWrapper!.wrappedBody.slice(7)));
+                if (greyTip.subTypeId === 36) {
+                    const emojiLikeToOthers = EmojiLikeToOthersWrapper1
+                        .fromBinary(greyTip.rest)
+                        .wrapper!
+                        .body!;
+                    if (emojiLikeToOthers.attributes?.operation !== 1) { // Un-like
+                        return;
+                    }
+                    const eventOrEmpty = await this.apis.GroupApi.createGroupEmojiLikeEvent(
+                        greyTip.groupCode.toString(),
+                        await this.core.apis.UserApi.getUinByUidV2(emojiLikeToOthers.attributes!.senderUid),
+                        emojiLikeToOthers.msgSpec!.msgSeq.toString(),
+                        emojiLikeToOthers.attributes!.emojiId,
+                    );
+                    // eslint-disable-next-line @typescript-eslint/no-unused-expressions
+                    eventOrEmpty && await this.networkManager.emitEvent(eventOrEmpty);
+                }
+            }
         };
+         */
 
         msgListener.onInputStatusPush = async data => {
             const uin = await this.core.apis.UserApi.getUinByUidV2(data.fromUin);

src/onebot/types/message.ts

@@ -8,6 +8,7 @@ export enum OB11MessageType {
 }
 
 export interface OB11Message {
+    temp_source?: number;
     message_sent_type?: string;
     target_id?: number;  // 自己发送的消息才有此字段
     self_id?: number,

src/shell/napcat.ts

@@ -49,12 +49,20 @@ export async function NCoreInitShell() {
     const session = new wrapper.NodeIQQNTWrapperSession();
 
     // from get dataPath
-    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');
+    const [dataPath, dataPathGlobal] = (() => {
+        if (os.platform() === 'darwin') {
+            const userPath = os.homedir();
+            const appDataPath = path.resolve(userPath, './Library/Application Support/QQ');
+            return [appDataPath, path.join(appDataPath, 'global')];
+        }
+        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 +123,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',
@@ -191,7 +199,7 @@ export async function NCoreInitShell() {
                 logger.log(`可用于快速登录的 QQ：\n${historyLoginList
                     .map((u, index) => `${index + 1}. ${u.uin} ${u.nickName}`)
                     .join('\n')
-                }`);
+                    }`);
             }
             loginService.getQRCodePicture();
         }

src/webui/index.ts

@@ -3,6 +3,7 @@ import { ALLRouter } from './src/router';
 import { LogWrapper } from '@/common/log';
 import { NapCatPathWrapper } from '@/common/path';
 import { WebUiConfigWrapper } from './src/helper/config';
+import { RequestUtil } from '@/common/request';
 
 const app = express();
 
@@ -38,7 +39,23 @@ export async function InitWebUi(logger: LogWrapper, pathWrapper: NapCatPathWrapp
     app.use(config.prefix + '/api', ALLRouter);
     app.listen(config.port, config.host, async () => {
         log(`[NapCat] [WebUi] Current WebUi is running at http://${config.host}:${config.port}${config.prefix}`);
-        log(`[NapCat] [WebUi] Login URL is http://${config.host}:${config.port}${config.prefix}/webui`);
         log(`[NapCat] [WebUi] Login Token is ${config.token}`);
+        log(`[NapCat] [WebUi] WebUi User  Panel Url: http://${config.host}:${config.port}${config.prefix}/webui?token=${config.token}`);
+        log(`[NapCat] [WebUi] WebUi Local Panel Url: http://127.0.0.1:${config.port}${config.prefix}/webui?token=${config.token}`);
+        //获取上网Ip
+        //https://www.ip.cn/api/index?ip&type=0
+        RequestUtil.HttpGetJson<{ IP: {IP:string} }>(
+            'https://ip.011102.xyz/',
+            'GET',
+            {},
+            {},
+            true,
+            true
+        ).then((data) => {
+            log(`[NapCat] [WebUi] WebUi Publish Panel Url: http://${data.IP.IP}:${config.port}${config.prefix}/webui/?token=${config.token}`);
+        }).catch((err) => {
+            logger.logError(`[NapCat] [WebUi] Get Publish Panel Url Error: ${err}`);
+        });
+
     });
 }

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.2.43', 'napcat-update-button', 'secondary'),
+                    SettingButton('V2.3.7', '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.2.43", "napcat-update-button", "secondary")
+          SettingButton("V2.3.7", "napcat-update-button", "secondary")
         )
       ]),
       SettingList([

static/login.html

@@ -29,7 +29,7 @@
             margin-bottom: 20px;
         }
 
-        input[type="text"] {
+        input[type="password"] {
             width: 90%;
             padding: 10px;
             font-size: 16px;
@@ -64,7 +64,7 @@
         <form id="token-form" onsubmit="event.preventDefault(); submitToken();">
             <div class="input-group">
                 <label for="token-input">Enter Token:</label>
-                <input type="text" id="token-input" required>
+                <input type="password" id="token-input" required>
             </div>
             <p class="error-message hidden" id="error-message"></p>
             <button type="submit">Login</button>
@@ -133,4 +133,4 @@
     </script>
 </body>
 
-</html>
+</html>

tsconfig.json

@@ -25,12 +25,6 @@
     "paths": {
       "@*": [
         "./src*"
-      ],
-      "@/core": [
-        "./src/core/index",
-      ],
-      "@/core/*": [
-        "./src/core/*"
       ]
     }
   },

vite.config.ts

@@ -11,7 +11,6 @@ const nodeModules = [...builtinModules, builtinModules.map(m => `node:${m}`)].fl
 function genCpModule(module: string) {
     return { src: `./node_modules/${module}`, dest: `dist/node_modules/${module}`, flatten: false };
 }
-
 let startScripts: string[] | undefined = undefined;
 if (process.env.NAPCAT_BUILDSYS == 'linux') {
     if (process.env.NAPCAT_BUILDARCH == 'x64') {
@@ -82,6 +81,7 @@ const ShellBaseConfigPlugin: PluginOption[] = [
             { src: './src/core/external/napcat.json', dest: 'dist/config/' },
             { src: './src/onebot/config/onebot11.json', dest: 'dist/config/' },
             { src: './package.json', dest: 'dist' },
+            { src: './launcher/', dest: 'dist', flatten: true },
             // { src: './README.md', dest: 'dist' },
             // { src: './logo.png', dest: 'dist/logs' },
             ...(startScripts.map((startScript) => {