Clear database on logout

Author: danog

src/APIWrapper.php

@@ -98,19 +98,21 @@ public function getIpcPath(): string
     /**
      * Serialize session.
      */
-    public function serialize(): bool
+    public function serialize(): void
     {
         if ($this->API === null) {
-            return false;
+            return;
         }
         if ($this->API instanceof Client) {
-            return false;
+            return;
         }
         $this->API->waitForInit();
         $API = $this->API;
 
         if ($API->getAuthorization() === API::LOGGED_OUT) {
-            return false;
+            $API->deleteSession();
+            $this->session->delete();
+            return;
         }
 
         $this->session->serialize(
@@ -123,7 +125,6 @@ public function serialize(): bool
         if (!Magic::$suspendPeriodicLogging) {
             Logger::log('Saved session!');
         }
-        return true;
     }
 
     /**

src/EventHandler.php

@@ -40,9 +40,11 @@
 use Revolt\EventLoop;
 use Webmozart\Assert\Assert;
 
+use function Amp\async;
 use function Amp\File\isDirectory;
 use function Amp\File\isFile;
 use function Amp\File\listFiles;
+use function Amp\Future\await;
 
 /**
  * Event handler.
@@ -112,6 +114,17 @@ final public function internalSaveDbProperties(): void
     {
         $this->privateInternalSaveDbProperties();
     }
+    /**
+     * @internal Do not use manually.
+     */
+    final public function internalClearDbProperties(): void
+    {
+        $f = [];
+        foreach ($this->properties as $property) {
+            $f []= async($property->clear(...));
+        }
+        await($f);
+    }
 
     private static bool $includingPlugins = false;
     /**

src/MTProto.php

@@ -427,6 +427,30 @@ public static function giveInstanceBySession(string $session): MTProto
         return self::$references[$session];
     }
 
+    /** @internal */
+    public function deleteSession(): void
+    {
+        $this->getDbAutoProperties();
+        /** @psalm-suppress TypeDoesNotContainType */
+        if (!isset($this->sessionDb) || $this->sessionDb instanceof MemoryArray) {
+            return;
+        }
+
+        $db = [async($this->sessionDb->clear(...))];
+        if ($this->referenceDatabase) {
+            $db []= async($this->referenceDatabase->clear(...));
+        }
+        $db []= async($this->minDatabase->clear(...));
+        $db []= async($this->peerDatabase->clearAll(...));
+        foreach ($this->properties as $property) {
+            $db []= async($property->clear(...));
+        }
+        if (isset($this->event_handler_instance)) {
+            $db []= async($this->event_handler_instance->internalClearDbProperties(...));
+        }
+        await($db);
+    }
+
     /**
      * Serialize session, returning object to serialize to db.
      *
@@ -497,9 +521,6 @@ public static function serializeAll(): void
         if (self::$references) {
             Logger::log('Prompting final serialization (SHUTDOWN)...');
             foreach (self::$references as $instance) {
-                if ($instance->loginState->getState()->state === API::LOGGED_OUT) {
-                    continue;
-                }
                 $instance->wrapper->serialize();
             }
             Logger::log('Done final serialization (SHUTDOWN)!');

src/MTProtoTools/MinDatabase.php

@@ -106,6 +106,10 @@ public function init(): void
             }
         });
     }
+    public function clear(): void
+    {
+        $this->db->clear();
+    }
     #[\Override]
     public function getMethodAfterResponseDeserializationCallbacks(): array
     {

src/MTProtoTools/PeerDatabase.php

@@ -152,6 +152,12 @@ public function init(): void
         });
     }
 
+    public function clearAll(): void
+    {
+        $this->db->clear();
+        $this->fullDb->clear();
+    }
+
     public function getFull(int $id): ?array
     {
         $result = $this->fullDb[$id];

src/MTProtoTools/ReferenceDatabase.php

@@ -119,6 +119,10 @@ public function init(): void
             EventLoop::queue($this->flush(...), $key);
         }
     }
+    public function clear(): void
+    {
+        $this->db->clear();
+    }
     private function flush(string $location): void
     {
         if (!isset($this->pendingDb[$location])) {

src/SessionPaths.php

@@ -131,12 +131,14 @@ public function delete(): void
     {
         if (file_exists($this->sessionDirectoryPath)) {
             foreach (scandir($this->sessionDirectoryPath) as $f) {
-                if ($f === '.' || $f === '..') {
+                if ($f === '.' || $f === '..' || !str_ends_with($f, '.php')) {
                     continue;
                 }
-                unlink($this->sessionDirectoryPath.DIRECTORY_SEPARATOR.$f);
+                try {
+                    unlink($this->sessionDirectoryPath.DIRECTORY_SEPARATOR.$f);
+                } catch (\Throwable) {
+                }
             }
-            rmdir($this->sessionDirectoryPath);
         }
     }
     /**