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

Cleanup external API

This commit is contained in:
Daniil Gentili 2020-01-19 13:46:49 +01:00
parent 0003ada3ff
commit 9b7ae03d8f
Signed by: danog
GPG Key ID: 8C1BE3B34B230CA7
10 changed files with 104 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -4,7 +4,6 @@
"type": "project",
"license": "AGPL-3.0-only",
"homepage": "https://docs.madelineproto.xyz",
"minimum-stability": "dev",
"keywords": ["telegram", "mtproto", "protocol", "bytes", "messenger", "client", "PHP", "video", "stickers", "audio", "files", "GB"],
"conflict": {
"krakjoe/pthreads-polyfill": "*"
@ -24,7 +23,6 @@
"ext-zlib": "*",
"ext-fileinfo": "*",
"amphp/amp": "^2.0",
"amphp/websocket-client": "dev-master as 1.0.0-rc2",
"amphp/http-client": "^4",
"amphp/socket": "^1",
"amphp/dns": "^1",

2
docs

@ -1 +1 @@
Subproject commit de22c3b924011923438ce6e5e60725a51089ab04
Subproject commit de466b0b0962007f79b4405bdd21b3a0dd08f9ee

22
src/danog/MadelineProto/AnnotationsBuilder.php
View File

@ -251,7 +251,8 @@ class AnnotationsBuilder
}
$paramList .= '$'.$param->getName().', ';
}
if (!$hasVariadic && !$static) {
$hasReturnValue = ($type = $method->getReturnType()) && !\in_array($type->getName(), [\Generator::class, Promise::class]);
if (!$hasVariadic && !$static && !$hasReturnValue) {
$paramList .= '$extra, ';
$doc .= 'array $extra = []';
}
@ -259,7 +260,7 @@ class AnnotationsBuilder
$paramList = \rtrim($paramList, ', ');
$doc .= ")";
$async = true;
if (($type = $method->getReturnType()) && !\in_array($type->getName(), [\Generator::class, Promise::class])) {
if ($hasReturnValue) {
$doc .= ': ';
if ($type->allowsNull()) {
$doc .= '?';
@ -267,23 +268,24 @@ class AnnotationsBuilder
if (!$type->isBuiltin()) {
$doc .= '\\';
}
$doc .= $type->getName() === 'self' ? $method->getDeclaringClass()->getName() : $type->getName();
$doc .= $type->getName() === 'self' ? $this->reflectionClasses['API'] : $type->getName();
$async = false;
}
$finalParamList = $hasVariadic ? "Tools::arr($paramList)" : "[$paramList]";
$ret = $type && $type->getName() === 'void' ? '' : 'return';
$ret = $type && \in_array($type->getName(), ['self', 'void']) ? '' : 'return';
$doc .= "\n{\n";
if ($async || !$static) {
if ($async) {
$doc .= " $ret \$this->__call(__FUNCTION__, $finalParamList);\n";
} else {
$doc .= " $ret \$this->API->$name($paramList);\n";
}
if ($async) {
$doc .= " $ret \$this->__call(__FUNCTION__, $finalParamList);\n";
} elseif (!$static) {
$doc .= " $ret \$this->API->$name($paramList);\n";
} else {
$doc .= " $ret \\".$method->getDeclaringClass()->getName()."::".$name."($paramList);\n";
}
if (!$ret && $type->getName() === 'self') {
$doc .= " return \$this;\n";
}
$doc .= "}\n";

131
src/danog/MadelineProto/InternalDoc.php
View File

@ -4029,9 +4029,10 @@ class InternalDoc extends APIFactory
*
* @return self
*/
public function cleanup(array $extra = []): \danog\MadelineProto\MTProto
public function cleanup(): \danog\MadelineProto\API
{
return $this->API->cleanup($extra);
$this->API->cleanup();
return $this;
}
/**
* Logger.
@ -4042,63 +4043,63 @@ class InternalDoc extends APIFactory
*
* @return void
*/
public function logger($param, int $level = \danog\MadelineProto\Logger::NOTICE, string $file = '', array $extra = []): void
public function logger($param, int $level = \danog\MadelineProto\Logger::NOTICE, string $file = ''): void
{
$this->API->logger($param, $level, $file, $extra);
$this->API->logger($param, $level, $file);
}
/**
* Get TL namespaces.
*
* @return array
*/
public function getMethodNamespaces(array $extra = []): array
public function getMethodNamespaces(): array
{
return $this->API->getMethodNamespaces($extra);
return $this->API->getMethodNamespaces();
}
/**
* Get namespaced methods (method => namespace).
*
* @return array
*/
public function getMethodsNamespaced(array $extra = []): array
public function getMethodsNamespaced(): array
{
return $this->API->getMethodsNamespaced($extra);
return $this->API->getMethodsNamespaced();
}
/**
* Get TL serializer.
*
* @return TL
*/
public function getTL(array $extra = []): \danog\MadelineProto\TL\TL
public function getTL(): \danog\MadelineProto\TL\TL
{
return $this->API->getTL($extra);
return $this->API->getTL();
}
/**
* Get logger.
*
* @return Logger
*/
public function getLogger(array $extra = []): \danog\MadelineProto\Logger
public function getLogger(): \danog\MadelineProto\Logger
{
return $this->API->getLogger($extra);
return $this->API->getLogger();
}
/**
* Get async HTTP client.
*
* @return \Amp\Http\Client\DelegateHttpClient
*/
public function getHTTPClient(array $extra = []): \Amp\Http\Client\DelegateHttpClient
public function getHTTPClient(): \Amp\Http\Client\DelegateHttpClient
{
return $this->API->getHTTPClient($extra);
return $this->API->getHTTPClient();
}
/**
* Get async DNS client.
*
* @return \Amp\Dns\Resolver
*/
public function getDNSClient(array $extra = []): \Amp\Dns\Resolver
public function getDNSClient(): \Amp\Dns\Resolver
{
return $this->API->getDNSClient($extra);
return $this->API->getDNSClient();
}
/**
* Get contents of remote file asynchronously.
@ -4116,9 +4117,9 @@ class InternalDoc extends APIFactory
*
* @return array<DataCenterConnection>
*/
public function getDataCenterConnections(array $extra = []): array
public function getDataCenterConnections(): array
{
return $this->API->getDataCenterConnections($extra);
return $this->API->getDataCenterConnections();
}
/**
* Get correct settings array for the latest version.
@ -4138,18 +4139,18 @@ class InternalDoc extends APIFactory
*
* @return void
*/
public function setupLogger(array $extra = []): void
public function setupLogger(): void
{
$this->API->setupLogger($extra);
$this->API->setupLogger();
}
/**
* Checks whether all datacenters are authorized.
*
* @return boolean
*/
public function hasAllAuth(array $extra = []): bool
public function hasAllAuth(): bool
{
return $this->API->hasAllAuth($extra);
return $this->API->hasAllAuth();
}
/**
* Connects to all datacenters and if necessary creates authorization keys, binds them and writes client info.
@ -4167,9 +4168,9 @@ class InternalDoc extends APIFactory
*
* @return void
*/
public function resetUpdateState(array $extra = []): void
public function resetUpdateState(): void
{
$this->API->resetUpdateState($extra);
$this->API->resetUpdateState();
}
/**
* Store RSA keys for CDN datacenters.
@ -4187,9 +4188,9 @@ class InternalDoc extends APIFactory
*
* @return array
*/
public function getCachedConfig(array $extra = []): array
public function getCachedConfig(): array
{
return $this->API->getCachedConfig($extra);
return $this->API->getCachedConfig();
}
/**
* Get cached (or eventually re-fetch) server-side config.
@ -4288,9 +4289,9 @@ class InternalDoc extends APIFactory
*
* @return void
*/
public function addUser(array $user, array $extra = []): void
public function addUser(array $user): void
{
$this->API->addUser($user, $extra);
$this->API->addUser($user);
}
/**
* Check if peer is present in internal peer database.
@ -4346,9 +4347,9 @@ class InternalDoc extends APIFactory
*
* @return integer
*/
public function fullChatLastUpdated($id, array $extra = []): int
public function fullChatLastUpdated($id): int
{
return $this->API->fullChatLastUpdated($id, $extra);
return $this->API->fullChatLastUpdated($id);
}
/**
* Get full info about peer, returns an FullInfo object.
@ -4448,7 +4449,7 @@ class InternalDoc extends APIFactory
*
* @return \Generator<array>
*/
public function uploadFromCallable($callable, int $size, string $mime, string $fileName = '', $cb = null, bool $seekable = true, bool $encrypted = false, array $extra = [])
public function uploadFromCallable(callable $callable, int $size, string $mime, string $fileName = '', $cb = null, bool $seekable = true, bool $encrypted = false, array $extra = [])
{
return $this->__call(__FUNCTION__, [$callable, $size, $mime, $fileName, $cb, $seekable, $encrypted, $extra]);
}
@ -4624,9 +4625,9 @@ class InternalDoc extends APIFactory
*
* @return int One of MTProto::SECRET_EMPTY, MTProto::SECRET_REQUESTED, MTProto::SECRET_READY
*/
public function secretChatStatus(int $chat, array $extra = []): int
public function secretChatStatus(int $chat): int
{
return $this->API->secretChatStatus($chat, $extra);
return $this->API->secretChatStatus($chat);
}
/**
* Get secret chat.
@ -4635,9 +4636,9 @@ class InternalDoc extends APIFactory
*
* @return array
*/
public function getSecretChat($chat, array $extra = []): array
public function getSecretChat($chat): array
{
return $this->API->getSecretChat($chat, $extra);
return $this->API->getSecretChat($chat);
}
/**
* Check whether secret chat exists.
@ -4646,9 +4647,9 @@ class InternalDoc extends APIFactory
*
* @return boolean
*/
public function hasSecretChat($chat, array $extra = []): bool
public function hasSecretChat($chat): bool
{
return $this->API->hasSecretChat($chat, $extra);
return $this->API->hasSecretChat($chat);
}
/**
* Discard secret chat.
@ -4728,9 +4729,9 @@ class InternalDoc extends APIFactory
*
* @return array Unpacked file ID
*/
public function unpackFileId(string $file_id, array $extra = []): array
public function unpackFileId(string $file_id): array
{
return $this->API->unpackFileId($file_id, $extra);
return $this->API->unpackFileId($file_id);
}
/**
* Get mime type from file extension.
@ -4797,9 +4798,9 @@ class InternalDoc extends APIFactory
*
* @return array
*/
public function tdcliToTd(&$params, $key = null, array $extra = []): array
public function tdcliToTd(&$params, $key = null): array
{
return $this->API->tdcliToTd($params, $key, $extra);
return $this->API->tdcliToTd($params, $key);
}
/**
* Convert TD to MTProto parameters.
@ -5365,9 +5366,9 @@ class InternalDoc extends APIFactory
*
* @return integer
*/
public function callStatus(int $id, array $extra = []): int
public function callStatus(int $id): int
{
return $this->API->callStatus($id, $extra);
return $this->API->callStatus($id);
}
/**
* Get call info.
@ -5376,18 +5377,18 @@ class InternalDoc extends APIFactory
*
* @return array
*/
public function getCall(int $call, array $extra = []): array
public function getCall(int $call): array
{
return $this->API->getCall($call, $extra);
return $this->API->getCall($call);
}
/**
* Check state of calls.
*
* @return void
*/
public function checkCalls(array $extra = []): void
public function checkCalls(): void
{
$this->API->checkCalls($extra);
$this->API->checkCalls();
}
/**
* Get dialog peers.
@ -5418,18 +5419,18 @@ class InternalDoc extends APIFactory
*
* @return void
*/
public function setEventHandler($event_handler, array $extra = []): void
public function setEventHandler($event_handler): void
{
$this->API->setEventHandler($event_handler, $extra);
$this->API->setEventHandler($event_handler);
}
/**
* Get event handler.
*
* @return EventHandler
*/
public function getEventHandler(array $extra = []): EventHandler
public function getEventHandler(): \danog\MadelineProto\EventHandler
{
return $this->API->getEventHandler($extra);
return $this->API->getEventHandler();
}
/**
* Set webhook update handler.
@ -5439,9 +5440,9 @@ class InternalDoc extends APIFactory
*
* @return void
*/
public function setWebhook(string $hook_url, string $pem_path = '', array $extra = []): void
public function setWebhook(string $hook_url, string $pem_path = ''): void
{
$this->API->setWebhook($hook_url, $pem_path, $extra);
$this->API->setWebhook($hook_url, $pem_path);
}
/**
* Set update handling callback.
@ -5450,9 +5451,9 @@ class InternalDoc extends APIFactory
*
* @return void
*/
public function setCallback($callback, array $extra = []): void
public function setCallback($callback): void
{
$this->API->setCallback($callback, $extra);
$this->API->setCallback($callback);
}
/**
* Log out currently logged in user.
@ -5560,9 +5561,9 @@ class InternalDoc extends APIFactory
*
* @return void
*/
public function setLoopCallback($callback, array $extra = []): void
public function setLoopCallback($callback): void
{
$this->API->setLoopCallback($callback, $extra);
$this->API->setLoopCallback($callback);
}
/**
* Start MadelineProto's update handling loop, or run the provided async callable.
@ -5582,18 +5583,18 @@ class InternalDoc extends APIFactory
*
* @return void
*/
public function closeConnection($message = 'OK!', array $extra = []): void
public function closeConnection($message = 'OK!'): void
{
$this->API->closeConnection($message, $extra);
$this->API->closeConnection($message);
}
/**
* Set NOOP update handler, ignoring all updates.
*
* @return void
*/
public function setNoop(array $extra = []): void
public function setNoop(): void
{
$this->API->setNoop($extra);
$this->API->setNoop();
}
/**
* Log in to telegram (via CLI or web).
@ -5609,9 +5610,9 @@ class InternalDoc extends APIFactory
*
* @return string
*/
public function getWebTemplate(array $extra = []): string
public function getWebTemplate(): string
{
return $this->API->getWebTemplate($extra);
return $this->API->getWebTemplate();
}
/**
* Set web template.
@ -5620,9 +5621,9 @@ class InternalDoc extends APIFactory
*
* @return void
*/
public function setWebTemplate(string $template, array $extra = []): void
public function setWebTemplate(string $template): void
{
$this->API->setWebTemplate($template, $extra);
$this->API->setWebTemplate($template);
}
/**
* Check for terms of service update.

2
src/danog/MadelineProto/SecretChats/AuthKeyHandler.php
View File

@ -347,7 +347,7 @@ trait AuthKeyHandler
if (isset($this->temp_requested_secret_chats[$chat])) {
unset($this->temp_requested_secret_chats[$chat]);
}
try {
yield $this->methodCallAsyncRead('messages.discardEncryption', ['chat_id' => $chat], ['datacenter' => $this->datacenter->curdc]);

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

@ -66,6 +66,10 @@ class WsStream implements RawStreamInterface, ProxyStreamInterface
*/
public function connectGenerator(ConnectionContext $ctx, string $header = ''): \Generator
{
if (!\class_exists(Connector::class)) {
throw new \danog\MadelineProto\Exception('Please install amphp/websocket-client by running "composer require amphp/websocket-client:dev-master"');
}
$this->dc = $ctx->getIntDc();
$handshake = new Handshake(\str_replace('tcp://', $ctx->isSecure() ? 'wss://' : 'ws://', $ctx->getStringUri()));

19
src/danog/MadelineProto/TL/Conversion/BotAPIFiles.php
View File

@ -19,7 +19,6 @@
namespace danog\MadelineProto\TL\Conversion;
use danog\MadelineProto\Magic;
use danog\MadelineProto\MTProtoTools\PeerHandler;
use danog\MadelineProto\Tools;
use tgseclib\Math\BigInteger;
@ -79,12 +78,12 @@ trait BotAPIFiles
break;
case 1:
$deserialized['file_type'] = Tools::unpackSignedInt(\stream_get_contents($file_id, 4));
$deserialized['thumbnail_type'] = chr(Tools::unpackSignedInt(\stream_get_contents($file_id, 4)));
$deserialized['thumbnail_type'] = \chr(Tools::unpackSignedInt(\stream_get_contents($file_id, 4)));
break;
case 2:
case 3:
$deserialized['photo_size'] = $deserialized['photosize_source'] === 2 ? 'photo_small' : 'photo_big';
$deserialized['dialog_id'] = (string) new BigInteger(strrev(\stream_get_contents($file_id, 8)), -256);
$deserialized['dialog_id'] = (string) new BigInteger(\strrev(\stream_get_contents($file_id, 8)), -256);
$deserialized['dialog_access_hash'] = \stream_get_contents($file_id, 8);
break;
case 4:
@ -115,8 +114,8 @@ trait BotAPIFiles
return $res;
}
$res['User'] = [
'_' => 'user',
'id' => $deserialized['dialog_id'],
'_' => 'user',
'id' => $deserialized['dialog_id'],
'access_hash' => $deserialized['dialog_access_hash'],
'photo' => [
'_' => 'userProfilePhoto',
@ -159,15 +158,15 @@ trait BotAPIFiles
$constructor['id'] = $deserialized['id'];
$constructor['access_hash'] = $deserialized['access_hash'];
unset($deserialized['id'], $deserialized['access_hash']);
$deserialized['_'] = $deserialized['secret'] ? 'fileLocation' : 'fileLocationToBeDeprecated';
$constructor['sizes'][0] = ['_' => 'photoSize', 'type' => '', 'location' => $deserialized];
$res['MessageMedia'] = ['_' => 'messageMediaPhoto', 'photo' => $constructor, 'caption' => ''];
return $res;
}
$res['MessageMedia'] = [
'_' => 'photo',
'_' => 'photo',
'id' => $deserialized['id'],
'access_hash' => $deserialized['access_hash'],
'sizes' => [
@ -180,7 +179,7 @@ trait BotAPIFiles
'volume_id' => $deserialized['local_id'],
]
]
],
],
'dc_id' => $deserialized['dc_id']
];
return $res;
@ -224,7 +223,7 @@ trait BotAPIFiles
unset($deserialized['_']);
$constructor = \array_merge($deserialized, ['_' => 'document', 'mime_type' => '', 'attributes' => [['_' => 'documentAttributeVideo', 'round_message' => true]]]);
$res['MessageMedia'] = ['_' => 'messageMediaDocument', 'document' => $constructor, 'caption' => ''];
return $res;
default:
throw new Exception(\sprintf(\danog\MadelineProto\Lang::$current_lang['file_type_invalid'], $type));

12
src/danog/MadelineProto/TON/InternalDoc.php
View File

@ -883,9 +883,9 @@ class InternalDoc extends APIFactory
*
* @return void
*/
public function logger($param, int $level = \danog\MadelineProto\Logger::NOTICE, string $file = '', array $extra = []): void
public function logger($param, int $level = \danog\MadelineProto\Logger::NOTICE, string $file = ''): void
{
$this->API->logger($param, $level, $file, $extra);
$this->API->logger($param, $level, $file);
}
/**
* Call lite method.
@ -919,17 +919,17 @@ class InternalDoc extends APIFactory
*
* @return array
*/
public function botAPItoMTProto(array $parameters, array $extra = []): array
public function botAPItoMTProto(array $parameters): array
{
return $this->API->botAPItoMTProto($parameters, $extra);
return $this->API->botAPItoMTProto($parameters);
}
/**
* Get TL method namespaces.
*
* @return array
*/
public function getMethodNamespaces(array $extra = []): array
public function getMethodNamespaces(): array
{
return $this->API->getMethodNamespaces($extra);
return $this->API->getMethodNamespaces();
}
}

1
tests/makephar.sh
View File

@ -22,6 +22,7 @@ echo '{
"minimum-stability":"dev",
"require": {
"danog/madelineproto": "dev-master",
"amphp/websocket-client": "dev-master as 1.0.0-rc2",
"amphp/dns": "dev-master#eb0b0a2 as v1"
},
"repositories": [

8
tools/phar.php
View File

@ -83,11 +83,11 @@ function ___install_madeline()
if ($phar) {
$extractVersions = static function () {
if (!file_exists('phar://madeline.phar/vendor/composer/installed.json')) {
return array();
if (!\file_exists('phar://madeline.phar/vendor/composer/installed.json')) {
return [];
}
$composer = \json_decode(\file_get_contents('phar://madeline.phar/vendor/composer/installed.json'), true);
$packages = array();
$packages = [];
foreach ($composer as $dep) {
$packages[$dep['name']] = $dep['version_normalized'];
}
@ -100,7 +100,7 @@ function ___install_madeline()
\file_put_contents('madeline.phar.version', $release);
$current = $extractVersions();
$postData = array('downloads' => array());
$postData = ['downloads' => []];
foreach ($current as $name => $version) {
if (isset($previous[$name]) && $previous[$name] === $version) {
continue;