danog/MadelineProto
2
2
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Properly handle closed sockets and polyfill some more methods

Browse Source
This commit is contained in:
Daniil Gentili 2019-06-21 12:16:48 +02:00
parent b9e8c5a06f
commit 7c7d2cb50c
5 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/danog/MadelineProto/DataCenter.php
View File

@ -115,7 +115,7 @@ class DataCenter
[
new Nameserver('https://mozilla.cloudflare-dns.com/dns-query'),
new Nameserver('https://google.com/resolve', Nameserver::GOOGLE_JSON, ["Host" => "dns.google.com"]),
],
]
);
$this->DoHClient = Magic::$altervista || Magic::$zerowebhost ? new Rfc1035StubResolver() : new Rfc8484StubResolver($DoHConfig);
$this->NonProxiedDoHClient = Magic::$altervista || Magic::$zerowebhost ? new Rfc1035StubResolver() : new Rfc8484StubResolver($NonProxiedDoHConfig);

4
src/danog/MadelineProto/Loop/Connection/ReadLoop.php
View File

@ -25,6 +25,7 @@ use danog\MadelineProto\Loop\Impl\SignalLoop;
use danog\MadelineProto\MTProtoTools\Crypt;
use danog\MadelineProto\NothingInTheSocketException;
use danog\MadelineProto\Tools;
use Amp\ByteStream\StreamException;
/**
* Socket read loop.
@ -56,10 +57,11 @@ class ReadLoop extends SignalLoop
while (true) {
try {
$error = yield $this->waitSignal($this->readMessage());
} catch (NothingInTheSocketException $e) {
} catch (NothingInTheSocketException|StreamException $e) {
if (isset($connection->old)) {
return;
}
$API->logger->logger($e);
$API->logger->logger("Got nothing in the socket in DC {$datacenter}, reconnecting...", Logger::ERROR);
yield $connection->reconnect();
continue;

3
src/danog/MadelineProto/Loop/Connection/WriteLoop.php
View File

@ -24,6 +24,7 @@ use danog\MadelineProto\Loop\Impl\ResumableSignalLoop;
use danog\MadelineProto\Magic;
use danog\MadelineProto\MTProtoTools\Crypt;
use danog\MadelineProto\Tools;
use Amp\ByteStream\StreamException;
/**
* Socket write loop.
@ -64,7 +65,7 @@ class WriteLoop extends ResumableSignalLoop
try {
$please_wait = yield $this->{$connection->temp_auth_key === null ? 'unencryptedWriteLoopAsync' : 'encryptedWriteLoopAsync'}();
} catch (\Amp\ByteStream\StreamException $e) {
} catch (StreamException $e) {
if (isset($connection->old)) {
return;
}

4
src/danog/MadelineProto/Stream/Transport/DefaultStream.php
View File

@ -25,6 +25,7 @@ use danog\MadelineProto\Stream\RawStreamInterface;
use function Amp\Socket\connect;
use function Amp\Socket\cryptoConnect;
use danog\MadelineProto\Stream\ProxyStreamInterface;
use Amp\ByteStream\ClosedException;
/**
* Default stream wrapper.
@ -83,6 +84,9 @@ class DefaultStream extends Socket implements RawStreamInterface, ProxyStreamInt
*/
public function write(string $data): Promise
{
if (!$this->stream) {
throw new ClosedException("MadelineProto stream was disconnected");
}
return $this->stream->write($data);
}

3
src/polyfill.php
View File

@ -12,3 +12,6 @@ if (!function_exists('is_iterable')) {
return is_array($var) || $var instanceof Traversable;
}
}
if (!function_exists('error_clear_last')) {
function error_clear_last() {}
}