Server loop stop fix

xtrime-ru · Jan 26, 2020 · 2e9f2c0 · 2e9f2c0
1 parent abe9653
commit 2e9f2c0
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 15 deletions.
diff --git a/src/Client.php b/src/Client.php
@@ -86,15 +86,17 @@ public function addSession(string $session, bool $startSession = false)
         $instance = new MadelineProto\API($file, $settings);
         $instance->async(true);
         $this->instances[$session] = $instance;
-        if($startSession === true) {
+
+        $isLoggedIn = ($instance->API->authorized ?? MTProto::NOT_LOGGED_IN) === MTProto::LOGGED_IN;
+        if($isLoggedIn || $startSession === true) {
             $instance->loop(function() use($instance) {
                 yield $instance->start();
             });
         }
-        if (($instance->API->authorized ?? MTProto::NOT_LOGGED_IN) === MTProto::LOGGED_IN) {
+        if ($isLoggedIn) {
             $instance->setEventHandler(EventHandler::class);
             Loop::defer(static function() use($instance) {
-                $instance->loop(['async' => true]);
+                $instance->loop();
             });
         }
     }
@@ -106,7 +108,7 @@ public function removeSession($session)
         }
 
         $this->instances[$session]->stop();
-        unset($this->instances[$session]);
+        unset($this->instances[$session], EventHandler::$instances[$session]);
     }
 
     /**

diff --git a/src/EventObservers/EventHandler.php b/src/EventObservers/EventHandler.php
@@ -11,17 +11,22 @@ class EventHandler extends \danog\MadelineProto\EventHandler
     /** @var callable[] */
     public static array $eventListeners = [];
     private string $sessionName;
+    public static array $instances = [];
 
     public function __construct(API $MadelineProto)
     {
-        parent::__construct($MadelineProto);
         $this->sessionName = Client::getSessionName($MadelineProto->session);
-        Logger::getInstance()->warning("Event observer CONSTRUCTED: {$this->sessionName}");
+        if (!isset(static::$instances[$this->sessionName])) {
+            static::$instances[$this->sessionName] = true;
+            parent::__construct($MadelineProto);
+            Logger::getInstance()->warning("Event observer CONSTRUCTED: {$this->sessionName}");
+        }
     }
 
     public function __destruct()
     {
-        Logger::getInstance()->warning("Event observer DESTRUCTED {$this->sessionName}");
+        unset(static::$instances[$this->sessionName]);
+        Logger::getInstance()->warning("Event observer DESTRUCTED: {$this->sessionName}");
     }
 
     public static function addEventListener($clientId, callable $callback)

diff --git a/src/MadelineProtoExtensions/SystemApiExtensions.php b/src/MadelineProtoExtensions/SystemApiExtensions.php
@@ -2,10 +2,9 @@
 
 namespace TelegramApiServer\MadelineProtoExtensions;
 
-use Amp\Loop;
+use danog\MadelineProto;
 use TelegramApiServer\Client;
 use function Amp\call;
-use \danog\MadelineProto;
 
 class SystemApiExtensions
 {
@@ -22,8 +21,7 @@ public function addSession(string $session)
         return $this->getSessionList();
     }
 
-
-    public function removeSession(string $session):array
+    public function removeSession(string $session): array
     {
         $this->client->removeSession($session);
         return $this->getSessionList();
@@ -62,7 +60,10 @@ public function getSessionList(): array
             ];
         }
 
-        return $sessions;
+        return [
+            'sessions' => $sessions,
+            'memory' => $this->bytesToHuman(memory_get_usage(true)),
+        ];
     }
 
     public function removeSessionFile($session)
@@ -75,4 +76,13 @@ public function removeSessionFile($session)
             }
         });
     }
+
+    private function bytesToHuman($bytes)
+    {
+        $units = ['B', 'KB', 'MB', 'GB', 'TB', 'PB'];
+        for ($i = 0; $bytes > 1024; $i++) {
+            $bytes /= 1024;
+        }
+        return round($bytes, 2) . ' ' . $units[$i];
+    }
 }
diff --git a/src/Server/Server.php b/src/Server/Server.php
@@ -3,6 +3,9 @@
 namespace TelegramApiServer\Server;
 
 use Amp;
+use Amp\Loop;
+use danog\MadelineProto\API;
+use danog\MadelineProto\Tools;
 use TelegramApiServer\Client;
 use TelegramApiServer\Config;
 use TelegramApiServer\Logger;
@@ -18,7 +21,7 @@ class Server
      */
     public function __construct(Client $client, array $options, ?array $sessionFiles)
     {
-        Amp\Loop::run(function () use ($client, $options, $sessionFiles) {
+        Amp\Loop::defer(function () use ($client, $options, $sessionFiles) {
             $server = new Amp\Http\Server\Server(
                 $this->getServerAddresses(static::getConfig($options)),
                 (new Router($client))->getRouter(),
@@ -32,8 +35,12 @@ public function __construct(Client $client, array $options, ?array $sessionFiles
             yield $server->start();
 
             $this->registerShutdown($server);
-
         });
+
+        while (true) {
+            Amp\Loop::run();
+        }
+
     }
 
     private static function getServerAddresses(array $config): array
@@ -53,9 +60,9 @@ private static function getServerAddresses(array $config): array
      */
     private static function registerShutdown(Amp\Http\Server\Server $server)
     {
-
         if (defined('SIGINT')) {
             Amp\Loop::onSignal(SIGINT, static function (string $watcherId) use ($server) {
+                Logger::getInstance()->emergency('Got SIGINT');
                 Amp\Loop::cancel($watcherId);
                 yield $server->stop();
             });