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

fix(dispatcher): middleware and event emitter related fixes

Browse source
This commit is contained in:
teidesu 2021-07-09 01:49:53 +03:00
parent 28c70a89ba
commit c33646943c
1 changed files with 30 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
packages/dispatcher/src/dispatcher.ts
View file

@ -437,11 +437,16 @@ export class Dispatcher<
const isRawMessage = update && tl.isAnyMessage(update)
if (parsed === undefined && this._handlersCount[update!._]) {
if (parsed === undefined) {
const pair = PARSERS[update!._]
if (pair) {
parsed = pair[1](this._client, update!, users!, chats!)
parsedType = pair[0]
if (
this._handlersCount[update!._] ||
this.listenerCount(pair[0])
) {
parsed = pair[1](this._client, update!, users!, chats!)
parsedType = pair[0]
}
} else {
parsed = parsedType = null
}
@ -524,19 +529,22 @@ export class Dispatcher<
let shouldDispatch = true
let shouldDispatchChildren = true
let wasHandled = false
let updateInfo: any = null
const updateInfo = { type: parsedType, data: parsed }
switch (
await this._preUpdateHandler?.(
updateInfo as any,
parsedState as any
)
) {
case 'stop':
shouldDispatch = false
break
case 'stop-children':
return false
if (parsed) {
updateInfo = { type: parsedType, data: parsed }
switch (
await this._preUpdateHandler?.(
updateInfo as any,
parsedState as any
)
) {
case 'stop':
shouldDispatch = false
break
case 'stop-children':
return false
}
}
if (shouldDispatch) {
@ -678,11 +686,13 @@ export class Dispatcher<
}
}
this._postUpdateHandler?.(
wasHandled,
updateInfo as any,
parsedState as any
)
if (updateInfo) {
this._postUpdateHandler?.(
wasHandled,
updateInfo,
parsedState as any
)
}
return wasHandled
}