Fix some other issues

Author: danog

src/API.php

@@ -51,7 +51,7 @@ final class API extends AbstractAPI
      *
      * @var string
      */
-    public const RELEASE = '8.4.15';
+    public const RELEASE = '8.4.16';
     /**
      * We're not logged in.
      *

src/MTProto/MTProtoOutgoingMessage.php

@@ -189,12 +189,14 @@ public function trySend(): void
     /**
      * Signal that the message was sent.
      */
-    public function sent(): void
+    public function sent(bool $pending = true): void
     {
-        if ($this->unencrypted) {
-            $this->connection->unencrypted_new_outgoing[$this->getMsgId()] = $this;
-        } else {
-            $this->connection->new_outgoing[$this->getMsgId()] = $this;
+        if ($pending) {
+            if ($this->unencrypted) {
+                $this->connection->unencrypted_new_outgoing[$this->getMsgId()] = $this;
+            } else {
+                $this->connection->new_outgoing[$this->getMsgId()] = $this;
+            }
         }
         if ($this->sent === null && $this->isMethod) {
             $this->connection->inFlightGauge?->inc([
@@ -206,10 +208,13 @@ public function sent(): void
             $this->unlink();
         }
         $this->sent = hrtime(true);
-        if ($this->contentRelated) {
+        if ($this->contentRelated && $pending) {
+            $self = \WeakReference::create($this);
             $this->checkTimer = EventLoop::delay(
                 $this->connection->API->getSettings()->getConnection()->getTimeout(),
-                $this->check(...)
+                static function () use ($self): void {
+                    $self->get()?->check();
+                }
             );
         }
         if (isset($this->sendDeferred)) {
@@ -234,6 +239,10 @@ public function unlink(): void
             }
             $this->connection->pendingOutgoingGauge?->dec();
         }
+        if ($this->checkTimer !== null) {
+            EventLoop::cancel($this->checkTimer);
+            $this->checkTimer = null;
+        }
     }
     private function check(): void
     {
@@ -243,9 +252,12 @@ private function check(): void
         $shared = $this->connection->getShared();
         $settings = $shared->getSettings();
         $timeout = $settings->getTimeout();
+        $self = \WeakReference::create($this);
         $this->checkTimer = EventLoop::delay(
             $timeout,
-            $this->check(...)
+            static function () use ($self): void {
+                $self->get()?->check();
+            }
         );
 
         \assert($this->msgId !== null);
@@ -270,9 +282,7 @@ public function reply($result): void
             // It can happen, no big deal
             return;
         }
-        if (!($this->state & self::STATE_SENT)) {
-            $this->sent();
-        }
+        $this->sent(false);
         if ($this->checkTimer !== null) {
             EventLoop::cancel($this->checkTimer);
             $this->checkTimer = null;

src/MTProtoSession/CallHandler.php

@@ -77,6 +77,7 @@ public function methodRecall(MTProtoOutgoingMessage $request, ?int $forceDatacen
             $request->cancellation?->subscribe(static fn () => EventLoop::cancel($id));
             $defer = $d->getFuture();
         }
+        $request->unlink();
         if ($defer) {
             $defer->finally(
                 fn () => $this->methodRecall($request, $forceDatacenter)
@@ -88,7 +89,6 @@ public function methodRecall(MTProtoOutgoingMessage $request, ?int $forceDatacen
             /** @var MTProtoOutgoingMessage */
             $request->setMsgId(null);
             $request->setSeqNo(null);
-            $request->unlink();
         }
         if ($datacenter === $this->datacenter) {
             EventLoop::queue($this->sendMessage(...), $request);