Improve and fix window event listener

Author: SerafimArts

src/Api/LoadedApplicationExtension.php

@@ -5,10 +5,12 @@
 namespace Boson\Api;
 
 use Boson\Application;
+use Boson\Component\Saucer\SaucerInterface;
 use Boson\Contracts\Id\IdentifiableInterface;
 use Boson\Dispatcher\EventListener;
 use Boson\Extension\LoadedExtension;
-use Boson\Internal\StructPointerId;
+use Boson\Poller\PollerInterface;
+use Boson\Shared\StructPointerId;
 use FFI\CData;
 
 /**
@@ -32,6 +34,20 @@ abstract class LoadedApplicationExtension extends LoadedExtension
         get => $this->id->ptr;
     }
 
+    /**
+     * Gets Saucer API reference
+     */
+    protected SaucerInterface $saucer {
+        get => $this->saucer ??= $this->app->saucer;
+    }
+
+    /**
+     * Gets application poller API reference
+     */
+    protected PollerInterface $loop {
+        get => $this->loop ??= $this->app->poller;
+    }
+
     public function __construct(
         protected readonly Application $app,
         EventListener $listener,

src/Application.php

@@ -16,10 +16,10 @@
 use Boson\Event\ApplicationStopped;
 use Boson\Event\ApplicationStopping;
 use Boson\Exception\ApplicationException;
-use Boson\Exception\NoDefaultWindowException;
+use Boson\Exception\WindowDereferenceException;
 use Boson\Extension\Exception\ExtensionNotFoundException;
 use Boson\Extension\Registry;
-use Boson\Internal\Poller\SaucerPoller;
+use Boson\Internal\Poller\ApplicationOrderedPoller;
 use Boson\Poller\PollerInterface;
 use Boson\Shared\Marker\BlockingOperation;
 use Boson\Shared\Marker\RequiresDealloc;
@@ -85,11 +85,11 @@ class Application implements
         /**
          * Gets the default window of the application.
          *
-         * @throws NoDefaultWindowException in case the default window was
+         * @throws WindowDereferenceException in case the default window was
          *         already closed and removed earlier
          */
         get => $this->windows->default
-            ?? throw NoDefaultWindowException::becauseNoDefaultWindow();
+            ?? throw WindowDereferenceException::becauseNoDefaultWindow();
     }
 
     /**
@@ -102,7 +102,7 @@ class Application implements
         /**
          * Gets the webview manager of the default application window.
          *
-         * @throws NoDefaultWindowException in case the default window was
+         * @throws WindowDereferenceException in case the default window was
          *         already closed and removed earlier
          */
         get => $this->window->webviews;
@@ -118,7 +118,7 @@ class Application implements
         /**
          * Gets the WebView instance associated with the default window.
          *
-         * @throws NoDefaultWindowException in case the default window was
+         * @throws WindowDereferenceException in case the default window was
          *         already closed and removed earlier
          */
         get => $this->window->webview;
@@ -187,24 +187,6 @@ public function __construct(
          */
         public readonly ApplicationCreateInfo $info = new ApplicationCreateInfo(),
         ?EventDispatcherInterface $dispatcher = null,
-        /**
-         * @var array<array-key, mixed>
-         *
-         * @deprecated doesn't affect anything anymore and will be removed in future versions
-         */
-        private readonly array $bootHandlers = [],
-        /**
-         * @var array<array-key, mixed>
-         *
-         * @deprecated doesn't affect anything anymore and will be removed in future versions
-         */
-        private readonly array $quitHandlers = [],
-        /**
-         * @var array<array-key, mixed>
-         *
-         * @deprecated doesn't affect anything anymore and will be removed in future versions
-         */
-        private readonly array $deferRunners = [],
     ) {
         // Initialization Application's fields and properties
         $this->isDebug = $this->createIsDebugParameter($info->debug);
@@ -217,8 +199,8 @@ public function __construct(
         $this->poller = $this->createApplicationPoller($this->saucer);
 
         // Initialization of Application's API
-        $this->extensions = new Registry($this, $this->listener, $info->extensions);
-        foreach ($this->extensions->boot() as $property => $extension) {
+        $this->extensions = new Registry($this->listener, $info->extensions);
+        foreach ($this->extensions->boot($this) as $property => $extension) {
             // Direct access to dynamic property is 5+ times
             // faster than magic `__get` call.
             $this->__set($property, $extension);
@@ -252,7 +234,7 @@ public function has(string $id): bool
      */
     protected function createApplicationPoller(SaucerInterface $saucer): PollerInterface
     {
-        $poller = new SaucerPoller($this->id, $saucer);
+        $poller = new ApplicationOrderedPoller($this->id, $saucer);
 
         $poller->defer(function (): void {
             $this->isRunning = true;
@@ -499,8 +481,6 @@ public function quit(): void
         }
 
         $this->isRunning = false;
-        $this->saucer->saucer_application_quit($this->id->ptr);
-
         $this->listener->dispatch(new ApplicationStopped($this));
     }
 
@@ -514,10 +494,11 @@ public function __destruct()
     {
         $this->quit();
 
-        $this->windows->destroy();
         $this->extensions->destroy();
+        $this->windows->destroy();
+
+        $this->listener->removeAllEventListeners();
 
-        var_dump(__METHOD__);
         $this->saucer->saucer_application_quit($this->id->ptr);
     }
 

src/ApplicationId.php

@@ -5,7 +5,7 @@
 namespace Boson;
 
 use Boson\Component\Saucer\SaucerInterface;
-use Boson\Internal\StructPointerId;
+use Boson\Shared\StructPointerId;
 use FFI\CData;
 
 final readonly class ApplicationId extends StructPointerId

…c/Exception/NoDefaultWindowException.php …Exception/WindowDereferenceException.phpsrc/Exception/NoDefaultWindowException.php renamed to src/Exception/WindowDereferenceException.php src/Exception/NoDefaultWindowException.php renamed to src/Exception/WindowDereferenceException.php

@@ -4,11 +4,11 @@
 
 namespace Boson\Exception;
 
-final class NoDefaultWindowException extends ApplicationException
+class WindowDereferenceException extends ApplicationException
 {
     public static function becauseNoDefaultWindow(?\Throwable $previous = null): self
     {
-        $message = 'There is no default window available, perhaps it was removed (closed) earlier';
+        $message = 'There is no default window available, perhaps it was destroyed (closed) earlier';
 
         return new self($message, 0, $previous);
     }

src/Extension/LoadedExtension.php

@@ -9,7 +9,7 @@
 use Boson\Dispatcher\Event;
 use Boson\Dispatcher\EventListener;
 use Boson\Dispatcher\Intention;
-use Boson\Internal\StructPointerId;
+use Boson\Shared\StructPointerId;
 
 /**
  * @template TContext of IdentifiableInterface<StructPointerId>

src/Extension/Registry.php

@@ -38,32 +38,32 @@ final class Registry implements ContainerInterface, Destroyable
     private bool $booted = false;
 
     /**
-     * @param TContext $context
      * @param iterable<array-key, ExtensionInterface<TContext>> $providers
      *
      * @throws ExtensionLoadingException
      */
     public function __construct(
-        private readonly IdentifiableInterface $context,
         private readonly EventListener $listener,
         iterable $providers = [],
     ) {
         $this->providers = \iterator_to_array($providers, false);
     }
 
     /**
+     * @param TContext $context
      * @return array<non-empty-string, object>
      * @throws ExtensionLoadingException
      */
-    public function boot(): array
+    public function boot(IdentifiableInterface $context): array
     {
         if ($this->booted === true) {
             return $this->publicExtensions;
         }
 
+        /** @var ExtensionInterface<TContext> $provider */
         foreach (new DependencyGraph($this->providers) as $provider) {
             try {
-                $extension = $provider->load($this->context, $this->listener);
+                $extension = $provider->load($context, $this->listener);
             } catch (\Throwable $e) {
                 throw ExtensionLoadingException::becauseLoadingExceptionOccurs($e);
             }
@@ -113,22 +113,35 @@ public function has(string $id): bool
         return isset($this->publicExtensions[$id]);
     }
 
+    /**
+     * @internal for internal usage only
+     */
     public function destroy(): void
     {
+        $destroyed = new \SplObjectStorage();
+
         foreach ($this->privateExtensions as $extension) {
             if ($extension instanceof Destroyable) {
-                $extension->destroy();
+                $destroyed->offsetSet($extension);
             }
         }
 
         foreach ($this->publicExtensions as $extension) {
             if ($extension instanceof Destroyable) {
-                $extension->destroy();
+                $destroyed->offsetSet($extension);
             }
         }
 
         $this->privateExtensions = [];
         $this->publicExtensions = [];
+
+        foreach ($destroyed as $extension) {
+            $extension->destroy();
+        }
+
+        unset($destroyed);
+
+        \gc_collect_cycles();
     }
 
     public function __destruct()

src/Internal/Poller/SaucerPoller.php …rnal/Poller/ApplicationOrderedPoller.phpsrc/Internal/Poller/SaucerPoller.php renamed to src/Internal/Poller/ApplicationOrderedPoller.php src/Internal/Poller/SaucerPoller.php renamed to src/Internal/Poller/ApplicationOrderedPoller.php

@@ -18,7 +18,7 @@
  * @internal this is an internal library class, please do not use it in your code
  * @psalm-internal Boson
  */
-final class SaucerPoller implements PollerInterface
+final class ApplicationOrderedPoller implements PollerInterface
 {
     /**
      * @var array<array-key, \Closure(array-key):void>
@@ -37,6 +37,9 @@ final class SaucerPoller implements PollerInterface
      */
     private readonly IdValueGeneratorInterface $ids;
 
+    /**
+     * Reference to the event loop pointer
+     */
     private readonly CData $ptr;
 
     public function __construct(

src/Internal/PositiveIntId.php src/Shared/PositiveIntId.phpsrc/Internal/PositiveIntId.php renamed to src/Shared/PositiveIntId.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Boson\Internal;
+namespace Boson\Shared;
 
 use Boson\Contracts\Id\IntIdInterface;
 

src/Internal/StructPointerId.php src/Shared/StructPointerId.phpsrc/Internal/StructPointerId.php renamed to src/Shared/StructPointerId.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Boson\Internal;
+namespace Boson\Shared;
 
 use Boson\Component\Saucer\SaucerInterface;
 use Boson\Contracts\Id\IntIdInterface;

src/WebView/Api/Bindings/BindingsApi.php

@@ -197,9 +197,4 @@ public function count(): int
     {
         return \count($this->functions);
     }
-
-    public function __destruct()
-    {
-        var_dump(__METHOD__);
-    }
 }