Merge pull request #302 from cnxysoft/upmain

fix: 多个问题

src/common/utils/file.ts

@@ -187,22 +187,27 @@ export enum FileUriType {
 
 export async function checkUriType(Uri: string) {
 
-    const LocalFileRet = await solveProblem((Uri) => { if (fs.existsSync(Uri)) return { Uri: Uri, Type: FileUriType.Local }; });
+    const LocalFileRet = await solveProblem((uri: string) => {
+        if (fs.existsSync(uri)) {
+            return { Uri: uri, Type: FileUriType.Local };
+        }
+        return undefined;
+    }, Uri);
     if (LocalFileRet) return LocalFileRet;
     
-    const OtherFileRet = await solveProblem((Uri) => {
+    const OtherFileRet = await solveProblem((uri: string) => {
         //再判断是否是Http
-        if (Uri.startsWith('http://') || Uri.startsWith('https://')) {
+        if (uri.startsWith('http://') || uri.startsWith('https://')) {
-            return { Uri: Uri, Type: FileUriType.Remote };
+            return { Uri: uri, Type: FileUriType.Remote };
         }
         //再判断是否是Base64
-        if (Uri.startsWith('base64://')) {
+        if (uri.startsWith('base64://')) {
-            return { Uri: Uri, Type: FileUriType.Base64 };
+            return { Uri: uri, Type: FileUriType.Base64 };
         }
-        if (Uri.startsWith('file://')) {
+        if (uri.startsWith('file://')) {
             let filePath: string;
             // await fs.copyFile(url.pathname, filePath);
-            const pathname = decodeURIComponent(new URL(Uri).pathname);
+            const pathname = decodeURIComponent(new URL(uri).pathname);
             if (process.platform === 'win32') {
                 filePath = pathname.slice(1);
             } else {
@@ -210,7 +215,7 @@ export async function checkUriType(Uri: string) {
             }
             return { Uri: filePath, Type: FileUriType.Local };
         }
-    });
+    }, Uri);
     if (OtherFileRet) return OtherFileRet;
     
     return { Uri: Uri, Type: FileUriType.Unknown };

src/common/utils/helper.ts

@@ -3,10 +3,10 @@ import fs from 'fs';
 import os from 'node:os';
 import { QQLevel } from '@/core';
 
-export async function solveProblem<T extends (...arg: any[]) => any>(func: T): Promise<ReturnType<T> | undefined> {
+export async function solveProblem<T extends (...arg: any[]) => any>(func: T, ...args: Parameters<T>): Promise<ReturnType<T> | undefined> {
-    return new Promise<ReturnType<T> | undefined>(async (resolve) => {
+    return new Promise<ReturnType<T> | undefined>((resolve) => {
         try {
-            const result = func();
+            const result = func(...args);
             resolve(result);
         } catch (e) {
             resolve(undefined);
@@ -14,10 +14,10 @@ export async function solveProblem<T extends (...arg: any[]) => any>(func: T): P
     });
 }
 
-export async function solveAsyncProblem<T extends (...arg: any[]) => Promise<any>>(func: T): Promise<Awaited<ReturnType<T>> | undefined> {
+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) => {
         try {
-            const result = await func();
+            const result = await func(...args);
             resolve(result);
         } catch (e) {
             resolve(undefined);

src/core/apis/group.ts

@@ -14,7 +14,7 @@ import {
     NodeIKernelGroupListener,
     NodeIKernelGroupService,
 } from '@/core';
-import { isNumeric, runAllWithTimeout } from '@/common/utils/helper';
+import { isNumeric, runAllWithTimeout, sleep } from '@/common/utils/helper';
 
 export class NTQQGroupApi {
     context: InstanceContext;
@@ -25,7 +25,9 @@ export class NTQQGroupApi {
     constructor(context: InstanceContext, core: NapCatCore) {
         this.context = context;
         this.core = core;
-        this.initCache().then().catch(context.logger.logError);
+        sleep(1000).then(() => {
+            this.initCache().then().catch(context.logger.logError);
+        });
     }
     async initCache() {
         this.groups = await this.getGroups();
@@ -269,10 +271,7 @@ export class NTQQGroupApi {
     }
 
     async getGroupMemberV2(GroupCode: string, uid: string, forced = false) {
-        //type ListenerType = NodeIKernelGroupListener['onMemberInfoChange'];
         type EventType = NodeIKernelGroupService['getMemberInfo'];
-        // NTEventDispatch.CreatListenerFunction('NodeIKernelGroupListener/onGroupMemberInfoUpdate', 
-        //return napCatCore.session.getGroupService().getMemberInfo(GroupCode, [uid], forced);
         const Listener = this.core.eventWrapper.RegisterListen<(params: any) => void>
             (
             'NodeIKernelGroupListener/onMemberInfoChange',
@@ -294,20 +293,6 @@ export class NTQQGroupApi {
             member = members.get(uid);
         }
         return member;
-
-        // 原本的方法: (no_cache 下效率很高, cache 下效率一致)
-        // const [, , , _members] = await this.core.eventWrapper.CallNormalEvent<EventType, ListenerType>
-        // (
-        //     'NodeIKernelGroupService/getMemberInfo',
-        //     'NodeIKernelGroupListener/onMemberInfoChange',
-        //     1,
-        //     5000,
-        //     (groupCode: string, changeType: number, members: Map<string, GroupMember>) => {
-        //         return groupCode == GroupCode && members.has(uid);
-        //     },
-        //     GroupCode, [uid], forced,
-        // );
-        // return _members.get(uid);
     }
 
     async getGroupMembers(groupQQ: string, num = 3000): Promise<Map<string, GroupMember>> {

src/onebot/api/group.ts

@@ -75,7 +75,7 @@ export class OneBotGroupApi {
         const NTQQGroupApi = this.coreContext.apis.GroupApi;
         const groupElement = grayTipElement?.groupElement;
         if (!groupElement) return undefined;
-        const member = await NTQQGroupApi.getGroupMember(GroupCode, groupElement.memberUid);
+        const member = await NTQQGroupApi.getGroupMemberV2(GroupCode, groupElement.memberUid);
         const memberUin = member?.uin;
         const adminMember = await NTQQGroupApi.getGroupMember(GroupCode, groupElement.adminUid);
         if (memberUin) {

src/onebot/helper/event.ts

@@ -94,7 +94,7 @@ export async function NT2GroupEvent(core: NapCatCore, obContext: NapCatOneBot11A
                 if (emojiLikeEvent) return emojiLikeEvent;
             }
             if (element.grayTipElement.subElementType == NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_XMLMSG) {
-                const GroupIncreaseEvent = await obContext.apiContext.GroupApi.parseGroupMemberIncreaseEvent(msg.peerUid, element.grayTipElement);
+                const GroupIncreaseEvent = await obContext.apiContext.GroupApi.parseGroupIncreaseEvent(msg.peerUid, element.grayTipElement);
                 if (GroupIncreaseEvent) return GroupIncreaseEvent;
             }