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

fix(core): support opting out of -503 resending

Browse source
This commit is contained in:
alina 🌸 2023-12-08 20:33:41 +03:00
parent b6fac0785c
commit aaa2875fe1
Signed by: teidesu
SSH key fingerprint: SHA256:uNeCpw6aTSU4aIObXLvHfLkDa82HWH9EiOj9AXOIRpI
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/client/src/methods/bots/get-callback-answer.ts
View file

@ -56,6 +56,6 @@ export async function getCallbackAnswer(
password,
game: game,
},
{ timeout },
{ timeout, throw503: true },
)
}

15
packages/core/src/network/network-manager.ts
View file

@ -2,7 +2,7 @@ import { tl } from '@mtcute/tl'
import { TlReaderMap, TlWriterMap } from '@mtcute/tl-runtime'
import { ITelegramStorage } from '../storage/index.js'
import { MtArgumentError, MtcuteError } from '../types/index.js'
import { MtArgumentError, MtcuteError, MtTimeoutError } from '../types/index.js'
import { ControllablePromise, createControllablePromise, ICryptoProvider, Logger, sleep } from '../utils/index.js'
import { assertTypeIs } from '../utils/type-assertions.js'
import { ConfigManager } from './config-manager.js'
@ -147,6 +147,14 @@ export interface RpcCallOptions {
* Abort signal for the call.
*/
abortSignal?: AbortSignal
/**
* Whether we should not retry on -503 errors and throw {@link MtTimeoutError} immediately instead.
*
* Useful for methods like `messages.getBotCallbackAnswer` that reliably return
* -503 in case the upstream bot failed to respond.
*/
throw503?: boolean
}
/**
@ -639,6 +647,7 @@ export class NetworkManager {
const floodSleepThreshold = params?.floodSleepThreshold ?? this.params.floodSleepThreshold
const maxRetryCount = params?.maxRetryCount ?? this.params.maxRetryCount
const throw503 = params?.throw503 ?? false
// do not send requests that are in flood wait
if (this._floodWaitedRequests.has(message._)) {
@ -691,6 +700,10 @@ export class NetworkManager {
}
if (!(e.code in CLIENT_ERRORS)) {
if (throw503 && e.code === -503) {
throw new MtTimeoutError()
}
this._log.warn('Telegram is having internal issues: %d %s, retrying', e.code, e.message)
if (e.text === 'WORKER_BUSY_TOO_LONG_RETRY') {