mirror of
https://github.com/NapNeko/NapCatQQ.git
synced 2024-11-16 04:45:46 +00:00
feat: 彻底移除event旧实现
This commit is contained in:
parent
a1d4882e18
commit
55b07ca3ab
@ -254,83 +254,4 @@ export class NTEventWrapper {
|
|||||||
},
|
},
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
async callNormalEvent<
|
|
||||||
Service extends keyof ServiceNamingMapping,
|
|
||||||
ServiceMethod extends Exclude<keyof ServiceNamingMapping[Service], symbol>,
|
|
||||||
Listener extends keyof ListenerNamingMapping,
|
|
||||||
ListenerMethod extends Exclude<keyof ListenerNamingMapping[Listener], symbol>,
|
|
||||||
// eslint-disable-next-line
|
|
||||||
// @ts-ignore
|
|
||||||
EventType extends (...args: any) => any = ServiceNamingMapping[Service][ServiceMethod],
|
|
||||||
// eslint-disable-next-line
|
|
||||||
// @ts-ignore
|
|
||||||
ListenerType extends (...args: any) => any = ListenerNamingMapping[Listener][ListenerMethod]
|
|
||||||
>(
|
|
||||||
serviceAndMethod: `${Service}/${ServiceMethod}`,
|
|
||||||
listenerAndMethod: `${Listener}/${ListenerMethod}`,
|
|
||||||
waitTimes = 1,
|
|
||||||
timeout: number = 3000,
|
|
||||||
checker: (...args: Parameters<ListenerType>) => boolean,
|
|
||||||
...args: Parameters<EventType>
|
|
||||||
) {
|
|
||||||
return new Promise<[EventRet: Awaited<ReturnType<EventType>>, ...Parameters<ListenerType>]>(
|
|
||||||
async (resolve, reject) => {
|
|
||||||
const id = randomUUID();
|
|
||||||
let complete = 0;
|
|
||||||
let retData: Parameters<ListenerType> | undefined = undefined;
|
|
||||||
let retEvent: any = {};
|
|
||||||
const databack = () => {
|
|
||||||
if (complete == 0) {
|
|
||||||
reject(
|
|
||||||
new Error(
|
|
||||||
'Timeout: NTEvent EventName:' +
|
|
||||||
serviceAndMethod +
|
|
||||||
' ListenerName:' +
|
|
||||||
listenerAndMethod +
|
|
||||||
' EventRet:\n' +
|
|
||||||
JSON.stringify(retEvent, null, 4) +
|
|
||||||
'\n',
|
|
||||||
),
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
resolve([retEvent as Awaited<ReturnType<EventType>>, ...retData!]);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const ListenerNameList = listenerAndMethod.split('/');
|
|
||||||
const ListenerMainName = ListenerNameList[0];
|
|
||||||
const ListenerSubName = ListenerNameList[1];
|
|
||||||
|
|
||||||
const Timeouter = setTimeout(databack, timeout);
|
|
||||||
|
|
||||||
const eventCallbak = {
|
|
||||||
timeout: timeout,
|
|
||||||
createtime: Date.now(),
|
|
||||||
checker: checker,
|
|
||||||
func: (...args: any[]) => {
|
|
||||||
complete++;
|
|
||||||
//console.log('func', ...args);
|
|
||||||
retData = args as Parameters<ListenerType>;
|
|
||||||
if (complete >= waitTimes) {
|
|
||||||
clearTimeout(Timeouter);
|
|
||||||
databack();
|
|
||||||
}
|
|
||||||
},
|
|
||||||
};
|
|
||||||
if (!this.EventTask.get(ListenerMainName)) {
|
|
||||||
this.EventTask.set(ListenerMainName, new Map());
|
|
||||||
}
|
|
||||||
if (!this.EventTask.get(ListenerMainName)?.get(ListenerSubName)) {
|
|
||||||
this.EventTask.get(ListenerMainName)?.set(ListenerSubName, new Map());
|
|
||||||
}
|
|
||||||
this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.set(id, eventCallbak);
|
|
||||||
this.createListenerFunction(ListenerMainName);
|
|
||||||
const EventFunc = this.createEventFunction<EventType>(serviceAndMethod);
|
|
||||||
retEvent = await EventFunc!(...(args as any[]));
|
|
||||||
},
|
|
||||||
);
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user