style: RegExec match->exec

NapNeko · Aug 25, 2024 · 5f1d8fb · 5f1d8fb
1 parent 5486ffc
commit 5f1d8fb
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/src/common/framework/event-legacy.ts b/src/common/framework/event-legacy.ts
@@ -68,7 +68,7 @@ export class LegacyNTEventWrapper {
         const existListener = this.listenerManager.get(listenerMainName + uniqueCode);
         if (!existListener) {
             const Listener = this.createProxyDispatch(listenerMainName);
-            const ServiceSubName = listenerMainName.match(/^NodeIKernel(.*?)Listener$/)![1];
+            const ServiceSubName = /^NodeIKernel(.*?)Listener$/.exec(listenerMainName)![1];
             const Service = 'NodeIKernel' + ServiceSubName + 'Service/addKernel' + ServiceSubName + 'Listener';
             const addfunc = this.createEventFunction<(listener: T) => number>(Service);
             addfunc!(Listener as T);

diff --git a/src/common/framework/event.ts b/src/common/framework/event.ts
@@ -46,7 +46,7 @@ export class NTEventChannel extends EventEmitter {
             Listener = new ListenerType(this.createProxyDispatch(listenerMainName));
             if (!Listener) throw new Error('Init Listener failed');
             //实例化NTQQ Listener外包装
-            const ServiceSubName = listenerMainName.match(/^NodeIKernel(.*?)Listener$/)![1];
+            const ServiceSubName = /^NodeIKernel(.*?)Listener$/.exec(listenerMainName)![1];
             const Service = 'NodeIKernel' + ServiceSubName + 'Service/addKernel' + ServiceSubName + 'Listener';
             const addfunc = this.createEventFunction<(listener: T) => number>(Service);
             //添加Listener到NTQQ

diff --git a/src/common/utils/helper.ts b/src/common/utils/helper.ts
@@ -15,10 +15,13 @@ export async function solveProblem<T extends (...arg: any[]) => any>(func: T, ..
 }
 
 export async function solveAsyncProblem<T extends (...args: any[]) => Promise<any>>(func: T, ...args: Parameters<T>): Promise<Awaited<ReturnType<T>> | undefined> {
-    return new Promise<Awaited<ReturnType<T>> | undefined>(async (resolve) => {
+    return new Promise<Awaited<ReturnType<T>> | undefined>((resolve) => {
         try {
-            const result = await func(...args);
-            resolve(result);
+            func(...args).then((result) => {
+                resolve(result);
+            }).catch((e) => {
+                resolve(undefined);
+            });
         } catch (e) {
             resolve(undefined);
         }

diff --git a/src/core/apis/user.ts b/src/core/apis/user.ts
@@ -129,7 +129,7 @@ export class NTQQUserApi {
     }
 
     async getUserDetailInfo(uid: string): Promise<User> {
-        const retUser = await solveAsyncProblem(async (uid) => this.fetchUserDetailInfo(uid, UserDetailSource.KDB));
+        const retUser = await solveAsyncProblem(async (uid) => this.fetchUserDetailInfo(uid, UserDetailSource.KDB), uid);
         if (retUser && retUser.uin !== '0') {
             return retUser;
         }

diff --git a/src/core/apis/webapi.ts b/src/core/apis/webapi.ts
@@ -166,7 +166,7 @@ export class NTQQWebApi {
             let resJson;
             try {
                 const res = await RequestUtil.HttpGetText(url, 'GET', '', { 'Cookie': this.cookieToString(cookieObject) });
-                const match = res.match(/window\.__INITIAL_STATE__=(.*?);/);
+                let match = /window\.__INITIAL_STATE__=(.*?);/.exec(res);
                 if (match) {
                     resJson = JSON.parse(match[1].trim());
                 }