Improve performance of memory backend and misc fixes

src/danog/MadelineProto/Db/DbPropertiesTrait.php

@@ -2,20 +2,26 @@
 
 namespace danog\MadelineProto\Db;
 
-use danog\MadelineProto\Logger;
 use danog\MadelineProto\MTProto;
 
 trait DbPropertiesTrait
 {
+    /**
+     * Initialize database instance.
+     *
+     * @param MTProto $MadelineProto
+     * @param boolean $reset
+     * @return \Generator
+     */
     public function initDb(MTProto $MadelineProto, bool $reset = false): \Generator
     {
-        if (empty($this->dbProperies)) {
+        if (empty(static::$dbProperties)) {
-            throw new \LogicException(__CLASS__ . ' must have a $dbProperies');
+            throw new \LogicException(static::class.' must have $dbProperties');
         }
         $dbSettings = $MadelineProto->settings['db'];
         $prefix = static::getSessionId($MadelineProto);
 
-        foreach ($this->dbProperies as $property => $type) {
+        foreach (static::$dbProperties as $property => $type) {
             if ($reset) {
                 unset($this->{$property});
             } else {
@@ -32,8 +38,8 @@ trait DbPropertiesTrait
             $result .= \str_replace('0', '', \spl_object_hash($madelineProto));
         }
 
-        $className = \explode('\\', __CLASS__);
+        $className = \explode('\\', static::class);
-        $result .= '_' . \end($className);
+        $result .= '_'.\end($className);
         return $result;
     }
 }

src/danog/MadelineProto/Db/MemoryArray.php

@@ -4,6 +4,7 @@ namespace danog\MadelineProto\Db;
 
 use Amp\Producer;
 use Amp\Promise;
+use Amp\Success;
 use danog\MadelineProto\Logger;
 use function Amp\call;
 
@@ -35,27 +36,27 @@ class MemoryArray extends \ArrayIterator implements DbArray
 
     public function isset($key): Promise
     {
-        return call(fn () => parent::offsetExists($key));
+        return new Success(parent::offsetExists($key));
     }
 
     public function offsetGet($offset): Promise
     {
-        return call(fn () => parent::offsetExists($offset) ? parent::offsetGet($offset) : null);
+        return new Success(parent::offsetExists($offset) ? parent::offsetGet($offset) : null);
     }
 
     public function offsetUnset($offset): Promise
     {
-        return call(fn () => parent::offsetUnset($offset));
+        return new Success(parent::offsetUnset($offset));
     }
 
     public function count(): Promise
     {
-        return call(fn () => parent::count());
+        return new Success(parent::count());
     }
 
     public function getArrayCopy(): Promise
     {
-        return call(fn () => parent::getArrayCopy());
+        return new Success(parent::getArrayCopy());
     }
 
     public function getIterator(): Producer

src/danog/MadelineProto/Db/Mysql.php

@@ -6,14 +6,12 @@ use Amp\Mysql\ConnectionConfig;
 use Amp\Mysql\Pool;
 use Amp\Sql\Common\ConnectionPool;
 use danog\MadelineProto\Logger;
-use function Amp\call;
 use function Amp\Mysql\Pool;
-use function Amp\Promise\wait;
 
 class Mysql
 {
     /** @var Pool[] */
-    private static array $connections;
+    private static array $connections = [];
 
     /**
      * @param string $host
@@ -25,10 +23,11 @@ class Mysql
      * @param int $maxConnections
      * @param int $idleTimeout
      *
-     * @return Pool
      * @throws \Amp\Sql\ConnectionException
      * @throws \Amp\Sql\FailureException
      * @throws \Throwable
+     *
+     * @return \Generator<Pool>
      */
     public static function getConnection(
         string $host = '127.0.0.1',
@@ -38,14 +37,14 @@ class Mysql
         string $db = 'MadelineProto',
         int $maxConnections = ConnectionPool::DEFAULT_MAX_CONNECTIONS,
         int $idleTimeout = ConnectionPool::DEFAULT_IDLE_TIMEOUT
-    ): Pool {
+    ): \Generator {
         $dbKey = "$host:$port:$db";
         if (empty(static::$connections[$dbKey])) {
             $config = ConnectionConfig::fromString(
                 "host={$host} port={$port} user={$user} password={$password} db={$db}"
             );
 
-            static::createDb($config);
+            yield from static::createDb($config);
             static::$connections[$dbKey] = pool($config, $maxConnections, $idleTimeout);
         }
 
@@ -58,10 +57,11 @@ class Mysql
      * @throws \Amp\Sql\ConnectionException
      * @throws \Amp\Sql\FailureException
      * @throws \Throwable
+     *
+     * @return \Generator
      */
-    private static function createDb(ConnectionConfig $config)
+    private static function createDb(ConnectionConfig $config): \Generator
     {
-        wait(call(static function () use ($config) {
         try {
             $db = $config->getDatabase();
             $connection = pool($config->withDatabase(null));
@@ -74,6 +74,5 @@ class Mysql
         } catch (\Throwable $e) {
             Logger::log($e->getMessage(), Logger::ERROR);
         }
-        }));
     }
 }

src/danog/MadelineProto/Db/MysqlArray.php

@@ -6,6 +6,7 @@ use Amp\Mysql\Pool;
 use Amp\Producer;
 use Amp\Promise;
 use Amp\Sql\ResultSet;
+use Amp\Success;
 use danog\MadelineProto\Logger;
 use function Amp\call;
 
@@ -17,24 +18,9 @@ class MysqlArray implements DbArray
     private array $settings;
     private Pool $db;
 
-    public function __serialize(): array
+    public function __sleep(): array
     {
-        return [
+        return ['table', 'settings'];
-            'table' => $this->table,
-            'settings' => $this->settings
-        ];
-    }
-
-    public function __unserialize($data): void
-    {
-        foreach ($data as $property => $value) {
-            $this->{$property} = $value;
-        }
-        try {
-            $this->db = static::getDbConnection($this->settings);
-        } catch (\Throwable $e) {
-            Logger::log($e->getMessage(), Logger::ERROR);
-        }
     }
 
     /**
@@ -56,12 +42,12 @@ class MysqlArray implements DbArray
         }
 
         $instance->settings = $settings;
-        $instance->db = static::getDbConnection($settings);
         $instance->ttl = $settings['cache_ttl'] ?? $instance->ttl;
 
         $instance->startCacheCleanupLoop();
 
-        return call(static function () use ($instance, $value) {
+        return call(static function () use ($instance, $value, $settings) {
+            $instance->db = yield from static::getDbConnection($settings);
             yield from $instance->prepareTable();
 
             //Skip migrations if its same object
@@ -180,7 +166,7 @@ class MysqlArray implements DbArray
     public function offsetSet($index, $value): Promise
     {
         if ($this->getCache($index) === $value) {
-            return call(fn () =>null);
+            return new Success();
         }
 
         $this->setCache($index, $value);
@@ -286,7 +272,7 @@ class MysqlArray implements DbArray
         return null;
     }
 
-    public static function getDbConnection(array $settings): Pool
+    public static function getDbConnection(array $settings): \Generator
     {
         return Mysql::getConnection(
             $settings['host'],
@@ -355,9 +341,9 @@ class MysqlArray implements DbArray
 
             if (
                 !empty($params['index'])
-                && !mb_check_encoding($params['index'], 'UTF-8')
+                && !\mb_check_encoding($params['index'], 'UTF-8')
             ) {
-                $params['index'] = mb_convert_encoding($params['index'], 'UTF-8');
+                $params['index'] = \mb_convert_encoding($params['index'], 'UTF-8');
             }
 
             try {

src/danog/MadelineProto/Db/Postgres.php

@@ -6,14 +6,12 @@ use Amp\Postgres\ConnectionConfig;
 use Amp\Postgres\Pool;
 use Amp\Sql\Common\ConnectionPool;
 use danog\MadelineProto\Logger;
-use function Amp\call;
 use function Amp\Postgres\Pool;
-use function Amp\Promise\wait;
 
 class Postgres
 {
     /** @var Pool[] */
-    private static array $connections;
+    private static array $connections = [];
 
     /**
      * @param string $host
@@ -25,10 +23,11 @@ class Postgres
      * @param int $maxConnections
      * @param int $idleTimeout
      *
-     * @return Pool
      * @throws \Amp\Sql\ConnectionException
      * @throws \Amp\Sql\FailureException
      * @throws \Throwable
+     *
+     * @return \Generator<Pool>
      */
     public static function getConnection(
         string $host = '127.0.0.1',
@@ -38,14 +37,14 @@ class Postgres
         string $db = 'MadelineProto',
         int $maxConnections = ConnectionPool::DEFAULT_MAX_CONNECTIONS,
         int $idleTimeout = ConnectionPool::DEFAULT_IDLE_TIMEOUT
-    ): Pool {
+    ): \Generator {
         $dbKey = "$host:$port:$db";
         if (empty(static::$connections[$dbKey])) {
             $config = ConnectionConfig::fromString(
                 "host={$host} port={$port} user={$user} password={$password} db={$db}"
             );
 
-            static::createDb($config);
+            yield from static::createDb($config);
             static::$connections[$dbKey] = pool($config, $maxConnections, $idleTimeout);
         }
 
@@ -59,9 +58,8 @@ class Postgres
      * @throws \Amp\Sql\FailureException
      * @throws \Throwable
      */
-    private static function createDb(ConnectionConfig $config)
+    private static function createDb(ConnectionConfig $config): \Generator
     {
-        wait(call(static function () use ($config) {
         try {
             $db = $config->getDatabase();
             $user = $config->getUser();
@@ -96,6 +94,5 @@ class Postgres
         } catch (\Throwable $e) {
             Logger::log($e->getMessage(), Logger::ERROR);
         }
-        }));
     }
 }

src/danog/MadelineProto/Db/PostgresArray.php

@@ -57,7 +57,7 @@ class PostgresArray implements DbArray
         return $request;
     }
 
-    public static function getDbConnection(array $settings): Pool
+    public static function getDbConnection(array $settings): \Generator
     {
         return Postgres::getConnection(
             $settings['host'],
@@ -103,24 +103,9 @@ class PostgresArray implements DbArray
         ");
     }
 
-    public function __serialize(): array
+    public function __sleep()
     {
-        return [
+        return ['table', 'settings'];
-            'table' => $this->table,
-            'settings' => $this->settings
-        ];
-    }
-
-    public function __unserialize($data): void
-    {
-        foreach ($data as $property => $value) {
-            $this->{$property} = $value;
-        }
-        try {
-            $this->db = static::getDbConnection($this->settings);
-        } catch (\Throwable $e) {
-            Logger::log($e->getMessage(), Logger::ERROR);
-        }
     }
 
     /**
@@ -142,12 +127,13 @@ class PostgresArray implements DbArray
         }
 
         $instance->settings = $settings;
-        $instance->db = static::getDbConnection($settings);
         $instance->ttl = $settings['cache_ttl'] ?? $instance->ttl;
 
         $instance->startCacheCleanupLoop();
 
-        return call(static function () use ($instance, $value) {
+        return call(static function () use ($instance, $value, $settings) {
+            $instance->db = yield from static::getDbConnection($settings);
+
             yield from $instance->prepareTable();
 
             //Skip migrations if its same object
@@ -367,9 +353,9 @@ class PostgresArray implements DbArray
 
             if (
                 !empty($params['index'])
-                && !mb_check_encoding($params['index'], 'UTF-8')
+                && !\mb_check_encoding($params['index'], 'UTF-8')
             ) {
-                $params['index'] = mb_convert_encoding($params['index'], 'UTF-8');
+                $params['index'] = \mb_convert_encoding($params['index'], 'UTF-8');
             }
 
             try {

src/danog/MadelineProto/MTProto.php

@@ -417,7 +417,7 @@ class MTProto extends AsyncConstruct implements TLCallback
      * @see DbPropertiesFactory
      * @var array
      */
-    protected array $dbProperies = [
+    protected static array $dbProperties = [
         'chats' => 'array',
         'full_chats' => 'array',
         'channel_participants' => 'array',
@@ -569,14 +569,12 @@ class MTProto extends AsyncConstruct implements TLCallback
      */
     public function cleanup(): void
     {
-        /*
-        // :)
         $this->referenceDatabase = new ReferenceDatabase($this);
         $callbacks = [$this, $this->referenceDatabase];
         if (!($this->authorization['user']['bot'] ?? false)) {
             $callbacks[] = $this->minDatabase;
         }
-        $this->TL->updateCallbacks($callbacks);*/
+        $this->TL->updateCallbacks($callbacks);
     }
 
     private function fillUsernamesCache(): \Generator

src/danog/MadelineProto/MTProtoTools/MinDatabase.php

@@ -59,7 +59,7 @@ class MinDatabase implements TLCallback
      * @see DbPropertiesFactory
      * @var array
      */
-    protected array $dbProperies = [
+    protected static array $dbProperties = [
         'db' => 'array',
     ];
 

src/danog/MadelineProto/MTProtoTools/ReferenceDatabase.php

@@ -84,7 +84,7 @@ class ReferenceDatabase implements TLCallback
      * @see DbPropertiesFactory
      * @var array
      */
-    protected array $dbProperies = [
+    protected static array $dbProperties = [
         'db' => 'array',
     ];