release:2.6.3

manifest.json

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

package.json

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

src/common/event.ts

@@ -187,7 +187,7 @@ export class NTEventWrapper {
                 const id = randomUUID();
                 let complete = 0;
                 let retData: Parameters<ListenerType> | undefined = undefined;
-                let retEvent: any = {};
+                const retEvent: any = {};
 
                 function sendDataCallback() {
                     if (complete == 0) {

src/common/file.ts

@@ -144,7 +144,7 @@ async function tryDownload(options: string | HttpDownloadOptions, useReferer: bo
     }
     if (useReferer && !headers['Referer']) {
         headers['Referer'] = url;
-    };
+    }
     const fetchRes = await fetch(url, { headers }).catch((err) => {
         if (err.cause) {
             throw err.cause;

src/common/helper.ts

@@ -188,14 +188,20 @@ export function getDefaultQQVersionConfigInfo(): QQVersionConfigType {
     };
 }
 
-export function getQQPackageInfoPath(exePath: string = '', version: string): string {
+export function getQQPackageInfoPath(exePath: string = '', version?: string): string {
+    let packagePath;
     if (os.platform() === 'darwin') {
-        return path.join(path.dirname(exePath), '..', 'Resources', 'app', 'package.json');
+        packagePath = path.join(path.dirname(exePath), '..', 'Resources', 'app', 'package.json');
     } else if (os.platform() === 'linux') {
-        return path.join(path.dirname(exePath), './resources/app/package.json');
+        packagePath = path.join(path.dirname(exePath), './resources/app/package.json');
     } else {
-        return path.join(path.dirname(exePath), './versions/' + version + '/resources/app/package.json');
+        packagePath = path.join(path.dirname(exePath), './versions/' + version + '/resources/app/package.json');
     }
+    //下面是老版本兼容 未来去掉
+    if (!fs.existsSync(packagePath)) {
+        packagePath = path.join(path.dirname(exePath), './resources/app/versions/' + version + '/package.json');
+    }
+    return packagePath;
 }
 
 export function getQQVersionConfigPath(exePath: string = ''): string | undefined {
@@ -214,6 +220,10 @@ export function getQQVersionConfigPath(exePath: string = ''): string | undefined
     if (typeof configVersionInfoPath !== 'string') {
         return undefined;
     }
+    //老版本兼容 未来去掉
+    if (!fs.existsSync(configVersionInfoPath)) {
+        configVersionInfoPath = path.join(path.dirname(exePath), './resources/app/versions/config.json');
+    }
     if (!fs.existsSync(configVersionInfoPath)) {
         return undefined;
     }

src/common/qq-basic-info.ts

@@ -28,7 +28,7 @@ export class QQBasicInfoWrapper {
             ? JSON.parse(fs.readFileSync(this.QQVersionConfigPath!).toString())
             : getDefaultQQVersionConfigInfo();
 
-        this.QQPackageInfoPath = getQQPackageInfoPath(this.QQMainPath, this.QQVersionConfig?.curVersion!);
+        this.QQPackageInfoPath = getQQPackageInfoPath(this.QQMainPath, this.QQVersionConfig?.curVersion);
         this.QQPackageInfo = JSON.parse(fs.readFileSync(this.QQPackageInfoPath).toString());
         const { appid: IQQVersionAppid, qua: IQQVersionQua } = this.getAppidV2();
         this.QQVersionAppid = IQQVersionAppid;

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '2.6.0';
+export const napCatVersion = '2.6.3';

src/core/index.ts

@@ -54,6 +54,10 @@ export function loadQQWrapper(QQVersion: string): WrapperNodeApi {
     if (!fs.existsSync(wrapperNodePath)) {
         wrapperNodePath = path.join(appPath, `./resources/app/wrapper.node`);
     }
+    //老版本兼容 未来去掉
+    if (!fs.existsSync(wrapperNodePath)) {
+        wrapperNodePath = path.join(path.dirname(process.execPath), `./resources/app/versions/${QQVersion}/wrapper.node`);
+    }
     const nativemodule: any = { exports: {} };
     process.dlopen(nativemodule, wrapperNodePath);
     return nativemodule.exports;

src/onebot/action/group/GetGroupMemberList.ts

@@ -23,7 +23,7 @@ class GetGroupMemberList extends BaseAction<Payload, OB11GroupMember[]> {
     async _handle(payload: Payload) {
         const groupMembers = await this.core.apis.GroupApi.getGroupMembersV2(payload.group_id.toString());
         const groupMembersArr = Array.from(groupMembers.values());
-        let uids = groupMembersArr.map(item => item.uid);
+        const uids = groupMembersArr.map(item => item.uid);
         //let CoreAndBase = await this.core.apis.GroupApi.getCoreAndBaseInfo(uids)
         let _groupMembers = groupMembersArr.map(item => {
             return OB11Entities.groupMember(payload.group_id.toString(), item);

src/onebot/api/msg.ts

@@ -574,9 +574,10 @@ export class OneBotMsgApi {
             } else {
                 postData = data;
             }
-            const signUrl = this.obContext.configLoader.configData.musicSignUrl;
+            let signUrl = this.obContext.configLoader.configData.musicSignUrl;
             if (!signUrl) {
-                throw Error('音乐消息签名地址未配置');
+                signUrl = 'https://ss.xingzhige.com/music_card/card';//感谢思思！
+                //throw Error('音乐消息签名地址未配置');
             }
             try {
                 const musicJson = await RequestUtil.HttpGetJson<any>(signUrl, 'POST', postData);
@@ -609,7 +610,7 @@ export class OneBotMsgApi {
         [OB11MessageDataType.miniapp]: async () => undefined,
 
         [OB11MessageDataType.contact]: async ({ data }, context) => {
-            let arkJson = await this.core.apis.UserApi.getBuddyRecommendContactArkJson(data.id.toString(), '');
+            const arkJson = await this.core.apis.UserApi.getBuddyRecommendContactArkJson(data.id.toString(), '');
             return this.ob11ToRawConverters.json({
                 data: { data: arkJson.arkMsg },
                 type: OB11MessageDataType.json

src/onebot/network/passive-websocket.ts

@@ -48,8 +48,8 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {
             //鉴权
             this.authorize(token, wsClient, wsReq);
             const paramUrl = wsReq.url?.indexOf('?') !== -1 ? wsReq.url?.substring(0, wsReq.url?.indexOf('?')) : wsReq.url;
-            const isEventConnect = paramUrl === '/event' || paramUrl === '' || paramUrl === '/';
+            const isApiConnect = paramUrl === '/api' || paramUrl === '/api/';
-            if (isEventConnect) {
+            if (!isApiConnect) {
                 this.connectEvent(core, wsClient);
             }
 
@@ -77,7 +77,7 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {
                 });
             });
             await this.wsClientsMutex.runExclusive(async () => {
-                if(isEventConnect){
+                if (!isApiConnect) {
                     this.wsClientWithEvent.push(wsClient);
                 }
                 this.wsClients.push(wsClient);

src/shell/napcat.ts

@@ -117,7 +117,7 @@ export async function NCoreInitShell() {
                 nick: '', // 获取不到
                 online: true,
             });
-        }
+        };
 
         loginListener.onQRCodeGetPicture = ({ pngBase64QrcodeData, qrcodeUrl }) => {
             //设置WebuiQrcode

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

vite.config.ts

@@ -1,10 +1,8 @@
-// import PreprocessorDirectives from 'unplugin-preprocessor-directives/vite';
 import cp from 'vite-plugin-cp';
 import { defineConfig, PluginOption, UserConfig } from 'vite';
 import { resolve } from 'path';
 import nodeResolve from '@rollup/plugin-node-resolve';
 import { builtinModules } from 'module';
-import babel from 'vite-plugin-babel';
 //依赖排除
 const external = ['silk-wasm', 'ws', 'express', 'fluent-ffmpeg', 'log4js', 'qrcode-terminal'];
 const nodeModules = [...builtinModules, builtinModules.map(m => `node:${m}`)].flat();
@@ -24,20 +22,6 @@ if (process.env.NAPCAT_BUILDSYS == 'linux') {
     startScripts = ['./script/KillQQ.bat'];
 }
 const FrameworkBaseConfigPlugin: PluginOption[] = [
-    // PreprocessorDirectives(),
-    babel({
-        filter: /.*\.(ts|js)$/,
-        babelConfig: {
-            babelrc: false,
-            configFile: false,
-            presets: ['@babel/preset-typescript'],
-            plugins: [
-                //'2018-09', decoratorsBeforeExport: true
-                ['@babel/plugin-proposal-decorators', { legacy: true }],
-                '@babel/plugin-proposal-class-properties',
-            ],
-        },
-    }),
     cp({
         targets: [
             { src: './manifest.json', dest: 'dist' },
@@ -50,38 +34,18 @@ const FrameworkBaseConfigPlugin: PluginOption[] = [
             { src: './src/framework/renderer.js', dest: 'dist' },
             { src: './package.json', dest: 'dist' },
             { src: './logo.png', dest: 'dist' },
-            //...external.map(genCpModule)
         ],
     }),
     nodeResolve(),
 ];
 const ShellBaseConfigPlugin: PluginOption[] = [
-    // PreprocessorDirectives(),
-    babel({
-        filter: /.*\.(ts|js)$/,
-        babelConfig: {
-            babelrc: false,
-            configFile: false,
-            presets: ['@babel/preset-typescript'],
-            plugins: [
-                //'2018-09', decoratorsBeforeExport: true
-                ['@babel/plugin-proposal-decorators', { legacy: true }],
-                '@babel/plugin-proposal-class-properties',
-            ],
-        },
-    }),
     cp({
         targets: [
-            // ...external.map(genCpModule),
-            // { src: './src/napcat.json', dest: 'dist/config/' },
             { src: './static/', dest: 'dist/static/', flatten: false },
-            // { src: './src/onebot11/onebot11.json', dest: 'dist/config/' },
             { 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) => {
                 return { src: startScript, dest: 'dist' };
             })),