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

fix(core): fixed signInQr method

Browse source
This commit is contained in:
alina 🌸 2025-01-01 06:30:46 +03:00
parent 70b5a423c6
commit a591df92e0
Signed by: teidesu
SSH key fingerprint: SHA256:uNeCpw6aTSU4aIObXLvHfLkDa82HWH9EiOj9AXOIRpI
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
packages/core/src/highlevel/methods/auth/sign-in-qr.ts
View file

@ -2,7 +2,6 @@ import type { MaybePromise } from '../../../types/utils.js'
import type { ITelegramClient } from '../../client.types.js' import type { ITelegramClient } from '../../client.types.js'
import type { MaybeDynamic } from '../../types/index.js' import type { MaybeDynamic } from '../../types/index.js'
import type { RawUpdateInfo } from '../../updates/types.js'
import { base64, Deferred } from '@fuman/utils' import { base64, Deferred } from '@fuman/utils'
import { tl } from '@mtcute/tl' import { tl } from '@mtcute/tl'
import { sleepWithAbort } from '../../../utils/misc-utils.js' import { sleepWithAbort } from '../../../utils/misc-utils.js'
@ -54,19 +53,19 @@ export async function signInQr(
let waiter: Deferred<void> | undefined let waiter: Deferred<void> | undefined
// todo: we should probably make this into an await-able function // NB: at this point update manager is not active yet, so we can't use onRawUpdate
const onUpdate = ({ update }: RawUpdateInfo) => { const onUpdate = (update: tl.TypeUpdates) => {
if (update._ === 'updateLoginToken') { if (update._ === 'updateShort' && update.update._ === 'updateLoginToken') {
onQrScanned?.() onQrScanned?.()
waiter?.resolve() waiter?.resolve()
client.onRawUpdate.remove(onUpdate) client.onServerUpdate.remove(onUpdate)
} }
} }
client.onRawUpdate.add(onUpdate) client.onServerUpdate.add(onUpdate)
abortSignal?.addEventListener('abort', () => { abortSignal?.addEventListener('abort', () => {
client.onRawUpdate.remove(onUpdate) client.onServerUpdate.remove(onUpdate)
waiter?.reject(abortSignal.reason) waiter?.reject(abortSignal.reason)
}) })
@ -130,7 +129,10 @@ export async function signInQr(
) )
waiter = new Deferred() waiter = new Deferred()
await Promise.race([waiter, sleepWithAbort(res.expires * 1000 - Date.now(), client.stopSignal)]) await Promise.race([
waiter.promise,
sleepWithAbort(res.expires * 1000 - Date.now(), client.stopSignal),
])
break break
case 'auth.loginTokenMigrateTo': { case 'auth.loginTokenMigrateTo': {
await client.changePrimaryDc(res.dcId) await client.changePrimaryDc(res.dcId)
@ -174,6 +176,6 @@ export async function signInQr(
return new User(self) return new User(self)
} finally { } finally {
client.onRawUpdate.remove(onUpdate) client.onServerUpdate.remove(onUpdate)
} }
} }