GuanM/NapCatQQ
1
0
Fork 0
mirror of https://github.com/NapNeko/NapCatQQ.git synced 2024-11-21 09:36:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: await & error handling

Browse Source
This commit is contained in:
Wesley F. Young 2024-09-07 01:16:40 +08:00
parent 90eb3da7f8
commit b802aad726
1 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/laana/network/ws-server.ts
View File

@ -61,9 +61,10 @@ export class LaanaWsServerAdapter implements ILaanaNetworkAdapter {
this.core.context.logger.logError('未实现的动作名', actionName); this.core.context.logger.logError('未实现的动作名', actionName);
return; return;
} }
try {
// eslint-disable-next-line // eslint-disable-next-line
// @ts-ignore // @ts-ignore
const ret = actionHandler(data.data.actionPing.ping[actionName]); const ret = await actionHandler(data.data.actionPing.ping[actionName]);
this.checkStateAndReply(LaanaDataWrapper.toBinary({ this.checkStateAndReply(LaanaDataWrapper.toBinary({
data: { data: {
oneofKind: 'actionPong', oneofKind: 'actionPong',
@ -74,10 +75,27 @@ export class LaanaWsServerAdapter implements ILaanaNetworkAdapter {
pong: { pong: {
oneofKind: actionName, oneofKind: actionName,
[actionName]: ret, [actionName]: ret,
} },
}, },
}, },
}), wsClient); }), wsClient);
} catch (e: any) {
this.core.context.logger.logError('处理动作时出现错误', e);
this.checkStateAndReply(LaanaDataWrapper.toBinary({
data: {
oneofKind: 'actionPong',
actionPong: {
clientPingId: data.data.actionPing.clientPingId,
pong: {
oneofKind: 'failed',
failed: {
reason: e.toString(),
}
},
},
},
}), wsClient);
}
} else { } else {
this.core.context.logger.logWarn('未知的数据包类型', data.data.oneofKind); this.core.context.logger.logWarn('未知的数据包类型', data.data.oneofKind);
} }