teidesu/mtcute
1
0
Fork 0
Code Issues 15 Pull requests 1 Projects Releases Packages Wiki Activity Actions

fix(core): correctly handle rpc_error for methods returning vectors of primitives

Browse source
This commit is contained in:
alina 🌸 2024-06-26 00:39:06 +03:00
parent 1133d1279d
commit 34643ffe89
Signed by: teidesu
SSH key fingerprint: SHA256:uNeCpw6aTSU4aIObXLvHfLkDa82HWH9EiOj9AXOIRpI
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
packages/core/src/network/session-connection.ts
View file

@ -55,6 +55,8 @@ const GZIP_PACKED_ID = 0x3072cfa1
const MSG_CONTAINER_ID = 0x73f1f8dc const MSG_CONTAINER_ID = 0x73f1f8dc
// rpc_result#f35c6d01 req_msg_id:long result:Object = RpcResult; // rpc_result#f35c6d01 req_msg_id:long result:Object = RpcResult;
const RPC_RESULT_ID = 0xf35c6d01 const RPC_RESULT_ID = 0xf35c6d01
// rpc_error#2144ca19 error_code:int error_message:string = RpcError;
const RPC_ERROR_ID = 0x2144ca19
// invokeAfterMsg#cb9f372d {X:Type} msg_id:long query:!X = X; // invokeAfterMsg#cb9f372d {X:Type} msg_id:long query:!X = X;
const INVOKE_AFTER_MSG_ID = 0xcb9f372d const INVOKE_AFTER_MSG_ID = 0xcb9f372d
const INVOKE_AFTER_MSG_SIZE = 12 // 8 (invokeAfterMsg) + 4 (msg_id) const INVOKE_AFTER_MSG_SIZE = 12 // 8 (invokeAfterMsg) + 4 (msg_id)
@ -752,11 +754,17 @@ export class SessionConnection extends PersistentConnection {
const rpc = msg.rpc const rpc = msg.rpc
const customReader = this._readerMap._results![rpc.method] const resultConstructorId = message.peekUint()
let result: any let result: any
if (customReader) { const customReader = this._readerMap._results![rpc.method]
if (resultConstructorId === RPC_ERROR_ID) {
// we need to handle this before anything else because otherwise we might
// try to use customReader on an error which will inevitably fail or break
result = message.object()
} else if (customReader) {
result = customReader(message) result = customReader(message)
} else { } else {
const objectId = message.uint() const objectId = message.uint()