danog/MadelineProto
1
0
Fork 0
mirror of https://github.com/danog/MadelineProto.git synced 2025-01-22 15:51:15 +01:00
Code Issues Projects Releases Wiki Activity

Handle exceptions thrown in the handler loop

Browse Source
This commit is contained in:
Daniil Gentili 2023-12-19 14:37:18 +01:00
parent 92351a7c0e
commit c9775a97d0
4 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Connection.php
View File

@ -337,7 +337,7 @@ final class Connection
public function wakeupHandler(): void
{
\assert($this->handler !== null);
$this->handler->resume();
Assert::true($this->handler->resume() || $this->handler->isRunning(), "Could not resume handler!");
}
/**
* Apply method abstractions.

2
src/Loop/Connection/ReadLoop.php
View File

@ -117,7 +117,7 @@ final class ReadLoop extends Loop
}
$this->connection->httpReceived();
if ($this->connection->isHttp()) {
EventLoop::queue($this->connection->pingHttpWaiter(...));
$this->connection->pingHttpWaiter();
}
$this->connection->wakeupHandler();
return self::CONTINUE;

49
src/MTProtoSession/ResponseHandler.php
View File

@ -58,28 +58,32 @@ trait ResponseHandler
if ($type !== 'msg_container') {
$this->checkInSeqNo($message);
}
match ($type) {
'msgs_ack' => $this->handleAck($message),
try {
match ($type) {
'msgs_ack' => $this->handleAck($message),
'rpc_result',
'future_salts',
'msgs_state_info',
'bad_server_salt',
'bad_msg_notification',
'pong' => $this->handleResponse($message),
'rpc_result',
'future_salts',
'msgs_state_info',
'bad_server_salt',
'bad_msg_notification',
'pong' => $this->handleResponse($message),
'new_session_created' => $this->handleNewSession($message),
'msg_container' => $this->handleContainer($message),
'msg_copy' => $this->handleMsgCopy($message),
'http_wait' => $this->API->logger($message->read(), Logger::NOTICE),
'msgs_state_req' => $this->sendMsgsStateInfo($message->read()['msg_ids'], $message->getMsgId()),
'msgs_all_info' => $this->onMsgsAllInfo($message->read()),
'msg_detailed_info' => $this->onMsgDetailedInfo($message->read()),
'msg_new_detailed_info' => $this->onNewMsgDetailedInfo($message->read()),
'msg_resend_req' => $this->onMsgResendReq($message->read(), $message->getMsgId()),
'msg_resend_ans_req' => $this->onMsgResendAnsReq($message->read(), $message->getMsgId()),
default => $this->handleFallback($message)
};
'new_session_created' => $this->handleNewSession($message),
'msg_container' => $this->handleContainer($message),
'msg_copy' => $this->handleMsgCopy($message),
'http_wait' => $this->API->logger($message->read(), Logger::NOTICE),
'msgs_state_req' => $this->sendMsgsStateInfo($message->read()['msg_ids'], $message->getMsgId()),
'msgs_all_info' => $this->onMsgsAllInfo($message->read()),
'msg_detailed_info' => $this->onMsgDetailedInfo($message->read()),
'msg_new_detailed_info' => $this->onNewMsgDetailedInfo($message->read()),
'msg_resend_req' => $this->onMsgResendReq($message->read(), $message->getMsgId()),
'msg_resend_ans_req' => $this->onMsgResendAnsReq($message->read(), $message->getMsgId()),
default => $this->handleFallback($message)
};
} catch (\Throwable $e) {
$this->API->logger("An error occurred while handling $message: $e", Logger::FATAL_ERROR);
}
}
return Loop::PAUSE;
}
@ -378,12 +382,13 @@ trait ResponseHandler
case 'SESSION_REVOKED':
case 'SESSION_EXPIRED':
$this->API->logger($response['error_message'], Logger::FATAL_ERROR);
$phone = null;
if (\in_array($response['error_message'], ['USER_DEACTIVATED', 'USER_DEACTIVATED_BAN'], true)) {
$phone = isset($this->API->authorization['user']['phone']) ? '+' . $this->API->authorization['user']['phone'] : '???';
$this->API->logger(sprintf(Lang::$current_lang['account_banned'], $phone), Logger::FATAL_ERROR);
}
$this->API->logout();
throw new SignalException(sprintf(Lang::$current_lang['account_banned'], $phone ?? '?'));
return static fn () => new SignalException(sprintf(Lang::$current_lang['account_banned'], $phone ?? '?'));
case 'AUTH_KEY_UNREGISTERED':
case 'AUTH_KEY_INVALID':
if ($this->API->authorized !== \danog\MadelineProto\API::LOGGED_IN) {
@ -406,7 +411,7 @@ trait ResponseHandler
$phone = isset($this->API->authorization['user']['phone']) ? '+' . $this->API->authorization['user']['phone'] : 'you are currently using';
$this->API->logger(sprintf(Lang::$current_lang['account_banned'], $phone), Logger::FATAL_ERROR);
$this->API->logout();
throw new SignalException(sprintf(Lang::$current_lang['account_banned'], $phone));
return static fn () => new SignalException(sprintf(Lang::$current_lang['account_banned'], $phone));
}
EventLoop::queue($this->shared->initAuthorization(...));
EventLoop::queue($this->methodRecall(...), $request->getMsgId());

5
src/MTProtoSession/Session.php
View File

@ -107,8 +107,9 @@ trait Session
$this->session_out_seq_no = 0;
$this->msgIdHandler ??= new MsgIdHandler($this);
if (!isset($this->new_incoming)) {
$this->new_incoming = new SplQueue;
$this->new_incoming->setIteratorMode(SplQueue::IT_MODE_DELETE);
$q = new SplQueue;
$q->setIteratorMode(SplQueue::IT_MODE_DELETE);
$this->new_incoming = $q;
}
foreach ($this->outgoing_messages as &$msg) {
if ($msg->hasMsgId()) {