Make WsStream a plain stream again

This commit is contained in:
Daniil Gentili 2019-09-17 21:45:48 +02:00
parent 8c33e5e820
commit 9e194f3950
2 changed files with 93 additions and 20 deletions

View File

@ -0,0 +1,92 @@
<?php
/**
* Ping loop.
*
* This file is part of MadelineProto.
* MadelineProto is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
* MadelineProto is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU Affero General Public License for more details.
* You should have received a copy of the GNU General Public License along with MadelineProto.
* If not, see <http://www.gnu.org/licenses/>.
*
* @author Daniil Gentili <daniil@daniil.it>
* @copyright 2016-2019 Daniil Gentili <daniil@daniil.it>
* @license https://opensource.org/licenses/AGPL-3.0 AGPLv3
*
* @link https://docs.madelineproto.xyz MadelineProto documentation
*/
namespace danog\MadelineProto\Loop\Connection;
use danog\MadelineProto\Connection;
use danog\MadelineProto\Loop\Impl\ResumableSignalLoop;
/**
* Ping loop.
*
* @author Daniil Gentili <daniil@daniil.it>
*/
class PingLoop extends ResumableSignalLoop
{
/**
* Connection instance.
*
* @var \danog\MadelineProto\Connection
*/
protected $connection;
/**
* DC ID.
*
* @var string
*/
protected $datacenter;
/**
* DataCenterConnection instance.
*
* @var \danog\MadelineProto\DataCenterConnection
*/
protected $datacenterConnection;
public function __construct(Connection $connection)
{
$this->connection = $connection;
$this->API = $connection->getExtra();
$this->datacenter = $connection->getDatacenterID();
$this->datacenterConnection = $connection->getShared();
}
public function loop()
{
$API = $this->API;
$datacenter = $this->datacenter;
$connection = $this->connection;
$shared = $this->datacenterConnection;
$timeout = $shared->getSettings()['timeout'];
while (true) {
while (!$shared->hasTempAuthKey()) {
if (yield $this->waitSignal($this->pause())) {
return;
}
}
if (yield $this->waitSignal($this->pause($timeout))) {
return;
}
if (\time() - $connection->getLastChunk() >= $timeout) {
$API->logger->logger("Ping DC $datacenter");
try {
yield $connection->method_call_async_read('ping', ['ping_id' => \random_bytes(8)]);
} catch (\Throwable $e) {
$API->logger->logger("Error while pinging DC $datacenter");
$API->logger->logger((string) $e);
}
}
}
}
public function __toString(): string
{
return "Ping loop in DC {$this->datacenter}";
}
}

View File

@ -28,11 +28,8 @@ use Amp\Websocket\Client\Internal\ClientSocket;
use Amp\Websocket\Client\Rfc6455Connection;
use Amp\Websocket\Rfc6455Client;
use Amp\Websocket\Rfc7692CompressionFactory;
use danog\MadelineProto\API;
use danog\MadelineProto\MTProto;
use danog\MadelineProto\Stream\Async\RawStream;
use danog\MadelineProto\Stream\ConnectionContext;
use danog\MadelineProto\Stream\RawProxyStreamInterface;
use function Amp\Websocket\generateKey;
use function Amp\Websocket\validateAcceptForKey;
@ -41,16 +38,10 @@ use function Amp\Websocket\validateAcceptForKey;
*
* @author Daniil Gentili <daniil@daniil.it>
*/
class WsStream implements RawProxyStreamInterface
class WsStream implements RawStreamInterface
{
use RawStream;
/**
* API instance.
*
* @var MTProto
*/
private $API;
/**
* Websocket stream.
*
@ -227,16 +218,6 @@ class WsStream implements RawProxyStreamInterface
return null;
}
/**
* Set API instance.
*
* @param MTProto $extra
* @return void
*/
public function setExtra($extra)
{
$this->API = $extra;
}
/**
* {@inheritdoc}
*