Switch to danog/async-orm

composer.json

@@ -59,7 +59,8 @@
         "bacon/bacon-qr-code": "^2.0",
         "nikic/php-parser": "^5",
         "revolt/event-loop": "^1.0.5",
-        "danog/async-orm": "^1.0"
+        "danog/async-orm": "^1.0",
+        "symfony/thanks": "^1.3"
     },
     "require-dev": {
         "ext-ctype": "*",
@@ -140,7 +141,8 @@
         "allow-plugins": {
             "bamarni/composer-bin-plugin": true,
             "phabel/phabel": true,
-            "dealerdirect/phpcodesniffer-composer-installer": true
+            "dealerdirect/phpcodesniffer-composer-installer": true,
+            "symfony/thanks": true
         }
     }
 }

psalm.xml

@@ -18,6 +18,7 @@
     <projectFiles>
         <directory name="src" />
         <ignoreFiles>
+            <directory name="vendor" />
             <file name="src/TL/TLParser.php" />
             <file name="src/TL/SecretTLParser.php" />
         </ignoreFiles>

src/EventHandler.php

@@ -50,7 +50,7 @@
 abstract class EventHandler extends AbstractAPI
 {
     use DbAutoProperties {
-        DbAutoProperties::initDb as private internalInitDb;
+        DbAutoProperties::initDbProperties as private internalInitDb;
     }
 
     private static bool $includingPlugins = false;
@@ -128,10 +128,12 @@ final public function internalStart(APIWrapper $MadelineProto, array $pluginsPre
             $this->wrapper = $MadelineProto;
             $this->exportNamespaces();
 
-            \assert($this->wrapper instanceof MTProto);
+            if (isset(static::$dbProperties)) {
+                throw new AssertionError("Please switch to using OrmMappedArray annotations for mapped ORM properties!");
+            }
             $this->internalInitDb(
-                $this->wrapper->getDbSettings(),
-                $this->wrapper->getDbPrefix(),
+                $this->wrapper->getAPI()->getDbSettings(),
+                $this->wrapper->getAPI()->getDbPrefix(),
             );
 
             if ($main) {

src/MTProto.php

@@ -409,7 +409,7 @@ public function serializeSession(object $data)
             return $data;
         }
         $this->session['data'] = $data;
-        return $this->session;
+        return $this->getDbPrefix().'session';
     }
 
     /**
@@ -563,12 +563,12 @@ public function getDbPrefix(): string
             $this->tmpDbPrefix ??= 'tmp_'.hash('xxh3', $this->getSessionName());
             $prefix = $this->tmpDbPrefix;
         }
-        return (string) $prefix;
+        return ((string) $prefix).'_';
     }
     /** @internal */
     public function getDbSettings(): OrmSettings
     {
-
+        return $this->settings->getDb()->getOrmSettings();
     }
 
     /**
@@ -957,6 +957,8 @@ public function wakeup(SettingsAbstract $settings, APIWrapper $wrapper): void
         $this->initPromise = $deferred->getFuture();
 
         try {
+            $this->updateSettings($settings);
+
             // Setup logger
             $this->setupLogger();
             if (!$this->ipcServer) {

src/MTProtoTools/ReferenceDatabase.php

@@ -44,10 +44,6 @@ final class ReferenceDatabase implements TLCallback
 {
     use DbAutoProperties;
 
-    protected function getDbPrefix(): string
-    {
-        return $this->API->getDbPrefix();
-    }
     // Reference from a document
     public const DOCUMENT_LOCATION = 0;
     // Reference from a photo

src/MTProtoTools/UpdateHandler.php

@@ -30,6 +30,8 @@
 use AssertionError;
 use danog\AsyncOrm\Annotations\OrmMappedArray;
 use danog\AsyncOrm\DbArray;
+use danog\AsyncOrm\KeyType;
+use danog\AsyncOrm\ValueType;
 use danog\MadelineProto\API;
 use danog\MadelineProto\EventHandler\AbstractMessage;
 use danog\MadelineProto\EventHandler\BotCommands;
@@ -142,7 +144,7 @@ trait UpdateHandler
     /** @deprecated */
     private CombinedUpdatesState $channels_state;
     private CombinedUpdatesState $updateState;
-    #[OrmMappedArray(KeyType::INT, ValueType::BEST)]
+    #[OrmMappedArray(KeyType::INT, ValueType::SCALAR)]
     private DbArray $getUpdatesQueue;
     private int $getUpdatesQueueKey = 0;
     private SplQueue $updateQueue;

src/SecretChats/SecretChatController.php

@@ -26,7 +26,9 @@
 use AssertionError;
 use danog\AsyncOrm\Annotations\OrmMappedArray;
 use danog\AsyncOrm\DbArray;
-use danog\AsyncOrm\DbPropertiesTrait;
+use danog\AsyncOrm\DbAutoProperties;
+use danog\AsyncOrm\KeyType;
+use danog\AsyncOrm\ValueType;
 use danog\MadelineProto\Logger;
 use danog\MadelineProto\Loop\Secret\SecretFeedLoop;
 use danog\MadelineProto\Loop\Update\UpdateLoop;
@@ -49,27 +51,22 @@
  */
 final class SecretChatController implements Stringable
 {
-    use DbPropertiesTrait;
-
-    protected function getDbPrefix(): string
-    {
-        return $this->API->getDbPrefix().'_'.$this->id;
-    }
+    use DbAutoProperties;
 
     /**
      * @var DbArray<int, array>
      */
-    #[OrmMappedArray(KeyType::INT, ValueType::BEST)]
+    #[OrmMappedArray(KeyType::INT, ValueType::SCALAR)]
     private DbArray $incoming;
     /**
      * @var DbArray<int, array>
      */
-    #[OrmMappedArray(KeyType::INT, ValueType::BEST)]
+    #[OrmMappedArray(KeyType::INT, ValueType::SCALAR)]
     private DbArray $outgoing;
     /**
      * @var DbArray<int, list{int, bool}> Seq, outgoing
      */
-    #[OrmMappedArray(KeyType::INT, ValueType::BEST)]
+    #[OrmMappedArray(KeyType::INT, ValueType::SCALAR)]
     private DbArray $randomIdMap;
     private int $in_seq_no = 0;
     private int $out_seq_no = 0;
@@ -143,7 +140,10 @@ public function feed(array $update): void
     }
     public function init(): void
     {
-        $this->initDb($this->API);
+        $this->initDbProperties(
+            $this->API->getDbSettings(),
+            $this->API->getDbPrefix().'_'.$this->id.'_'
+        );
     }
 
     public function startFeedLoop(): void

src/Serialization.php

@@ -27,10 +27,12 @@
 use Amp\Ipc\Sync\ChannelledSocket;
 use Amp\TimeoutException;
 use AssertionError;
+use danog\AsyncOrm\DbArrayBuilder;
 use danog\AsyncOrm\Driver\DriverArray;
+use danog\AsyncOrm\KeyType;
+use danog\AsyncOrm\ValueType;
 use danog\MadelineProto\Ipc\Server;
 use danog\MadelineProto\Settings\Database\DriverDatabaseAbstract;
-use danog\MadelineProto\Settings\DatabaseAbstract;
 use Revolt\EventLoop;
 use Throwable;
 
@@ -218,40 +220,31 @@ public static function unserialize(SessionPaths $session, SettingsAbstract $sett
         } else {
             $unserialized = null;
         }
-        if ($unserialized instanceof DriverArray || !$exists) {
-            \assert($unserialized instanceof DriverArray || $unserialized === null);
+        if ($unserialized instanceof DriverArray || \is_string($unserialized) || !$exists) {
             if ($settings instanceof Settings) {
                 $settings = $settings->getDb();
             }
-            if ($settings instanceof DatabaseAbstract) {
-                if (!$exists
-                    && $settings instanceof DriverDatabaseAbstract
-                    && $prefix = $settings->getEphemeralFilesystemPrefix()
-                ) {
-                    $tableName = "{$prefix}_MTProto_session";
-                } else {
-                    $tableName = $unserialized
-                        ? $unserialized->__toString()
-                        : null;
-                }
-                if ($tableName !== null) {
-                    Logger::log('Extracting session from database...');
-                    $unserialized = DbPropertiesFactory::get(
-                        $settings,
-                        $tableName,
-                        ['enableCache' => false],
-                        $unserialized,
-                    )['data'];
-                }
-                if (!$unserialized && $exists) {
-                    throw new Exception('Could not extract session from database!');
-                }
-            } elseif ($unserialized !== null) {
-                $unserialized->initStartup();
-                $unserialized = $unserialized['data'];
-                if (!$unserialized) {
-                    throw new Exception('Could not extract session from database!');
-                }
+            if ($settings instanceof DriverDatabaseAbstract
+                && $prefix = $settings->getEphemeralFilesystemPrefix()
+            ) {
+                $tableName = "{$prefix}_MTProto_session";
+            } elseif ($unserialized instanceof DriverArray) {
+                $tableName = ((array) $unserialized)["\0*\0table"];
+            } else {
+                $tableName = $unserialized;
+            }
+            $unserialized = null;
+            if ($tableName !== null && $settings instanceof DriverDatabaseAbstract) {
+                Logger::log('Extracting session from database...');
+                $unserialized = (new DbArrayBuilder(
+                    $tableName,
+                    $settings->getOrmSettings(),
+                    KeyType::STRING,
+                    ValueType::SCALAR,
+                ))->build()->get('data');
+            }
+            if (!$unserialized && $exists) {
+                throw new Exception('Could not extract session from database!');
             }
         }
         \assert($unserialized instanceof APIWrapper || $unserialized === null);

src/SessionPaths.php

@@ -142,7 +142,7 @@ public function delete(): void
     /**
      * Serialize object to file.
      */
-    public function serialize(object $object, string $path): void
+    public function serialize(object|string $object, string $path): void
     {
         Logger::log("Waiting for exclusive lock of $path.lock...");
         $unlock = Tools::flock("$path.lock", LOCK_EX, 0.1);
@@ -173,7 +173,7 @@ public function serialize(object $object, string $path): void
      *
      * @param string $path Object path, defaults to session path
      */
-    public function unserialize(string $path = ''): ?object
+    public function unserialize(string $path = ''): object|string|null
     {
         $path = $path ?: $this->sessionPath;
 

src/Settings/Database/DriverDatabaseAbstract.php

@@ -25,6 +25,8 @@ abstract class DriverDatabaseAbstract extends DatabaseAbstract
 {
     /**
      * For how long to keep records in memory after last read, for cached backends.
+     *
+     * @var int<0, max>
      */
     protected int $cacheTtl = 5 * 60;
     /**

src/Settings/Database/Memory.php

@@ -16,16 +16,17 @@
 
 namespace danog\MadelineProto\Settings\Database;
 
-use danog\AsyncOrm\MemoryArray;
+use danog\AsyncOrm\Settings;
+use danog\AsyncOrm\Settings\MemorySettings;
 use danog\MadelineProto\Settings\DatabaseAbstract;
 
 /**
  * Memory backend settings.
  */
 final class Memory extends DatabaseAbstract
 {
-    public function getDriverClass(): string
+    public function getOrmSettings(): Settings
     {
-        return MemoryArray::class;
+        return new MemorySettings;
     }
 }

src/Settings/Database/Mysql.php

@@ -16,8 +16,12 @@
 
 namespace danog\MadelineProto\Settings\Database;
 
+use Amp\Mysql\MysqlConfig;
 use AssertionError;
-use danog\AsyncOrm\MysqlArray;
+use danog\AsyncOrm\Serializer\Igbinary;
+use danog\AsyncOrm\Serializer\Native;
+use danog\AsyncOrm\Settings;
+use danog\AsyncOrm\Settings\MysqlSettings;
 
 /**
  * MySQL backend settings.
@@ -66,8 +70,36 @@ public function getOptimizeIfWastedGtMb(): ?int
     {
         return $this->optimizeIfWastedGtMb;
     }
-    public function getDriverClass(): string
+
+    public function getOrmSettings(): Settings
     {
-        return MysqlArray::class;
+        $host = str_replace(['tcp://', 'unix://'], '', $this->getUri());
+        if ($host[0] === '/') {
+            $port = 0;
+        } else {
+            $host = explode(':', $host, 2);
+            if (\count($host) === 2) {
+                [$host, $port] = $host;
+            } else {
+                $host = $host[0];
+                $port = MysqlConfig::DEFAULT_PORT;
+            }
+        }
+        $config = new MysqlConfig(
+            host: $host,
+            port: (int) $port,
+            user: $this->getUsername(),
+            password: $this->getPassword(),
+            database: $this->getDatabase()
+        );
+        return new MysqlSettings(
+            $config,
+            match ($this->serializer) {
+                SerializerType::IGBINARY => new Igbinary,
+                SerializerType::SERIALIZE => new Native,
+                null => null
+            },
+            $this->cacheTtl,
+        );
     }
 }

src/Settings/Database/Postgres.php

@@ -16,15 +16,46 @@
 
 namespace danog\MadelineProto\Settings\Database;
 
-use danog\AsyncOrm\PostgresArrayBytea;
+use Amp\Postgres\PostgresConfig;
+use danog\AsyncOrm\Serializer\Igbinary;
+use danog\AsyncOrm\Serializer\Native;
+use danog\AsyncOrm\Settings;
+use danog\AsyncOrm\Settings\PostgresSettings;
 
 /**
  * Postgres backend settings.
  */
 final class Postgres extends SqlAbstract
 {
-    public function getDriverClass(): string
+    public function getOrmSettings(): Settings
     {
-        return PostgresArrayBytea::class;
+        $host = str_replace(['tcp://', 'unix://'], '', $this->getUri());
+        if ($host[0] === '/') {
+            $port = 0;
+        } else {
+            $host = explode(':', $host, 2);
+            if (\count($host) === 2) {
+                [$host, $port] = $host;
+            } else {
+                $host = $host[0];
+                $port = PostgresConfig::DEFAULT_PORT;
+            }
+        }
+        $config = new PostgresConfig(
+            host: $host,
+            port: (int) $port,
+            user: $this->getUsername(),
+            password: $this->getPassword(),
+            database: $this->getDatabase()
+        );
+        return new PostgresSettings(
+            $config,
+            match ($this->serializer) {
+                SerializerType::IGBINARY => new Igbinary,
+                SerializerType::SERIALIZE => new Native,
+                null => null
+            },
+            $this->cacheTtl,
+        );
     }
 }