fix: #733

src/common/cancel-task.ts

@@ -1,4 +1,4 @@
-export type TaskExecutor<T> = (resolve: (value: T | PromiseLike<T>) => void, reject: (reason?: any) => void, onCancel: (callback: () => void) => void) => void;
+export type TaskExecutor<T> = (resolve: (value: T | PromiseLike<T>) => void, reject: (reason?: any) => void, onCancel: (callback: () => void) => void) => void | Promise<void>;
 
 export class CancelableTask<T> {
     private promise: Promise<T>;
@@ -7,12 +7,13 @@ export class CancelableTask<T> {
     private cancelListeners: Array<() => void> = [];
 
     constructor(executor: TaskExecutor<T>) {
-        this.promise = new Promise<T>((resolve, reject) => {
+        this.promise = new Promise<T>(async (resolve, reject) => {
             const onCancel = (callback: () => void) => {
                 this.cancelCallback = callback;
             };
 
-            executor(
+            try {
+                await executor(
                     (value) => {
                         if (!this.isCanceled) {
                             resolve(value);
@@ -25,6 +26,11 @@ export class CancelableTask<T> {
                     },
                     onCancel
                 );
+            } catch (error) {
+                if (!this.isCanceled) {
+                    reject(error);
+                }
+            }
         });
     }
 
@@ -68,9 +74,8 @@ export class CancelableTask<T> {
     }
 }
 
-
 async function demoAwait() {
-    const executor: TaskExecutor<number> = (resolve, reject, onCancel) => {
+    const executor: TaskExecutor<number> = async (resolve, reject, onCancel) => {
         let count = 0;
         const intervalId = setInterval(() => {
             count++;

src/core/apis/group.ts

@@ -9,10 +9,12 @@ import {
     NapCatCore,
     GroupNotify,
     GroupInfoSource,
+    ShutUpGroupMember,
 } from '@/core';
 import { isNumeric, solveAsyncProblem } from '@/common/helper';
 import { LimitedHashTable } from '@/common/message-unique';
 import { NTEventWrapper } from '@/common/event';
+import { CancelableTask, TaskExecutor } from '@/common/cancel-task';
 
 export class NTQQGroupApi {
     context: InstanceContext;
@@ -58,9 +60,28 @@ export class NTQQGroupApi {
     }
 
     async getGroupShutUpMemberList(groupCode: string) {
-        const data = this.core.eventWrapper.registerListen('NodeIKernelGroupListener/onShutUpMemberListChanged', (group_id) => group_id === groupCode, 1, 1000);
-        this.context.session.getGroupService().getGroupShutUpMemberList(groupCode);
-        return (await data)[1];
+        const executor: TaskExecutor<ShutUpGroupMember[]> = async (resolve, reject, onCancel) => {
+            this.core.eventWrapper.registerListen(
+                'NodeIKernelGroupListener/onShutUpMemberListChanged',
+                (group_id) => group_id === groupCode,
+                1,
+                1000
+            ).then((data) => {
+                resolve(data[1])
+            }).catch(reject);
+
+            onCancel(() => {
+                reject(new Error('Task was canceled'));
+            });
+        };
+
+        const task = new CancelableTask(executor);
+        this.context.session.getGroupService().getGroupShutUpMemberList(groupCode).then(e => {
+            if (e.result !== 0) {
+                task.cancel()
+            }
+        })
+        return await task.catch(() => []);
     }
 
     async clearGroupNotifiesUnreadCount(doubt: boolean) {

src/core/services/NodeIKernelGroupService.ts

@@ -251,7 +251,7 @@ export interface NodeIKernelGroupService {
 
     setGroupShutUp(groupCode: string, shutUp: boolean): void;
 
-    getGroupShutUpMemberList(groupCode: string): Promise<any>;
+    getGroupShutUpMemberList(groupCode: string): Promise<GeneralCallResult>;
 
     setMemberShutUp(groupCode: string, memberTimes: { uid: string, timeStamp: number }[]): Promise<void>;