diff --git a/manifest.json b/manifest.json index 21ad6b51..8fa102cd 100644 --- a/manifest.json +++ b/manifest.json @@ -4,7 +4,7 @@ "name": "NapCatQQ", "slug": "NapCat.Framework", "description": "高性能的 OneBot 11 协议实现", - "version": "2.6.5", + "version": "2.6.6", "icon": "./logo.png", "authors": [ { diff --git a/package.json b/package.json index ec714635..1c881eb1 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "napcat", "private": true, "type": "module", - "version": "2.6.5", + "version": "2.6.6", "scripts": { "build:framework": "vite build --mode framework", "build:shell": "vite build --mode shell", diff --git a/src/common/version.ts b/src/common/version.ts index aed9d681..8ca6ca91 100644 --- a/src/common/version.ts +++ b/src/common/version.ts @@ -1 +1 @@ -export const napCatVersion = '2.6.5'; +export const napCatVersion = '2.6.6'; diff --git a/src/core/listeners/NodeIKernelO3MiscListener.ts b/src/core/listeners/NodeIO3MiscListener.ts similarity index 55% rename from src/core/listeners/NodeIKernelO3MiscListener.ts rename to src/core/listeners/NodeIO3MiscListener.ts index d015ea21..f7583d1e 100644 --- a/src/core/listeners/NodeIKernelO3MiscListener.ts +++ b/src/core/listeners/NodeIO3MiscListener.ts @@ -1,4 +1,4 @@ -export class NodeIKernelO3MiscListener { +export class NodeIO3MiscListener { getOnAmgomDataPiece(...arg: unknown[]) { } diff --git a/src/core/services/NodeIO3MiscService.ts b/src/core/services/NodeIO3MiscService.ts index a1a06d12..95c59d59 100644 --- a/src/core/services/NodeIO3MiscService.ts +++ b/src/core/services/NodeIO3MiscService.ts @@ -1,5 +1,9 @@ +import { NodeIO3MiscListener } from "../listeners/NodeIO3MiscListener"; + export interface NodeIO3MiscService { - addO3MiscListener(listeners: NodeIO3MiscService): number; + get(): NodeIO3MiscService; + + addO3MiscListener(listeners: NodeIO3MiscListener): number; setAmgomDataPiece(appid: string, dataPiece: Uint8Array): void; } diff --git a/src/core/wrapper.ts b/src/core/wrapper.ts index 375d5502..d89e57dd 100644 --- a/src/core/wrapper.ts +++ b/src/core/wrapper.ts @@ -26,6 +26,7 @@ import { NodeIKernelRecentContactService } from './services/NodeIKernelRecentCon import { NodeIKernelMSFService } from './services/NodeIKernelMSFService'; import { NodeIkernelTestPerformanceService } from './services/NodeIkernelTestPerformanceService'; import { NodeIKernelECDHService } from './services/NodeIKernelECDHService'; +import { NodeIO3MiscService } from './services/NodeIO3MiscService'; export interface NodeQQNTWrapperUtil { get(): unknown; @@ -268,13 +269,12 @@ export interface NodeIQQNTWrapperEngine { } export interface WrapperNodeApi { - [key: string]: any; - + NodeIO3MiscService: NodeIO3MiscService; NodeQQNTWrapperUtil: NodeQQNTWrapperUtil; NodeIQQNTWrapperSession: NodeIQQNTWrapperSession; NodeIQQNTWrapperEngine: NodeIQQNTWrapperEngine; NodeIKernelLoginService: NodeIKernelLoginService; - NodeIKernelProfileService: NodeIKernelProfileService; + } export enum PlatformType { KUNKNOWN, diff --git a/src/shell/napcat.ts b/src/shell/napcat.ts index 5d8481cb..de259d16 100644 --- a/src/shell/napcat.ts +++ b/src/shell/napcat.ts @@ -28,6 +28,7 @@ import { NapCatOneBot11Adapter } from '@/onebot'; import { InitWebUi } from '@/webui'; import { WebUiDataRuntime } from '@/webui/src/helper/Data'; import { napCatVersion } from '@/common/version'; +import { NodeIO3MiscListener } from '@/core/listeners/NodeIO3MiscListener'; program.option('-q, --qq [number]', 'QQ号').parse(process.argv); const cmdOptions = program.opts(); @@ -40,6 +41,10 @@ export async function NCoreInitShell() { const logger = new LogWrapper(pathWrapper.logsPath); const basicInfoWrapper = new QQBasicInfoWrapper({ logger }); const wrapper = loadQQWrapper(basicInfoWrapper.getFullQQVesion()); + + const o3Service = wrapper.NodeIO3MiscService.get(); + o3Service.addO3MiscListener(new NodeIO3MiscListener()); + logger.log(`[NapCat] [Core] NapCat.Core Version: ` + napCatVersion); InitWebUi(logger, pathWrapper).then().catch(logger.logError); @@ -228,7 +233,8 @@ export async function NCoreInitShell() { } }); // BEFORE LOGGING IN - + let amgomDataPiece = 'eb1fd6ac257461580dc7438eb099f23aae04ca679f4d88f53072dc56e3bb1129'; + o3Service.setAmgomDataPiece(basicInfoWrapper.QQVersionAppid, new Uint8Array(Buffer.from(amgomDataPiece, 'hex'))); // AFTER LOGGING IN // from initSession diff --git a/src/webui/ui/NapCat.ts b/src/webui/ui/NapCat.ts index e143bab1..06bfc1bc 100644 --- a/src/webui/ui/NapCat.ts +++ b/src/webui/ui/NapCat.ts @@ -30,7 +30,7 @@ async function onSettingWindowCreated(view: Element) { SettingItem( 'Napcat', undefined, - SettingButton('V2.6.5', 'napcat-update-button', 'secondary'), + SettingButton('V2.6.6', 'napcat-update-button', 'secondary'), ), ]), SettingList([ diff --git a/static/assets/renderer.js b/static/assets/renderer.js index 7f075a74..f899fe71 100644 --- a/static/assets/renderer.js +++ b/static/assets/renderer.js @@ -164,7 +164,7 @@ async function onSettingWindowCreated(view) { SettingItem( 'Napcat', void 0, - SettingButton("V2.6.5", "napcat-update-button", "secondary") + SettingButton("V2.6.6", "napcat-update-button", "secondary") ) ]), SettingList([