Skip to content

Commit

Permalink
refactor: move all callNormalEvent calls to V2 substitutes
Browse files Browse the repository at this point in the history
  • Loading branch information
@Wesley-Young
Wesley-Young committed Aug 26, 2024
1 parent 7092894 commit 7aa0bd9
Show file tree
Hide file tree
Showing 6 changed files with 90 additions and 94 deletions.
14 changes: 8 additions & 6 deletions src/common/framework/event-legacy.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,11 +158,11 @@ export class LegacyNTEventWrapper {
>(
serviceAndMethod: `${Service}/${ServiceMethod}`,
listenerAndMethod: `${Listener}/${ListenerMethod}`,
waitTimes = 1,
timeout: number = 3000,
args: Parameters<EventType>,
checkerEvent: (ret: Awaited<ReturnType<EventType>>) => boolean = () => true,
checkerListener: (...args: Parameters<ListenerType>) => boolean = () => true,
...args: Parameters<EventType>
callbackTimesToWait = 1,
timeout = 5000,
) {
return new Promise<[EventRet: Awaited<ReturnType<EventType>>, ...Parameters<ListenerType>]>(
async (resolve, reject) => {
Expand Down Expand Up @@ -202,7 +202,7 @@ export class LegacyNTEventWrapper {
func: (...args: any[]) => {
complete++;
retData = args as Parameters<ListenerType>;
if (complete >= waitTimes) {
if (complete >= callbackTimesToWait) {
clearTimeout(timeoutRef);
sendDataCallback();
}
Expand All @@ -216,8 +216,8 @@ export class LegacyNTEventWrapper {
}
this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.set(id, eventCallback);
this.createListenerFunction(ListenerMainName);
const EventFunc = this.createEventFunction<EventType>(serviceAndMethod);
retEvent = await EventFunc!(...(args as any[]));
const eventFunction = this.createEventFunction<EventType>(serviceAndMethod);
retEvent = await eventFunction!(...(args));
if (!checkerEvent(retEvent)) {
clearTimeout(timeoutRef);
reject(
Expand All @@ -236,6 +236,7 @@ export class LegacyNTEventWrapper {
);
}

/*
async callNormalEvent<
Service extends keyof ServiceNamingMapping,
ServiceMethod extends Exclude<keyof ServiceNamingMapping[Service], symbol>,
Expand Down Expand Up @@ -312,4 +313,5 @@ export class LegacyNTEventWrapper {
},
);
}
*/
}
28 changes: 12 additions & 16 deletions src/core/apis/file.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
import path from 'path';
import fs from 'fs';
import fsPromises from 'fs/promises';
import { InstanceContext, NapCatCore, OnRichMediaDownloadCompleteParams } from '@/core';
import { InstanceContext, NapCatCore } from '@/core';
import * as fileType from 'file-type';
import imageSize from 'image-size';
import { ISizeCalculationResult } from 'image-size/dist/types/interface';
Expand Down Expand Up @@ -304,18 +304,10 @@ export class NTQQFileApi {
return sourcePath;
}
}
const [, fileTransNotifyInfo] = await this.core.eventWrapper.callNormalEvent(
const [, fileTransNotifyInfo] = await this.core.eventWrapper.callNormalEventV2(
'NodeIKernelMsgService/downloadRichMedia',
'NodeIKernelMsgListener/onRichMediaDownloadComplete',
1,
timeout,
(arg: OnRichMediaDownloadCompleteParams) => {
if (arg.msgId === msgId) {
return true;
}
return false;
},
{
[{
fileModelId: '0',
downloadSourceType: 0,
triggerType: 1,
Expand All @@ -326,7 +318,11 @@ export class NTQQFileApi {
thumbSize: 0,
downloadType: 1,
filePath: thumbPath,
},
}],
() => true,
(arg) => arg.msgId === msgId,
1,
timeout,
);
const msg = await this.core.apis.MsgApi.getMsgsByMsgId({
guildId: '',
Expand Down Expand Up @@ -482,7 +478,7 @@ export class NTQQFileApi {
const url: string = element.originImageUrl!; // 没有域名
const md5HexStr = element.md5HexStr;
const fileMd5 = element.md5HexStr;
const fileUuid = element.fileUuid;
// const fileUuid = element.fileUuid;

if (url) {
const UrlParse = new URL(IMAGE_HTTP_HOST + url);//临时解析拼接
Expand Down Expand Up @@ -554,9 +550,9 @@ export class NTQQFileCacheApi {
}

getFileCacheInfo(fileType: CacheFileType, pageSize: number = 1000, lastRecord?: CacheFileListItem) {
const _lastRecord = lastRecord ? lastRecord : { fileType: fileType };
//需要五个参数
//return napCatCore.session.getStorageCleanService().getFileCacheInfo();
// const _lastRecord = lastRecord ? lastRecord : { fileType: fileType };
// 需要五个参数
// return napCatCore.session.getStorageCleanService().getFileCacheInfo();
}

async clearChatCache(chats: ChatCacheListItemBasic[] = [], fileKeys: string[] = []) {
Expand Down
9 changes: 6 additions & 3 deletions src/core/apis/friend.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import { LimitedHashTable } from '@/common/utils/message-unique';
export class NTQQFriendApi {
context: InstanceContext;
core: NapCatCore;
//friends: Map<string, Friend> = new Map<string, FriendV2>();

// friends: Map<string, Friend> = new Map<string, FriendV2>();

constructor(context: InstanceContext, core: NapCatCore) {
this.context = context;
Expand Down Expand Up @@ -70,15 +71,17 @@ export class NTQQFriendApi {
async isBuddy(uid: string) {
return this.context.session.getBuddyService().isBuddy(uid);
}

async clearBuddyReqUnreadCnt() {
return this.context.session.getBuddyService().clearBuddyReqUnreadCnt();
}

async getBuddyReq() {
const [, ret] = await this.core.eventWrapper.callNormalEventV2(
'NodeIKernelBuddyService/getBuddyReq',
'NodeIKernelBuddyListener/onBuddyReqChange',
1,
5000);
[],
);
return ret;
}

Expand Down
23 changes: 8 additions & 15 deletions src/core/apis/group.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,11 @@ import {
Group,
GroupMember,
GroupMemberRole,
GroupNotify,
GroupRequestOperateTypes,
InstanceContext,
KickMemberV2Req,
MemberExtSourceType,
NapCatCore,
NodeIKernelGroupListener,
NodeIKernelGroupService,
} from '@/core';
import { isNumeric, runAllWithTimeout, sleep } from '@/common/utils/helper';
Expand Down Expand Up @@ -42,14 +40,10 @@ export class NTQQGroupApi {
}

async getGroups(forced = false) {
type ListenerType = NodeIKernelGroupListener['onGroupListUpdate'];
const [,, groupList] = await this.core.eventWrapper.callNormalEvent(
const [,, groupList] = await this.core.eventWrapper.callNormalEventV2(
'NodeIKernelGroupService/getGroupList',
'NodeIKernelGroupListener/onGroupListUpdate',
1,
5000,
() => true,
forced,
[forced],
);
return groupList;
}
Expand Down Expand Up @@ -254,15 +248,14 @@ export class NTQQGroupApi {
}

async getSingleScreenNotifies(num: number) {
const [,,, notifies] = await this.core.eventWrapper.callNormalEvent(
const [,,, notifies] = await this.core.eventWrapper.callNormalEventV2(
'NodeIKernelGroupService/getSingleScreenNotifies',
'NodeIKernelGroupListener/onGroupSingleScreenNotifies',
1,
5000,
() => true,
false,
'',
num,
[
false,
'',
num
],
);
return notifies;
}
Expand Down
62 changes: 33 additions & 29 deletions src/core/apis/msg.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export class NTQQMsgApi {
async getMsgEmojiLikesList(peer: Peer, msgSeq: string, emojiId: string, emojiType: string, count: number = 20) {
//console.log(peer, msgSeq, emojiId, emojiType, count);
//注意此处emojiType 可选值一般为1-2 2好像是unicode表情dec值 大部分情况 Taged M likiowa
return this.context.session.getMsgService().getMsgEmojiLikesList(peer, msgSeq, emojiId, emojiType, '', false, 20);
return this.context.session.getMsgService().getMsgEmojiLikesList(peer, msgSeq, emojiId, emojiType, '', false, count);
}

// napCatCore: NapCatCore | null = null;
Expand Down Expand Up @@ -50,7 +50,7 @@ export class NTQQMsgApi {
}

async getLastestMsgByUids(peer: Peer, count: number = 20, isReverseOrder: boolean = false) {
const ret = await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', '0', {
return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', '0', {
chatInfo: peer,
filterMsgType: [],
filterSendersUid: [],
Expand All @@ -60,7 +60,6 @@ export class NTQQMsgApi {
isIncludeCurrent: true,
pageLimit: count,
});
return ret;
}

async getMsgsByMsgId(peer: Peer | undefined, msgIds: string[] | undefined) {
Expand All @@ -79,7 +78,7 @@ export class NTQQMsgApi {
}

async queryMsgsWithFilterExWithSeq(peer: Peer, msgSeq: string) {
const ret = await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', msgSeq, {
return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', msgSeq, {
chatInfo: peer,//此处为Peer 为关键查询参数 没有啥也没有 by mlik iowa
filterMsgType: [],
filterSendersUid: [],
Expand All @@ -89,7 +88,6 @@ export class NTQQMsgApi {
isIncludeCurrent: true,
pageLimit: 1,
});
return ret;
}

async getMsgsBySeqAndCount(peer: Peer, seq: string, count: number, desc: boolean, z: boolean) {
Expand All @@ -99,7 +97,7 @@ export class NTQQMsgApi {
const DateNow = Math.floor(Date.now() / 1000);
const filterMsgFromTime = (DateNow - 300).toString();
const filterMsgToTime = DateNow.toString();
const ret = await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', msgSeq, {
return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', msgSeq, {
chatInfo: peer,//此处为Peer 为关键查询参数 没有啥也没有 by mlik iowa
filterMsgType: [],
filterSendersUid: [],
Expand All @@ -109,24 +107,26 @@ export class NTQQMsgApi {
isIncludeCurrent: true,
pageLimit: 100,
});
return ret;
}
async setMsgRead(peer: Peer) {
return this.context.session.getMsgService().setMsgRead(peer);
}

async getGroupFileList(GroupCode: string, params: GetFileListParam) {
const [, groupFileListResult] = await this.core.eventWrapper.callNormalEvent(
const [, groupFileListResult] = await this.core.eventWrapper.callNormalEventV2(
'NodeIKernelRichMediaService/getGroupFileList',
'NodeIKernelMsgListener/onGroupFileInfoUpdate',
1,
5000,
[
GroupCode,
params
],
() => true,
( /* groupFileListResult: GroupFileInfoUpdateParamType */) => {
//Developer Mlikiowa Todo: 此处有问题 无法判断是否成功
return true;
},
GroupCode,
params,
1,
5000,
);
return groupFileListResult.item;
}
Expand Down Expand Up @@ -175,23 +175,26 @@ export class NTQQMsgApi {
}
const msgId = await this.generateMsgUniqueId(peer.chatType, await this.getServerTime());
peer.guildId = msgId;
const [, msgList] = await this.core.eventWrapper.callNormalEvent(
const [, msgList] = await this.core.eventWrapper.callNormalEventV2(
'NodeIKernelMsgService/sendMsg',
'NodeIKernelMsgListener/onMsgInfoListUpdate',
1,
timeout,
(msgRecords: RawMessage[]) => {
[
'0',
peer,
msgElements,
new Map()
],
() => true,
msgRecords => {
for (const msgRecord of msgRecords) {
if (msgRecord.guildId === msgId && msgRecord.sendStatus === SendStatusType.KSEND_STATUS_SUCCESS) {
return true;
}
}
return false;
},
'0',
peer,
msgElements,
new Map(),
1,
timeout,
);
return msgList.find(msgRecord => {
if (msgRecord.guildId === msgId) {
Expand All @@ -216,24 +219,25 @@ export class NTQQMsgApi {
const msgInfos = msgIds.map(id => {
return { msgId: id, senderShowName: this.core.selfInfo.nick };
});
const [, msgList] = await this.core.eventWrapper.callNormalEvent(
const [, msgList] = await this.core.eventWrapper.callNormalEventV2(
'NodeIKernelMsgService/multiForwardMsgWithComment',
'NodeIKernelMsgListener/onMsgInfoListUpdate',
1,
5000,
(msgRecords: RawMessage[]) => {
[
msgInfos,
srcPeer,
destPeer,
[],
new Map(),
],
() => true,
(msgRecords) => {
for (const msgRecord of msgRecords) {
if (msgRecord.peerUid == destPeer.peerUid && msgRecord.senderUid == this.core.selfInfo.uid) {
return true;
}
}
return false;
},
msgInfos,
srcPeer,
destPeer,
[],
new Map(),
);
for (const msg of msgList) {
const arkElement = msg.elements.find(ele => ele.arkElement);
Expand Down
Loading

0 comments on commit 7aa0bd9

Please sign in to comment.