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

feat(core): handle AUTH_KEY_UNREGISTERED error

Browse source
This commit is contained in:
teidesu 2021-06-05 18:56:43 +03:00
parent 79af4c4425
commit 68ea4080df
2 changed files with 48 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
packages/client/src/methods/files/download-iterable.ts
View file

@ -86,21 +86,21 @@ export async function* downloadAsIterable(
const requestCurrent = async (): Promise<Buffer> => {
let result: tl.RpcCallReturn['upload.getFile'] | tl.RpcCallReturn['upload.getWebFile']
try {
result = await connection.sendForResult({
result = await this.call({
_: isWeb ? 'upload.getWebFile' : 'upload.getFile',
location: location as any,
offset,
limit: chunkSize
})
}, { connection })
} catch (e) {
if (e instanceof FileMigrateError) {
if (e.constructor === FileMigrateError) {
connection = this._downloadConnections[e.newDc]
if (!connection) {
connection = await this.createAdditionalConnection(e.newDc)
this._downloadConnections[e.newDc] = connection
}
return requestCurrent()
} else if (e instanceof FilerefUpgradeNeededError) {
} else if (e.constructor === FilerefUpgradeNeededError) {
// todo: implement someday
// see: https://github.com/LonamiWebs/Telethon/blob/0e8bd8248cc649637b7c392616887c50986427a0/telethon/client/downloads.py#L99
throw new MtCuteUnsupportedError('File ref expired!')

56
packages/core/src/base-client.ts
View file

@ -17,6 +17,7 @@ import {
defaultProductionIpv6Dc,
} from './utils/default-dcs'
import {
AuthKeyUnregisteredError,
FloodTestPhoneWaitError,
FloodWaitError,
InternalError,
@ -347,7 +348,9 @@ export class BaseTelegramClient {
this.storage.setAuthKeyFor(this._primaryDc.id, key)
await this._saveStorage()
})
this.primaryConnection.on('error', (err) => this._emitError(err, this.primaryConnection))
this.primaryConnection.on('error', (err) =>
this._emitError(err, this.primaryConnection)
)
}
/**
@ -488,7 +491,11 @@ export class BaseTelegramClient {
for (let i = 0; i < this._rpcRetryCount; i++) {
try {
const res = await connection.sendForResult(message, stack, params?.timeout)
const res = await connection.sendForResult(
message,
stack,
params?.timeout
)
await this._cachePeersFrom(res)
return res
@ -530,16 +537,37 @@ export class BaseTelegramClient {
continue
}
}
if (
connection === this.primaryConnection &&
(e.constructor === PhoneMigrateError ||
if (connection.params.dc.id === this._primaryDc.id) {
if (
e.constructor === PhoneMigrateError ||
e.constructor === UserMigrateError ||
e.constructor === NetworkMigrateError)
) {
debug('Migrate error, new dc = %d', e.newDc)
await this.changeDc(e.newDc)
continue
e.constructor === NetworkMigrateError
) {
debug('Migrate error, new dc = %d', e.newDc)
await this.changeDc(e.newDc)
continue
}
} else {
if (e.constructor === AuthKeyUnregisteredError) {
// we can try re-exporting auth from the primary connection
debug('exported auth key error, re-exporting..')
const auth = await this.call({
_: 'auth.exportAuthorization',
dcId: connection.params.dc.id,
})
await connection.sendForResult({
_: 'auth.importAuthorization',
id: auth.id,
bytes: auth.bytes,
})
continue
}
}
throw e
}
}
@ -635,7 +663,9 @@ export class BaseTelegramClient {
changeTransport(factory: TransportFactory): void {
this.primaryConnection.changeTransport(factory)
this._additionalConnections.forEach((conn) => conn.changeTransport(factory))
this._additionalConnections.forEach((conn) =>
conn.changeTransport(factory)
)
}
/**
@ -647,7 +677,9 @@ export class BaseTelegramClient {
* the connection in which the error has occurred, in case
* this was connection-related error.
*/
onError(handler: (err: Error, connection?: TelegramConnection) => void): void {
onError(
handler: (err: Error, connection?: TelegramConnection) => void
): void {
this._onError = handler
}