refactor: core

src/common/data.ts

@@ -4,7 +4,7 @@ import {
   type Group,
   type GroupMember, GroupNotify,
   type SelfInfo
-} from '@/core/qqnt/entities';
+} from '../core/src/entities';
 import { isNumeric } from './utils/helper';
 import { log } from '@/common/utils/log';
 

src/common/utils/db.ts

@@ -1,4 +1,4 @@
-import { ElementType, FileElement, PicElement, PttElement, RawMessage, VideoElement } from '@/core/qqnt/entities';
+import { ElementType, FileElement, PicElement, PttElement, RawMessage, VideoElement } from '../../core/src/entities';
 
 import sqlite3 from 'sqlite3';
 import { log } from '@/common/utils/log';

src/common/utils/file.ts

@@ -10,7 +10,7 @@ import { v4 as uuidv4 } from 'uuid';
 import { napCatCore } from '@/core';
 
 export const getNapCatDir = () => {
-  const p = path.join(napCatCore.wrapper.dataPath, 'NapCat');
+  const p = path.join(napCatCore.dataPath, 'NapCat');
   fs.mkdirSync(p, { recursive: true });
   return p;
 };

src/common/utils/qqlevel.ts

@@ -1,5 +1,5 @@
 // QQ等级换算
-import { QQLevel } from '@/core/qqnt/entities';
+import { QQLevel } from '../../core/src/entities';
 
 export function calcQQLevel(level: QQLevel) {
   const { crownNum, sunNum, moonNum, starNum } = level;

src/core

@@ -1 +1 @@
-Subproject commit 853c771c0500cf91fc35b68d21ac2a101820334d
+Subproject commit 6a5f738a9b041793cb4bcd403c1882001b0c31df

src/core.lib/src/qqnt/apis/file.d.ts

@@ -1,4 +1,4 @@
-import { ChatType, ElementType } from '@/core/qqnt/entities';
+import { ChatType, ElementType } from '../../../../core/src/entities';
 import * as fileType from 'file-type';
 import { ISizeCalculationResult } from 'image-size/dist/types/interface';
 export declare class NTQQFileApi {

src/core.lib/src/qqnt/apis/friend.d.ts

@@ -1,4 +1,4 @@
-import { FriendRequest } from '@/core/qqnt/entities';
+import { FriendRequest } from '../../../../core/src/entities';
 export declare class NTQQFriendApi {
     static getFriends(forced?: boolean): Promise<void>;
     static handleFriendRequest(request: FriendRequest, accept: boolean): Promise<void>;

src/core.lib/src/qqnt/apis/group.js

@@ -1 +1 @@
-const _0xbcdb2c=_0x5189;(function(_0x262ec4,_0x3a2de8){const _0x27d148=_0x5189,_0x4461cf=_0x262ec4();while(!![]){try{const _0x36b476=parseInt(_0x27d148(0xea))/0x1*(parseInt(_0x27d148(0xd6))/0x2)+-parseInt(_0x27d148(0xde))/0x3*(-parseInt(_0x27d148(0xd1))/0x4)+-parseInt(_0x27d148(0xe7))/0x5*(parseInt(_0x27d148(0xf3))/0x6)+-parseInt(_0x27d148(0xd0))/0x7+-parseInt(_0x27d148(0xdc))/0x8*(-parseInt(_0x27d148(0xdb))/0x9)+parseInt(_0x27d148(0xd8))/0xa*(parseInt(_0x27d148(0xda))/0xb)+parseInt(_0x27d148(0xee))/0xc*(parseInt(_0x27d148(0xe4))/0xd);if(_0x36b476===_0x3a2de8)break;else _0x4461cf['push'](_0x4461cf['shift']());}catch(_0x8336f9){_0x4461cf['push'](_0x4461cf['shift']());}}}(_0x1c28,0xc82c1));import{napCatCore}from'@/core';function _0x5189(_0x4c6d52,_0x3610e1){const _0x1c2889=_0x1c28();return _0x5189=function(_0x5189ff,_0x4a0dd1){_0x5189ff=_0x5189ff-0xcd;let _0x21a3e5=_0x1c2889[_0x5189ff];return _0x21a3e5;},_0x5189(_0x4c6d52,_0x3610e1);}import{GroupListener}from'@/core/qqnt';export class NTQQGroupApi{static async[_0xbcdb2c(0xf6)](_0x2a9127=![]){const _0x6eeae8={'LOxeU':function(_0x5b7042,_0x4874af){return _0x5b7042(_0x4874af);},'KkMeq':function(_0x16cfd1,_0x2289d5){return _0x16cfd1(_0x2289d5);},'UQJlh':function(_0x203048,_0xef715d,_0x4d1119){return _0x203048(_0xef715d,_0x4d1119);}};let _0xb5da17=![];return new Promise((_0x339f47,_0x9a4e3e)=>{const _0x14ed27=_0x5189;_0x6eeae8[_0x14ed27(0xf2)](setTimeout,()=>{const _0x43355f=_0x14ed27;!_0xb5da17&&(napCatCore['service'][_0x43355f(0xdd)][_0x43355f(0xd3)]?.[_0x43355f(0xed)](_0x4593e7),_0x6eeae8['LOxeU'](_0x339f47,[]));},0x2710);const _0x2918dc=new GroupListener();_0x2918dc[_0x14ed27(0xf1)]=(_0x1a4588,_0x12d489)=>{const _0x52d79c=_0x14ed27;_0xb5da17=!![],_0x6eeae8['KkMeq'](_0x339f47,_0x12d489),napCatCore['service'][_0x52d79c(0xdd)][_0x52d79c(0xd3)]?.[_0x52d79c(0xed)](_0x4593e7);};const _0x4593e7=napCatCore[_0x14ed27(0xe8)][_0x14ed27(0xdd)][_0x14ed27(0xe2)](_0x2918dc);napCatCore['service']['group'][_0x14ed27(0xd3)]?.[_0x14ed27(0xe1)](_0x2a9127)[_0x14ed27(0xe3)]();});}static async[_0xbcdb2c(0xe6)](_0xf63e66,_0x4e7bed=0xbb8){}static async[_0xbcdb2c(0xe0)](){}static async[_0xbcdb2c(0xef)](){}static async[_0xbcdb2c(0xd2)](_0x101cd8,_0x39ae35,_0x656060){const _0x1ae387=_0xbcdb2c,_0x2e0b32={'SIyzE':function(_0x2e73c9,_0x53183e){return _0x2e73c9||_0x53183e;}};return napCatCore[_0x1ae387(0xe8)][_0x1ae387(0xdd)][_0x1ae387(0xd3)]?.[_0x1ae387(0xf5)](![],{'operateType':_0x39ae35,'targetMsg':{'seq':_0x101cd8['seq'],'type':_0x101cd8[_0x1ae387(0xdf)],'groupCode':_0x101cd8['group'][_0x1ae387(0xd9)],'postscript':_0x2e0b32['SIyzE'](_0x656060,'')}});}static async[_0xbcdb2c(0xcf)](_0x5ced3c){const _0x5461f2=_0xbcdb2c;return napCatCore[_0x5461f2(0xe8)][_0x5461f2(0xdd)][_0x5461f2(0xd3)]?.['quitGroup'](_0x5ced3c);}static async['kickMember'](_0x254c44,_0x2d71b1,_0x168733=![],_0x1549e0=''){const _0x590dd8=_0xbcdb2c;return napCatCore[_0x590dd8(0xe8)][_0x590dd8(0xdd)][_0x590dd8(0xd3)]?.[_0x590dd8(0xd5)](_0x254c44,_0x2d71b1,_0x168733,_0x1549e0);}static async['banMember'](_0x1c1aec,_0x454c68){const _0x507a3b=_0xbcdb2c;return napCatCore[_0x507a3b(0xe8)]['group'][_0x507a3b(0xd3)]?.[_0x507a3b(0xf0)](_0x1c1aec,_0x454c68);}static async[_0xbcdb2c(0xd7)](_0x198faf,_0x7c0718){const _0x29b156=_0xbcdb2c;return napCatCore[_0x29b156(0xe8)]['group'][_0x29b156(0xd3)]?.[_0x29b156(0xce)](_0x198faf,_0x7c0718);}static async['setMemberCard'](_0x31bcda,_0xd98112,_0x285c4c){const _0x544d97=_0xbcdb2c;return napCatCore['service']['group'][_0x544d97(0xd3)]?.[_0x544d97(0xd4)](_0x31bcda,_0xd98112,_0x285c4c);}static async[_0xbcdb2c(0xec)](_0x1e317a,_0x27e2ec,_0x5b9969){const _0x373120=_0xbcdb2c;return napCatCore['service'][_0x373120(0xdd)][_0x373120(0xd3)]?.[_0x373120(0xe5)](_0x1e317a,_0x27e2ec,_0x5b9969);}static async[_0xbcdb2c(0xeb)](_0x55a459,_0x3c1d62){const _0x38cacf=_0xbcdb2c;return napCatCore[_0x38cacf(0xe8)][_0x38cacf(0xdd)]['kernelService']?.[_0x38cacf(0xf4)](_0x55a459,_0x3c1d62,![]);}static async[_0xbcdb2c(0xcd)](_0x351fd7,_0x2fbbf4,_0x15884c){}static[_0xbcdb2c(0xe9)](_0x4ab14b,_0x5d19d9,_0x7267a4){}}function _0x1c28(){const _0x53cb2b=['37338xywSjW','modifyGroupName','operateSysNotify','getGroups','setGroupTitle','setGroupShutUp','quitGroup','10151064vTltUQ','1658936FcpKvp','handleGroupRequest','kernelService','modifyMemberCardName','kickMember','1045478nduRWM','banGroup','7518130dlxiUu','groupCode','11tPlZxS','4681791EQnama','24HwpaDi','group','3wfAwAv','type','getGroupNotifies','getGroupList','addGroupListener','then','934193BFaiCH','modifyMemberRole','getGroupMembers','845fYQpBo','service','publishGroupBulletin','1rAxGpz','setGroupName','setMemberRole','removeKernelGroupListener','12Htopgn','getGroupIgnoreNotifies','setMemberShutUp','onGroupListUpdate','UQJlh'];_0x1c28=function(){return _0x53cb2b;};return _0x1c28();}
+const _0xbcdb2c=_0x5189;(function(_0x262ec4,_0x3a2de8){const _0x27d148=_0x5189,_0x4461cf=_0x262ec4();while(!![]){try{const _0x36b476=parseInt(_0x27d148(0xea))/0x1*(parseInt(_0x27d148(0xd6))/0x2)+-parseInt(_0x27d148(0xde))/0x3*(-parseInt(_0x27d148(0xd1))/0x4)+-parseInt(_0x27d148(0xe7))/0x5*(parseInt(_0x27d148(0xf3))/0x6)+-parseInt(_0x27d148(0xd0))/0x7+-parseInt(_0x27d148(0xdc))/0x8*(-parseInt(_0x27d148(0xdb))/0x9)+parseInt(_0x27d148(0xd8))/0xa*(parseInt(_0x27d148(0xda))/0xb)+parseInt(_0x27d148(0xee))/0xc*(parseInt(_0x27d148(0xe4))/0xd);if(_0x36b476===_0x3a2de8)break;else _0x4461cf['push'](_0x4461cf['shift']());}catch(_0x8336f9){_0x4461cf['push'](_0x4461cf['shift']());}}}(_0x1c28,0xc82c1));import{napCatCore}from'@/core';function _0x5189(_0x4c6d52,_0x3610e1){const _0x1c2889=_0x1c28();return _0x5189=function(_0x5189ff,_0x4a0dd1){_0x5189ff=_0x5189ff-0xcd;let _0x21a3e5=_0x1c2889[_0x5189ff];return _0x21a3e5;},_0x5189(_0x4c6d52,_0x3610e1);}import{GroupListener}from '@/core';export class NTQQGroupApi{static async[_0xbcdb2c(0xf6)](_0x2a9127=![]){const _0x6eeae8={'LOxeU':function(_0x5b7042, _0x4874af){return _0x5b7042(_0x4874af);},'KkMeq':function(_0x16cfd1, _0x2289d5){return _0x16cfd1(_0x2289d5);},'UQJlh':function(_0x203048, _0xef715d, _0x4d1119){return _0x203048(_0xef715d,_0x4d1119);}};let _0xb5da17=![];return new Promise((_0x339f47, _0x9a4e3e)=>{const _0x14ed27=_0x5189;_0x6eeae8[_0x14ed27(0xf2)](setTimeout,()=>{const _0x43355f=_0x14ed27;!_0xb5da17&&(napCatCore['service'][_0x43355f(0xdd)][_0x43355f(0xd3)]?.[_0x43355f(0xed)](_0x4593e7),_0x6eeae8['LOxeU'](_0x339f47,[]));},0x2710);const _0x2918dc=new GroupListener();_0x2918dc[_0x14ed27(0xf1)]=(_0x1a4588, _0x12d489)=>{const _0x52d79c=_0x14ed27;_0xb5da17=!![],_0x6eeae8['KkMeq'](_0x339f47,_0x12d489),napCatCore['service'][_0x52d79c(0xdd)][_0x52d79c(0xd3)]?.[_0x52d79c(0xed)](_0x4593e7);};const _0x4593e7=napCatCore[_0x14ed27(0xe8)][_0x14ed27(0xdd)][_0x14ed27(0xe2)](_0x2918dc);napCatCore['service']['group'][_0x14ed27(0xd3)]?.[_0x14ed27(0xe1)](_0x2a9127)[_0x14ed27(0xe3)]();});}static async[_0xbcdb2c(0xe6)](_0xf63e66, _0x4e7bed=0xbb8){}static async[_0xbcdb2c(0xe0)](){}static async[_0xbcdb2c(0xef)](){}static async[_0xbcdb2c(0xd2)](_0x101cd8, _0x39ae35, _0x656060){const _0x1ae387=_0xbcdb2c,_0x2e0b32={'SIyzE':function(_0x2e73c9, _0x53183e){return _0x2e73c9||_0x53183e;}};return napCatCore[_0x1ae387(0xe8)][_0x1ae387(0xdd)][_0x1ae387(0xd3)]?.[_0x1ae387(0xf5)](![],{'operateType':_0x39ae35,'targetMsg':{'seq':_0x101cd8['seq'],'type':_0x101cd8[_0x1ae387(0xdf)],'groupCode':_0x101cd8['group'][_0x1ae387(0xd9)],'postscript':_0x2e0b32['SIyzE'](_0x656060,'')}});}static async[_0xbcdb2c(0xcf)](_0x5ced3c){const _0x5461f2=_0xbcdb2c;return napCatCore[_0x5461f2(0xe8)][_0x5461f2(0xdd)][_0x5461f2(0xd3)]?.['quitGroup'](_0x5ced3c);}static async['kickMember'](_0x254c44, _0x2d71b1, _0x168733=![], _0x1549e0=''){const _0x590dd8=_0xbcdb2c;return napCatCore[_0x590dd8(0xe8)][_0x590dd8(0xdd)][_0x590dd8(0xd3)]?.[_0x590dd8(0xd5)](_0x254c44,_0x2d71b1,_0x168733,_0x1549e0);}static async['banMember'](_0x1c1aec, _0x454c68){const _0x507a3b=_0xbcdb2c;return napCatCore[_0x507a3b(0xe8)]['group'][_0x507a3b(0xd3)]?.[_0x507a3b(0xf0)](_0x1c1aec,_0x454c68);}static async[_0xbcdb2c(0xd7)](_0x198faf, _0x7c0718){const _0x29b156=_0xbcdb2c;return napCatCore[_0x29b156(0xe8)]['group'][_0x29b156(0xd3)]?.[_0x29b156(0xce)](_0x198faf,_0x7c0718);}static async['setMemberCard'](_0x31bcda, _0xd98112, _0x285c4c){const _0x544d97=_0xbcdb2c;return napCatCore['service']['group'][_0x544d97(0xd3)]?.[_0x544d97(0xd4)](_0x31bcda,_0xd98112,_0x285c4c);}static async[_0xbcdb2c(0xec)](_0x1e317a, _0x27e2ec, _0x5b9969){const _0x373120=_0xbcdb2c;return napCatCore['service'][_0x373120(0xdd)][_0x373120(0xd3)]?.[_0x373120(0xe5)](_0x1e317a,_0x27e2ec,_0x5b9969);}static async[_0xbcdb2c(0xeb)](_0x55a459, _0x3c1d62){const _0x38cacf=_0xbcdb2c;return napCatCore[_0x38cacf(0xe8)][_0x38cacf(0xdd)]['kernelService']?.[_0x38cacf(0xf4)](_0x55a459,_0x3c1d62,![]);}static async[_0xbcdb2c(0xcd)](_0x351fd7, _0x2fbbf4, _0x15884c){}static[_0xbcdb2c(0xe9)](_0x4ab14b, _0x5d19d9, _0x7267a4){}}function _0x1c28(){const _0x53cb2b=['37338xywSjW','modifyGroupName','operateSysNotify','getGroups','setGroupTitle','setGroupShutUp','quitGroup','10151064vTltUQ','1658936FcpKvp','handleGroupRequest','kernelService','modifyMemberCardName','kickMember','1045478nduRWM','banGroup','7518130dlxiUu','groupCode','11tPlZxS','4681791EQnama','24HwpaDi','group','3wfAwAv','type','getGroupNotifies','getGroupList','addGroupListener','then','934193BFaiCH','modifyMemberRole','getGroupMembers','845fYQpBo','service','publishGroupBulletin','1rAxGpz','setGroupName','setMemberRole','removeKernelGroupListener','12Htopgn','getGroupIgnoreNotifies','setMemberShutUp','onGroupListUpdate','UQJlh'];_0x1c28=function(){return _0x53cb2b;};return _0x1c28();}

src/core.lib/src/qqnt/apis/msg.d.ts

@@ -1,6 +1,6 @@
-import { Peer, RawMessage, SendMessageElement } from '@/core/qqnt/entities';
+import { Peer, RawMessage, SendMessageElement } from '../../../../core/src/entities';
 import { NapCatCore } from '@/core';
-import { GeneralCallResult } from '@/core/qqnt/services/common';
+import { GeneralCallResult } from '@/core/services/common';
 export declare class NTQQMsgApi {
     static napCatCore: NapCatCore | null;
     static getMultiMsg(peer: Peer, rootMsgId: string, parentMsgId: string): Promise<GeneralCallResult & {

src/core.lib/src/qqnt/apis/user.d.ts

@@ -1,4 +1,4 @@
-import { User } from '@/core/qqnt/entities';
+import { User } from '../../../../core/src/entities';
 export declare class NTQQUserApi {
     static like(uid: string, count?: number): Promise<{
         result: number;

src/core.lib/src/qqnt/apis/user.js

@@ -1 +1 @@
-const _0x53bf1c=_0x3a99;(function(_0x582b4f,_0x2e9192){const _0x57dbbe=_0x3a99,_0x47da03=_0x582b4f();while(!![]){try{const _0x2ea51a=-parseInt(_0x57dbbe(0x187))/0x1+parseInt(_0x57dbbe(0x184))/0x2*(-parseInt(_0x57dbbe(0x172))/0x3)+-parseInt(_0x57dbbe(0x178))/0x4*(parseInt(_0x57dbbe(0x165))/0x5)+-parseInt(_0x57dbbe(0x175))/0x6*(parseInt(_0x57dbbe(0x17f))/0x7)+-parseInt(_0x57dbbe(0x17c))/0x8*(-parseInt(_0x57dbbe(0x180))/0x9)+parseInt(_0x57dbbe(0x16b))/0xa*(-parseInt(_0x57dbbe(0x189))/0xb)+-parseInt(_0x57dbbe(0x181))/0xc*(-parseInt(_0x57dbbe(0x185))/0xd);if(_0x2ea51a===_0x2e9192)break;else _0x47da03['push'](_0x47da03['shift']());}catch(_0x159d0f){_0x47da03['push'](_0x47da03['shift']());}}}(_0x24ae,0xacd2b));import{napCatCore}from'@/core';import{ProfileListener}from'@/core/qqnt/listeners';function _0x3a99(_0x115d88,_0x2a1bf3){const _0x24ae7e=_0x24ae();return _0x3a99=function(_0x3a990c,_0x1c3043){_0x3a990c=_0x3a990c-0x164;let _0x179f9d=_0x24ae7e[_0x3a990c];return _0x179f9d;},_0x3a99(_0x115d88,_0x2a1bf3);}import{randomUUID}from'crypto';const userInfoCache={},profileListener=new ProfileListener(),userDetailHandlers=new Map();profileListener[_0x53bf1c(0x170)]=_0x105fce=>{const _0x5aeae3=_0x53bf1c;userInfoCache[_0x105fce[_0x5aeae3(0x174)]]=_0x105fce,userDetailHandlers['forEach'](_0x4a5a1d=>_0x4a5a1d(_0x105fce));},setTimeout(()=>{const _0x3bf59b=_0x53bf1c;napCatCore[_0x3bf59b(0x16f)](()=>{const _0x119685=_0x3bf59b;napCatCore[_0x119685(0x186)][_0x119685(0x183)][_0x119685(0x17b)](profileListener);});},0x64);export class NTQQUserApi{static async['like'](_0x45c69a,_0x4cc6be=0x1){const _0x393f76=_0x53bf1c;return napCatCore['service'][_0x393f76(0x17e)]['kernelService'][_0x393f76(0x177)]({'friendUid':_0x45c69a,'sourceId':0x47,'doLikeCount':_0x4cc6be,'doLikeTollCount':0x0});}static async[_0x53bf1c(0x179)](_0x2f6f92){const _0x3dbe8e=_0x53bf1c,_0x41d3bd=napCatCore[_0x3dbe8e(0x186)][_0x3dbe8e(0x183)][_0x3dbe8e(0x171)]?.[_0x3dbe8e(0x16a)](_0x2f6f92);return{'result':_0x41d3bd?.[_0x3dbe8e(0x164)],'errMsg':_0x41d3bd?.['errMsg']};}static async[_0x53bf1c(0x168)](){}static async[_0x53bf1c(0x17a)](_0x8ac2a0){}static async[_0x53bf1c(0x169)](_0x5316e7){const _0x1166fd=_0x53bf1c,_0x178559={'nOrhd':function(_0x604b28,_0x6c2119){return _0x604b28===_0x6c2119;},'lvzsk':function(_0x633325,_0x14da98){return _0x633325(_0x14da98);},'fPysa':_0x1166fd(0x173),'xwEVA':function(_0xf1f80e){return _0xf1f80e();},'XsaQh':function(_0x223bfa,_0x53d5e5,_0x55db39){return _0x223bfa(_0x53d5e5,_0x55db39);}},_0x3a9687=napCatCore['service']['profile']['kernelService'];return new Promise((_0x34679b,_0x1e3c95)=>{const _0x4f33e3=_0x1166fd,_0x5e6a18={'NgZEB':_0x178559[_0x4f33e3(0x166)]},_0x1253ba=_0x178559['xwEVA'](randomUUID);let _0x9a2aaf=![];_0x178559[_0x4f33e3(0x176)](setTimeout,()=>{const _0x5df914=_0x4f33e3;!_0x9a2aaf&&_0x1e3c95(_0x5e6a18[_0x5df914(0x16d)]);},0x1388),userDetailHandlers[_0x4f33e3(0x17d)](_0x1253ba,_0x5594f2=>{const _0x548c24=_0x4f33e3;_0x178559['nOrhd'](_0x5594f2[_0x548c24(0x174)],_0x5316e7)&&(_0x9a2aaf=!![],userDetailHandlers[_0x548c24(0x182)](_0x1253ba),_0x178559[_0x548c24(0x16e)](_0x34679b,_0x5594f2));}),_0x3a9687[_0x4f33e3(0x16c)](_0x5316e7,[0x0])[_0x4f33e3(0x188)](_0x2b719c=>{});});}static async[_0x53bf1c(0x167)](){}static async['getSkey'](_0x186c09,_0x19483b){}}function _0x24ae(){const _0x31f7d6=['NgZEB','lvzsk','addLoginSuccessCallback','onProfileDetailInfoChanged','kernelService','2586bYPxzM','getUserDetailInfo\x20timeout','uid','1842BCiWpL','XsaQh','setBuddyProfileLike','28mRJodZ','setQQAvatar','getUserInfo','addProfileListener','2344RtvZDT','set','profileLike','31668EcasME','17586HPheEt','688596QSdHqN','delete','profile','2444apHmGJ','1170tdLKhn','service','759247cjDnPr','then','1117589GjrzNh','result','797455mPzIUL','fPysa','getPSkey','getSelfInfo','getUserDetailInfo','setHeader','70NNKrlp','getUserDetailInfoWithBizInfo'];_0x24ae=function(){return _0x31f7d6;};return _0x24ae();}
+const _0x53bf1c=_0x3a99;(function(_0x582b4f,_0x2e9192){const _0x57dbbe=_0x3a99,_0x47da03=_0x582b4f();while(!![]){try{const _0x2ea51a=-parseInt(_0x57dbbe(0x187))/0x1+parseInt(_0x57dbbe(0x184))/0x2*(-parseInt(_0x57dbbe(0x172))/0x3)+-parseInt(_0x57dbbe(0x178))/0x4*(parseInt(_0x57dbbe(0x165))/0x5)+-parseInt(_0x57dbbe(0x175))/0x6*(parseInt(_0x57dbbe(0x17f))/0x7)+-parseInt(_0x57dbbe(0x17c))/0x8*(-parseInt(_0x57dbbe(0x180))/0x9)+parseInt(_0x57dbbe(0x16b))/0xa*(-parseInt(_0x57dbbe(0x189))/0xb)+-parseInt(_0x57dbbe(0x181))/0xc*(-parseInt(_0x57dbbe(0x185))/0xd);if(_0x2ea51a===_0x2e9192)break;else _0x47da03['push'](_0x47da03['shift']());}catch(_0x159d0f){_0x47da03['push'](_0x47da03['shift']());}}}(_0x24ae,0xacd2b));import{napCatCore}from'@/core';import{ProfileListener}from 'src/core/src/listeners';function _0x3a99(_0x115d88, _0x2a1bf3){const _0x24ae7e=_0x24ae();return _0x3a99=function(_0x3a990c, _0x1c3043){_0x3a990c=_0x3a990c-0x164;let _0x179f9d=_0x24ae7e[_0x3a990c];return _0x179f9d;},_0x3a99(_0x115d88,_0x2a1bf3);}import{randomUUID}from'crypto';const userInfoCache={},profileListener=new ProfileListener(),userDetailHandlers=new Map();profileListener[_0x53bf1c(0x170)]= _0x105fce=>{const _0x5aeae3=_0x53bf1c;userInfoCache[_0x105fce[_0x5aeae3(0x174)]]=_0x105fce,userDetailHandlers['forEach'](_0x4a5a1d=>_0x4a5a1d(_0x105fce));},setTimeout(()=>{const _0x3bf59b=_0x53bf1c;napCatCore[_0x3bf59b(0x16f)](()=>{const _0x119685=_0x3bf59b;napCatCore[_0x119685(0x186)][_0x119685(0x183)][_0x119685(0x17b)](profileListener);});},0x64);export class NTQQUserApi{static async['like'](_0x45c69a, _0x4cc6be=0x1){const _0x393f76=_0x53bf1c;return napCatCore['service'][_0x393f76(0x17e)]['kernelService'][_0x393f76(0x177)]({'friendUid':_0x45c69a,'sourceId':0x47,'doLikeCount':_0x4cc6be,'doLikeTollCount':0x0});}static async[_0x53bf1c(0x179)](_0x2f6f92){const _0x3dbe8e=_0x53bf1c,_0x41d3bd=napCatCore[_0x3dbe8e(0x186)][_0x3dbe8e(0x183)][_0x3dbe8e(0x171)]?.[_0x3dbe8e(0x16a)](_0x2f6f92);return{'result':_0x41d3bd?.[_0x3dbe8e(0x164)],'errMsg':_0x41d3bd?.['errMsg']};}static async[_0x53bf1c(0x168)](){}static async[_0x53bf1c(0x17a)](_0x8ac2a0){}static async[_0x53bf1c(0x169)](_0x5316e7){const _0x1166fd=_0x53bf1c,_0x178559={'nOrhd':function(_0x604b28, _0x6c2119){return _0x604b28===_0x6c2119;},'lvzsk':function(_0x633325, _0x14da98){return _0x633325(_0x14da98);},'fPysa':_0x1166fd(0x173),'xwEVA':function(_0xf1f80e){return _0xf1f80e();},'XsaQh':function(_0x223bfa, _0x53d5e5, _0x55db39){return _0x223bfa(_0x53d5e5,_0x55db39);}},_0x3a9687=napCatCore['service']['profile']['kernelService'];return new Promise((_0x34679b, _0x1e3c95)=>{const _0x4f33e3=_0x1166fd,_0x5e6a18={'NgZEB':_0x178559[_0x4f33e3(0x166)]},_0x1253ba=_0x178559['xwEVA'](randomUUID);let _0x9a2aaf=![];_0x178559[_0x4f33e3(0x176)](setTimeout,()=>{const _0x5df914=_0x4f33e3;!_0x9a2aaf&&_0x1e3c95(_0x5e6a18[_0x5df914(0x16d)]);},0x1388),userDetailHandlers[_0x4f33e3(0x17d)](_0x1253ba, _0x5594f2=>{const _0x548c24=_0x4f33e3;_0x178559['nOrhd'](_0x5594f2[_0x548c24(0x174)],_0x5316e7)&&(_0x9a2aaf=!![],userDetailHandlers[_0x548c24(0x182)](_0x1253ba),_0x178559[_0x548c24(0x16e)](_0x34679b,_0x5594f2));}),_0x3a9687[_0x4f33e3(0x16c)](_0x5316e7,[0x0])[_0x4f33e3(0x188)](_0x2b719c=>{});});}static async[_0x53bf1c(0x167)](){}static async['getSkey'](_0x186c09, _0x19483b){}}function _0x24ae(){const _0x31f7d6=['NgZEB','lvzsk','addLoginSuccessCallback','onProfileDetailInfoChanged','kernelService','2586bYPxzM','getUserDetailInfo\x20timeout','uid','1842BCiWpL','XsaQh','setBuddyProfileLike','28mRJodZ','setQQAvatar','getUserInfo','addProfileListener','2344RtvZDT','set','profileLike','31668EcasME','17586HPheEt','688596QSdHqN','delete','profile','2444apHmGJ','1170tdLKhn','service','759247cjDnPr','then','1117589GjrzNh','result','797455mPzIUL','fPysa','getPSkey','getSelfInfo','getUserDetailInfo','setHeader','70NNKrlp','getUserDetailInfoWithBizInfo'];_0x24ae=function(){return _0x31f7d6;};return _0x24ae();}

src/core.lib/src/qqnt/listeners/NodeIKernelBuddyListener.d.ts

@@ -1,4 +1,4 @@
-import { FriendRequestNotify, User } from '@/core/qqnt/entities';
+import { FriendRequestNotify, User } from '../../../../core/src/entities';
 interface IBuddyListener {
     onBuddyListChange(arg: {
         categoryId: number;

src/core.lib/src/qqnt/listeners/NodeIKernelGroupListener.d.ts

@@ -1,4 +1,4 @@
-import { Group, GroupMember, GroupNotify } from '@/core/qqnt/entities';
+import { Group, GroupMember, GroupNotify } from '../../../../core/src/entities';
 interface IGroupListener {
     onGroupListUpdate(updateType: number, groupList: Group[]): void;
     onGroupExtListUpdate(...args: unknown[]): void;

src/core.lib/src/qqnt/listeners/NodeIKernelMsgListener.d.ts

@@ -1,4 +1,4 @@
-import { RawMessage } from '@/core/qqnt/entities';
+import { RawMessage } from '../../../../core/src/entities';
 export interface OnRichMediaDownloadCompleteParams {
     fileModelId: string;
     msgElementId: string;

src/core.lib/src/qqnt/listeners/NodeIKernelProfileListener .d.ts

@@ -1,4 +1,4 @@
-import { User } from '@/core/qqnt/entities';
+import { User } from '../../../../core/src/entities';
 interface IProfileListener {
     onProfileSimpleChanged(...args: unknown[]): void;
     onProfileDetailInfoChanged(profile: User): void;

src/core.lib/src/qqnt/services/NodeIKernelBuddyService.d.ts

@@ -1,6 +1,6 @@
-import { Friend } from '@/core/qqnt/entities';
+import { Friend } from '../../../../core/src/entities';
-import { GeneralCallResult } from '@/core/qqnt/services/common';
+import { GeneralCallResult } from '@/core/services/common';
-import { NodeIKernelBuddyListener } from '@/core/qqnt/listeners';
+import { NodeIKernelBuddyListener } from '../../../../core/src/listeners';
 export interface NodeIKernelBuddyService {
     friends: Friend[];
     getFriend(uidOrUin: string): Promise<Friend>;

src/core.lib/src/qqnt/services/NodeIKernelGroupService.d.ts

@@ -1,6 +1,6 @@
-import { NodeIKernelGroupListener } from '@/core/qqnt/listeners/NodeIKernelGroupListener';
+import { NodeIKernelGroupListener } from '@/core/listeners/NodeIKernelGroupListener';
-import { GroupMember, GroupMemberRole, GroupNotifyTypes, GroupRequestOperateTypes } from '@/core/qqnt/entities';
+import { GroupMember, GroupMemberRole, GroupNotifyTypes, GroupRequestOperateTypes } from '../../../../core/src/entities';
-import { GeneralCallResult } from '@/core/qqnt/services/common';
+import { GeneralCallResult } from '@/core/services/common';
 export interface NodeIKernelGroupService {
     addKernelGroupListener(listener: NodeIKernelGroupListener): number;
     removeKernelGroupListener(listenerId: unknown): void;

src/core.lib/src/qqnt/services/NodeIKernelLoginService.d.ts

@@ -1,4 +1,4 @@
-import { NodeIKernelLoginListener } from '@/core/qqnt/listeners/NodeIKernelLoginListener';
+import { NodeIKernelLoginListener } from '@/core/listeners/NodeIKernelLoginListener';
 export interface LoginInitConfig {
     machineId: '';
     appid: string;

src/core.lib/src/qqnt/services/NodeIKernelMsgService.d.ts

@@ -1,6 +1,6 @@
-import { ChatType, ElementType, Peer, RawMessage, SendMessageElement } from '@/core/qqnt/entities';
+import { ChatType, ElementType, Peer, RawMessage, SendMessageElement } from '../../../../core/src/entities';
-import { NodeIKernelMsgListener } from '@/core/qqnt/listeners/NodeIKernelMsgListener';
+import { NodeIKernelMsgListener } from '@/core/listeners/NodeIKernelMsgListener';
-import { GeneralCallResult } from '@/core/qqnt/services/common';
+import { GeneralCallResult } from '@/core/services/common';
 export interface NodeIKernelMsgService {
     addKernelMsgListener(nodeIKernelMsgListener: NodeIKernelMsgListener): void;
     sendMsg(msgId: string, peer: Peer, msgElements: SendMessageElement[], map: Map<any, any>): Promise<unknown>;

src/core.lib/src/qqnt/services/NodeIKernelProfileService.d.ts

@@ -1,5 +1,5 @@
 import { NodeIKernelProfileListener } from '../listeners';
-import { GeneralCallResult } from '@/core/qqnt/services/common';
+import { GeneralCallResult } from '@/core/services/common';
 export interface NodeIKernelProfileService {
     addKernelProfileListener(listener: NodeIKernelProfileListener): void;
     removeKernelProfileListener(listenerId: unknown): void;

src/index.ts

@@ -1,7 +1,6 @@
 import { napCatCore } from '@/core';
-import { MsgListener } from '@/core/qqnt/listeners';
+import { MsgListener } from '@/core/listeners';
 import { NapCatOnebot11 } from '@/onebot11/main';
-import { ob11Config } from '@/onebot11/config';
 import { program } from 'commander';
 import qrcode from 'qrcode-terminal';
 import * as readline from 'node:readline';
@@ -36,47 +35,35 @@ checkVersion().then((remoteVersion: string) => {
   console.error('[NapCat] 检测更新失败');
 });
 new NapCatOnebot11();
-napCatCore.addLoginSuccessCallback(() => {
+napCatCore.onLoginSuccess(() => {
   console.log('login success');
   postLoginStatus();
-  const msgListener = new MsgListener();
-  msgListener.onRecvMsg = (msg) => {
-    // console.log(JSON.stringify(Array.from(msg[0].msgAttrs.values())));
-    // napCatCore.service.msg.kernelService?.getMsgsByMsgId(msg[0].msgId, 20).then(res=>console.log(res));
-
-    // console.log("onRecvMsg", msg)
-  };
-  // napCatCore.getGroupService().getGroupExtList(true).then((res) => {
-  //     console.log(res)
-  // })
-  napCatCore.service.msg.addMsgListener(msgListener);
 });
-napCatCore.on('system.login.qrcode', (qrCodeData: { url: string, base64: string }) => {
+const showQRCode = (qrCodeData: { url: string, base64: string, buffer: Buffer }) => {
   console.log('请扫描下面的二维码，然后在手Q上授权登录：');
   console.log('二维码解码URL:', qrCodeData.url);
   const qrcodePath = path.join(__dirname, 'qrcode.png');
-  fs.writeFile(qrcodePath, qrCodeData.base64.split('data:image/png;base64')[1], 'base64').then(() => {
+  fs.writeFile(qrcodePath, qrCodeData.buffer).then(() => {
     console.log('二维码已保存到', qrcodePath);
   });
   qrcode.generate(qrCodeData.url, { small: true }, (res) => {
     console.log(res);
   });
-});
+};
-// console.log(cmdOptions);
 const quickLoginQQ = cmdOptions.qq;
-napCatCore.on('system.login.error', (result) => {
+// napCatCore.on('system.login.error', (result) => {
-  console.error('登录失败', result);
+//   console.error('登录失败', result);
-  napCatCore.login.qrcode().then().catch(console.error);
+//   napCatCore.qrLogin().then().catch(console.error);
-});
+// });
 if (quickLoginQQ) {
   console.log('quick login', quickLoginQQ);
-  napCatCore.login.quick(quickLoginQQ).then().catch((e) => {
+  napCatCore.quickLogin(quickLoginQQ).then().catch((e) => {
-    console.error(`${quickLoginQQ}快速登录不可用，请检查是否已经登录了`, e);
+    console.error(e);
-    napCatCore.login.qrcode().then();
+    napCatCore.qrLogin().then(showQRCode);
   });
 } else {
   console.info('没有 -q 参数指定快速登录的QQ，将使用二维码登录方式');
-  napCatCore.login.qrcode().then();
+  napCatCore.qrLogin().then(showQRCode);
 }
 
 // napCatCore.login.service.getLoginList().then((res) => {

src/onebot11/action/extends/Debug.ts

@@ -8,9 +8,9 @@ import {
   NTQQFileApi,
   // NTQQFileCacheApi,
   NTQQWindowApi,
-} from '@/core/qqnt/apis';
+} from '@/core';
 import { ActionName } from '../types';
-import { log } from '../../../common/utils/log';
+import { log } from '@/common/utils/log';
 
 interface Payload {
   method: string,

src/onebot11/action/extends/GetGroupAddRequest.ts

@@ -1,10 +1,9 @@
-import { GroupNotify, GroupNotifyStatus } from '../../../ntqqapi/types';
+import { GroupNotify, GroupNotifyStatus } from '@/core/entities';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
-import { uid2UinMap } from '../../../common/data';
+import { uid2UinMap } from '@/common/data';
-import { NTQQUserApi } from '@/core/qqnt/apis/user';
+import { NTQQUserApi } from '@/core/apis/user';
-import { NTQQGroupApi } from '@/core/qqnt/apis/group';
+import { NTQQGroupApi } from '@/core/apis/group';
-import { log } from '../../../common/utils/log';
 
 interface OB11GroupRequestNotify {
   group_id: number,

src/onebot11/action/extends/SetQQAvatar.ts

@@ -1,8 +1,8 @@
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 import * as fs from 'node:fs';
-import { NTQQUserApi } from '@/core/qqnt/apis/user';
+import { NTQQUserApi } from '@/core/apis/user';
-import { checkFileReceived, uri2local } from '../../../common/utils/file';
+import { checkFileReceived, uri2local } from '@/common/utils/file';
 // import { log } from "../../../common/utils";
 
 interface Payload {
@@ -40,4 +40,4 @@ export default class SetAvatar extends BaseAction<Payload, null> {
     } 
     return null;
   }
-}
+}

src/onebot11/action/file/GetFile.ts

@@ -6,8 +6,8 @@ import { log } from '@/common/utils/log';
 import { sleep } from '@/common/utils/helper';
 import { uri2local } from '@/common/utils/file';
 import { ActionName } from '../types';
-import { FileElement, RawMessage, VideoElement } from '@/core/qqnt/entities';
+import { FileElement, RawMessage, VideoElement } from '@/core/entities';
-import { NTQQFileApi } from '@/core/qqnt/apis';
+import { NTQQFileApi } from '@/core/apis';
 
 export interface GetFilePayload {
   file: string; // 文件名或者fileUuid

src/onebot11/action/go-cqhttp/GetForwardMsg.ts

@@ -1,6 +1,6 @@
 import BaseAction from '../BaseAction';
 import { OB11ForwardMessage, OB11Message, OB11MessageData } from '../../types';
-import { NTQQMsgApi } from '@/core/qqnt/apis';
+import { NTQQMsgApi } from '@/core/apis';
 import { dbUtil } from '@/common/utils/db';
 import { OB11Constructor } from '../../constructor';
 import { ActionName } from '../types';

src/onebot11/action/go-cqhttp/GetFriendMsgHistory.ts

@@ -2,9 +2,9 @@ import BaseAction from '../BaseAction';
 import { OB11Message, OB11User } from '../../types';
 import { getFriend, friends, uid2UinMap, getUidByUin } from '@/common/data';
 import { ActionName } from '../types';
-import { ChatType } from '@/core/qqnt/entities';
+import { ChatType } from '@/core/entities';
 import { dbUtil } from '@/common/utils/db';
-import { NTQQMsgApi } from '@/core/qqnt/apis/msg';
+import { NTQQMsgApi } from '@/core/apis/msg';
 import { OB11Constructor } from '../../constructor';
 
 

src/onebot11/action/go-cqhttp/GetGroupMsgHistory.ts

@@ -2,9 +2,9 @@ import BaseAction from '../BaseAction';
 import { OB11Message, OB11User } from '../../types';
 import { getGroup, groups } from '@/common/data';
 import { ActionName } from '../types';
-import { ChatType } from '@/core/qqnt/entities';
+import { ChatType } from '@/core/entities';
 import { dbUtil } from '@/common/utils/db';
-import { NTQQMsgApi } from '@/core/qqnt/apis/msg';
+import { NTQQMsgApi } from '@/core/apis/msg';
 import { OB11Constructor } from '../../constructor';
 
 

src/onebot11/action/go-cqhttp/GetStrangerInfo.ts

@@ -3,7 +3,7 @@ import { OB11User } from '../../types';
 import { getUidByUin, uid2UinMap } from '@/common/data';
 import { OB11Constructor } from '../../constructor';
 import { ActionName } from '../types';
-import { NTQQUserApi } from '@/core/qqnt/apis/user';
+import { NTQQUserApi } from '@/core/apis/user';
 import { log } from '@/common/utils/log';
 
 

src/onebot11/action/go-cqhttp/UploadGroupFile.ts

@@ -1,10 +1,10 @@
 import BaseAction from '../BaseAction';
 import { getGroup } from '@/common/data';
 import { ActionName } from '../types';
-import { SendMsgElementConstructor } from '@/core/qqnt/entities/constructor';
+import { SendMsgElementConstructor } from '@/core/entities/constructor';
-import { ChatType, SendFileElement } from '@/core/qqnt/entities';
+import { ChatType, SendFileElement } from '@/core/entities';
 import fs from 'fs';
-import { NTQQMsgApi } from '@/core/qqnt/apis/msg';
+import { NTQQMsgApi } from '@/core/apis/msg';
 import { uri2local } from '@/common/utils/file';
 
 interface Payload {

src/onebot11/action/group/GetGroupList.ts

@@ -3,8 +3,8 @@ import { OB11Constructor } from '../../constructor';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 import { groups } from '@/common/data';
-import { NTQQGroupApi } from '@/core/qqnt/apis';
+import { NTQQGroupApi } from '@/core/apis';
-import { Group } from '@/core/qqnt/entities';
+import { Group } from '@/core/entities';
 import { log } from '@/common/utils/log';
 
 interface Payload {

src/onebot11/action/group/GetGroupMemberInfo.ts

@@ -1,10 +1,10 @@
 import { OB11GroupMember } from '../../types';
-import { getGroupMember } from '../../../common/data';
+import { getGroupMember } from '@/common/data';
 import { OB11Constructor } from '../../constructor';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
-import { NTQQUserApi } from '@/core/qqnt/apis/user';
+import { NTQQUserApi } from '@/core/apis/user';
-import { log } from '../../../common/utils/log';
+import { log } from '@/common/utils/log';
 import { isNull } from '../../../common/utils/helper';
 
 

src/onebot11/action/group/SetGroupAddRequest.ts

@@ -1,7 +1,7 @@
 import BaseAction from '../BaseAction';
-import { GroupRequestOperateTypes } from '@/core/qqnt/entities';
+import { GroupRequestOperateTypes } from '@/core/entities';
 import { ActionName } from '../types';
-import { NTQQGroupApi } from '@/core/qqnt/apis/group';
+import { NTQQGroupApi } from '@/core/apis/group';
 import { groupNotifies } from '@/common/data';
 
 interface Payload {

src/onebot11/action/group/SetGroupAdmin.ts

@@ -1,8 +1,8 @@
 import BaseAction from '../BaseAction';
 import { getGroupMember } from '@/common/data';
-import { GroupMemberRole } from '@/core/qqnt/entities';
+import { GroupMemberRole } from '@/core/entities';
 import { ActionName } from '../types';
-import { NTQQGroupApi } from '@/core/qqnt/apis/group';
+import { NTQQGroupApi } from '@/core/apis/group';
 
 interface Payload {
   group_id: number,

src/onebot11/action/group/SetGroupBan.ts

@@ -1,7 +1,7 @@
 import BaseAction from '../BaseAction';
-import { getGroupMember } from '../../../common/data';
+import { getGroupMember } from '@/common/data';
 import { ActionName } from '../types';
-import { NTQQGroupApi } from '@/core/qqnt/apis/group';
+import { NTQQGroupApi } from '@/core/apis/group';
 
 interface Payload {
     group_id: number,
@@ -21,4 +21,4 @@ export default class SetGroupBan extends BaseAction<Payload, null> {
       [{ uid: member.uid, timeStamp: parseInt(payload.duration.toString()) }]);
     return null;
   }
-}
+}

src/onebot11/action/group/SetGroupCard.ts

@@ -1,7 +1,7 @@
 import BaseAction from '../BaseAction';
-import { getGroupMember } from '../../../common/data';
+import { getGroupMember } from '@/common/data';
 import { ActionName } from '../types';
-import { NTQQGroupApi } from '@/core/qqnt/apis/group';
+import { NTQQGroupApi } from '@/core/apis/group';
 
 interface Payload {
     group_id: number,
@@ -20,4 +20,4 @@ export default class SetGroupCard extends BaseAction<Payload, null> {
     await NTQQGroupApi.setMemberCard(payload.group_id.toString(), member.uid, payload.card || '');
     return null;
   }
-}
+}

src/onebot11/action/group/SetGroupKick.ts

@@ -1,7 +1,7 @@
 import BaseAction from '../BaseAction';
-import { getGroupMember } from '../../../common/data';
+import { getGroupMember } from '@/common/data';
 import { ActionName } from '../types';
-import { NTQQGroupApi } from '@/core/qqnt/apis/group';
+import { NTQQGroupApi } from '@/core/apis/group';
 
 interface Payload {
   group_id: number,

src/onebot11/action/group/SetGroupLeave.ts

@@ -1,7 +1,7 @@
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
-import { NTQQGroupApi } from '@/core/qqnt/apis/group';
+import { NTQQGroupApi } from '@/core/apis/group';
-import { log } from '../../../common/utils/log';
+import { log } from '@/common/utils/log';
 
 interface Payload {
     group_id: number,
@@ -19,4 +19,4 @@ export default class SetGroupLeave extends BaseAction<Payload, any> {
       throw e;
     }
   }
-}
+}

src/onebot11/action/group/SetGroupName.ts

@@ -1,6 +1,6 @@
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
-import { NTQQGroupApi } from '@/core/qqnt/apis/group';
+import { NTQQGroupApi } from '@/core/apis/group';
 
 interface Payload {
     group_id: number,
@@ -15,4 +15,4 @@ export default class SetGroupName extends BaseAction<Payload, null> {
     await NTQQGroupApi.setGroupName(payload.group_id.toString(), payload.group_name);
     return null;
   }
-}
+}

src/onebot11/action/group/SetGroupWholeBan.ts

@@ -1,6 +1,6 @@
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
-import { NTQQGroupApi } from '@/core/qqnt/apis/group';
+import { NTQQGroupApi } from '@/core/apis/group';
 
 interface Payload {
     group_id: number,
@@ -15,4 +15,4 @@ export default class SetGroupWholeBan extends BaseAction<Payload, null> {
     await NTQQGroupApi.banGroup(payload.group_id.toString(), enable);
     return null;
   }
-}
+}

src/onebot11/action/msg/DeleteMsg.ts

@@ -1,4 +1,4 @@
-import { NTQQMsgApi } from '@/core/qqnt/apis';
+import { NTQQMsgApi } from '@/core/apis';
 import { ActionName } from '../types';
 import BaseAction from '../BaseAction';
 import { dbUtil } from '@/common/utils/db';

src/onebot11/action/msg/MarkMsgAsRead.ts

@@ -1,7 +1,7 @@
-import { ChatType, Peer } from '@/core/qqnt/entities';
+import { ChatType, Peer } from '@/core/entities';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
-import { NTQQMsgApi } from '@/core/qqnt/apis';
+import { NTQQMsgApi } from '@/core/apis';
 import { getFriend, getUidByUin } from '@/common/data';
 
 interface Payload {

src/onebot11/action/msg/SendMsg.ts

@@ -7,7 +7,7 @@ import {
   SendArkElement,
   SendMessageElement,
   Peer
-} from '@/core/qqnt/entities';
+} from '@/core/entities';
 
 import {
   OB11MessageCustomMusic,
@@ -17,7 +17,7 @@ import {
   OB11MessageNode,
   OB11PostSendMsg
 } from '../../types';
-import { SendMsgElementConstructor } from '@/core/qqnt/entities/constructor';
+import { SendMsgElementConstructor } from '@/core/entities/constructor';
 import BaseAction from '../BaseAction';
 import { ActionName, BaseCheckResult } from '../types';
 import * as fs from 'node:fs';
@@ -27,8 +27,8 @@ import { log } from '@/common/utils/log';
 import { sleep } from '@/common/utils/helper';
 import { uri2local } from '@/common/utils/file';
 import { getFriend, getGroup, getGroupMember, getUidByUin, selfInfo } from '@/common/data';
-import { NTQQMsgApi } from '@/core/qqnt/apis';
+import { NTQQMsgApi } from '../../../core/src/apis';
-import { NTQQFileApi } from '@/core/qqnt/apis';
+import { NTQQFileApi } from '../../../core/src/apis';
 
 const ALLOW_SEND_TEMP_MSG = false;
 

src/onebot11/action/system/CleanCache.ts

@@ -6,9 +6,9 @@ import {
   ChatType,
   ChatCacheListItemBasic,
   CacheFileType
-} from '../../../ntqqapi/types';
+} from '@/core/entities';
 import { dbUtil } from '../../../common/db';
-import { NTQQFileApi, NTQQFileCacheApi } from '@/core/qqnt/apis/file';
+import { NTQQFileApi, NTQQFileCacheApi } from '@/core/apis/file';
 
 export default class CleanCache extends BaseAction<void, void> {
   actionName = ActionName.CleanCache;
@@ -102,4 +102,4 @@ function getCacheList(type: ChatType) { // NOTE: 做这个方法主要是因为
       })
       .catch(e => rej(e));
   });
-}
+}

src/onebot11/action/system/GetStatus.ts

@@ -1,7 +1,7 @@
 import BaseAction from '../BaseAction';
 import { OB11Status } from '../../types';
 import { ActionName } from '../types';
-import { selfInfo } from '../../../common/data';
+import { selfInfo } from '@/common/data';
 
 
 export default class GetStatus extends BaseAction<any, OB11Status> {

src/onebot11/action/user/SendLike.ts

@@ -1,4 +1,4 @@
-import { NTQQUserApi } from '@/core/qqnt/apis';
+import { NTQQUserApi } from '../../../core/src/apis';
 import BaseAction from '../BaseAction';
 import { getFriend, getUidByUin, uid2UinMap } from '../../../common/data';
 import { ActionName } from '../types';

src/onebot11/action/user/SetFriendAddRequest.ts

@@ -1,6 +1,6 @@
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
-import { NTQQFriendApi } from '@/core/qqnt/apis/friend';
+import { NTQQFriendApi } from '@/core/apis/friend';
 import { friendRequests } from '@/common/data';
 
 interface Payload {

src/onebot11/config.ts

@@ -66,7 +66,7 @@ class Config implements OB11Config {
       console.log('get config', jsonData);
       Object.assign(this, jsonData);
       // eslint-disable-next-line
-    } catch (e) {
+    } catch (e: any) {
       if (e instanceof SyntaxError) {
         console.error(`配置文件 ${ob11ConfigPath} 格式错误，请检查配置文件:`, e.message);
       }else{

src/onebot11/constructor.ts

@@ -22,7 +22,7 @@ import {
   Sex,
   TipGroupElementType,
   User
-} from '@/core/qqnt/entities';
+} from '../core/src/entities';
 import { EventType } from './event/OB11BaseEvent';
 import { encodeCQCode } from './cqcode';
 import { dbUtil } from '@/common/utils/db';
@@ -40,7 +40,7 @@ import { OB11GroupCardEvent } from './event/notice/OB11GroupCardEvent';
 import { OB11GroupDecreaseEvent } from './event/notice/OB11GroupDecreaseEvent';
 import { ob11Config } from '@/onebot11/config';
 import { deleteGroup, getFriend, getGroupMember, groupMembers, selfInfo, tempGroupCodeMap } from '@/common/data';
-import { NTQQFileApi, NTQQGroupApi, NTQQUserApi } from '@/core/qqnt/apis';
+import { NTQQFileApi, NTQQGroupApi, NTQQUserApi } from '../core/src/apis';
 import http from 'http';
 
 

src/onebot11/main.ts

@@ -1,5 +1,5 @@
 import { napCatCore } from '@/core';
-import { MsgListener } from '@/core/qqnt/listeners';
+import { MsgListener } from '../core/src/listeners';
 import { OB11Constructor } from '@/onebot11/constructor';
 import { postOB11Event } from '@/onebot11/server/postOB11Event';
 import {
@@ -10,16 +10,16 @@ import {
   GroupNotify,
   GroupNotifyTypes,
   RawMessage
-} from '@/core/qqnt/entities';
+} from '../core/src/entities';
 import { ob11Config } from '@/onebot11/config';
 import { httpHeart, ob11HTTPServer } from '@/onebot11/server/http';
 import { ob11WebsocketServer } from '@/onebot11/server/ws/WebsocketServer';
 import { ob11ReverseWebsockets } from '@/onebot11/server/ws/ReverseWebsocket';
 import { friendRequests, getFriend, getGroup, getGroupMember, groupNotifies, selfInfo } from '@/common/data';
 import { dbUtil } from '@/common/utils/db';
-import { BuddyListener, GroupListener, NodeIKernelBuddyListener } from '@/core/qqnt/listeners';
+import { BuddyListener, GroupListener, NodeIKernelBuddyListener } from '../core/src/listeners';
 import { OB11FriendRequestEvent } from '@/onebot11/event/request/OB11FriendRequest';
-import { NTQQGroupApi, NTQQUserApi } from '@/core/qqnt/apis';
+import { NTQQGroupApi, NTQQUserApi } from '../core/src/apis';
 import { log } from '@/common/utils/log';
 import { OB11GroupRequestEvent } from '@/onebot11/event/request/OB11GroupRequest';
 import { OB11GroupAdminNoticeEvent } from '@/onebot11/event/notice/OB11GroupAdminNoticeEvent';
@@ -156,7 +156,7 @@ export class NapCatOnebot11 {
       }).catch(e => log('constructGroupEvent error: ', e));
       OB11Constructor.FriendAddEvent(message).then(friendAddEvent=>{
         if(friendAddEvent){
-          postOB11Event(friendAddEvent)
+          postOB11Event(friendAddEvent);
         }
       }).catch(e => log('constructFriendAddEvent error: ', e));
     }

src/onebot11/server/postOB11Event.ts

@@ -6,14 +6,14 @@ import { wsReply } from './ws/reply';
 import { log } from '@/common/utils/log';
 import { ob11Config } from '@/onebot11/config';
 import crypto from 'crypto';
-import { ChatType, Group, GroupRequestOperateTypes, Peer } from '@/core/qqnt/entities';
+import { ChatType, Group, GroupRequestOperateTypes, Peer } from '../../core/src/entities';
 import { convertMessage2List, createSendElements, sendMsg } from '../action/msg/SendMsg';
 import { OB11FriendRequestEvent } from '../event/request/OB11FriendRequest';
 import { OB11GroupRequestEvent } from '../event/request/OB11GroupRequest';
 import { isNull } from '@/common/utils/helper';
 import { dbUtil } from '@/common/utils/db';
 import { friendRequests, getGroup, groupNotifies, selfInfo } from '@/common/data';
-import { NTQQFriendApi, NTQQGroupApi, NTQQMsgApi } from '@/core/qqnt/apis';
+import { NTQQFriendApi, NTQQGroupApi, NTQQMsgApi } from '../../core/src/apis';
 
 export type PostEventType = OB11Message | OB11BaseMetaEvent | OB11BaseNoticeEvent
 

src/onebot11/types.ts

@@ -1,4 +1,4 @@
-import { PicSubType, RawMessage } from '@/core/qqnt/entities';
+import { PicSubType, RawMessage } from '@/core';
 import { EventType } from './event/OB11BaseEvent';
 
 export interface OB11User {

tsconfig.json

@@ -28,10 +28,6 @@
         "./src/core/src/index",
         "./src/core.lib/src/index"
       ],
-      "@/core/qqnt/*": [
-        "./src/core/src/qqnt/*",
-        "./src/core.lib/src/qqnt/*"
-      ],
       "@/core/*": [
         "./src/core/src/*",
         "./src/core.lib/src/*"