diff --git a/src/common/event.ts b/src/common/event.ts index 00fc3e37..3fa5fe8a 100644 --- a/src/common/event.ts +++ b/src/common/event.ts @@ -254,83 +254,4 @@ export class NTEventWrapper { }, ); } - - /* - async callNormalEvent< - Service extends keyof ServiceNamingMapping, - ServiceMethod extends Exclude, - Listener extends keyof ListenerNamingMapping, - ListenerMethod extends Exclude, - // 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) => boolean, - ...args: Parameters - ) { - return new Promise<[EventRet: Awaited>, ...Parameters]>( - async (resolve, reject) => { - const id = randomUUID(); - let complete = 0; - let retData: Parameters | 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>, ...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; - 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(serviceAndMethod); - retEvent = await EventFunc!(...(args as any[])); - }, - ); - } - */ }