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

Now working (with a huge latency but working)

Browse Source
This commit is contained in:
Daniil Gentili 2019-05-29 22:12:36 +02:00
parent 28928e339f
commit 5da683f508
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/danog/MadelineProto/Loop/Update/FeedLoop.php
View File

@ -21,6 +21,7 @@ namespace danog\MadelineProto\Loop\Update;
use Amp\Success;
use danog\MadelineProto\Logger;
use danog\MadelineProto\Loop\Impl\ResumableSignalLoop;
use Amp\Loop;
/**
* update feed loop.
@ -95,6 +96,7 @@ class FeedLoop extends ResumableSignalLoop
}
$this->parsedUpdates = [];
}
if ($API->update_deferred) Loop::defer([$API->update_deferred, 'resolve']);
}
}
public function parse($updates)
@ -107,11 +109,11 @@ class FeedLoop extends ResumableSignalLoop
if (isset($update['pts'])) {
$logger = function ($msg) use ($update) {
$pts_count = isset($update['pts_count']) ? $update['pts_count'] : 0;
$this->logger->logger($update);
$this->API->logger->logger($update);
$double = isset($update['message']['id']) ? $update['message']['id'] * 2 : '-';
$mid = isset($update['message']['id']) ? $update['message']['id'] : '-';
$mypts = $this->state->pts();
$this->logger->logger("$msg. My pts: {$mypts}, remote pts: {$update['pts']}, remote pts count: {$pts_count}, msg id: {$mid} (*2=$double), channel id: {$this->channelId}", \danog\MadelineProto\Logger::ERROR);
$this->API->logger->logger("$msg. My pts: {$mypts}, remote pts: {$update['pts']}, remote pts count: {$pts_count}, msg id: {$mid} (*2=$double), channel id: {$this->channelId}", \danog\MadelineProto\Logger::ERROR);
};
$result = $this->state->checkPts($update);
if ($result < 0) {

17
src/danog/MadelineProto/Loop/Update/SeqLoop.php
View File

@ -81,17 +81,21 @@ class SeqLoop extends ResumableSignalLoop
$this->exitedLoop();
return;
}
$result = [];
while ($this->incomingUpdates) {
$updates = $this->incomingUpdates;
$this->incomingUpdates = [];
yield $this->parse($updates);
$result += yield $this->parse($updates);
$updates = null;
}
$feeder->resumeDefer();
foreach ($result as $channelId => $boh) {
$this->API->feeders[$channelId]->resumeDefer();
}
}
}
public function parse($updates)
{
$result = [];
reset($updates);
while ($updates) {
$options = [];
@ -124,8 +128,9 @@ class SeqLoop extends ResumableSignalLoop
$this->state->date($options['date']);
}
$this->save($updates);
$result += $this->save($updates);
}
return $result;
}
public function feed($updates)
{
@ -133,7 +138,11 @@ class SeqLoop extends ResumableSignalLoop
}
public function save($updates)
{
$this->feeder->feed($updates);
$result = [];
foreach ($updates['updates'] as $update) {
$result[yield $this->API->feedSingle($update)] = true;
}
return $result;
}
public function has_all_auth()
{

5
src/danog/MadelineProto/MTProtoTools/ResponseHandler.php
View File

@ -591,9 +591,8 @@ trait ResponseHandler
} else {
$updates['updates'][0]['options'] = ['seq_start' => $updates['seq'], 'seq_end' => $updates['seq'], 'date' => $updates['date']];
}
foreach ($updates as $update) {
$result[yield $this->seqUpdater->feed($update)] = true;
}
$this->seqUpdater->feed($updates);
$this->seqUpdater->resumeDefer();
}
break;
case 'updateShort':