Add webview manager

Author: SerafimArts

resources/stubs/saucer.stub.php

@@ -15,34 +15,39 @@
     final class CSaucerWebViewEventsStruct extends CData
     {
         /**
-         * @var \Closure(CData):void
+         * @var \Closure(CData, CData):void
          */
         public \Closure $onDomReady;
 
         /**
-         * @var \Closure(CData, string):void
+         * @var \Closure(CData, string, CData):void
          */
         public \Closure $onNavigated;
 
         /**
-         * @var \Closure(CData, CData):void
+         * @var \Closure(CData, CData, CData):void
          */
         public \Closure $onNavigating;
 
         /**
-         * @var \Closure(CData, CData):void
+         * @var \Closure(CData, CData, CData):void
          */
         public \Closure $onFaviconChanged;
 
         /**
-         * @var \Closure(CData, string):void
+         * @var \Closure(CData, string, CData):void
          */
         public \Closure $onTitleChanged;
 
         /**
-         * @var \Closure(CData, array{State::SAUCER_STATE_*}):void
+         * @var \Closure(CData, State::SAUCER_STATE_*, CData):void
          */
         public \Closure $onLoad;
+
+        /**
+         * @var \Closure(CData, string, int<0, max>, CData):void
+         */
+        public \Closure $onMessage;
     }
 
 }

src/Application.php

@@ -15,11 +15,11 @@
 use Boson\Event\ApplicationStarting;
 use Boson\Event\ApplicationStopped;
 use Boson\Event\ApplicationStopping;
+use Boson\Exception\ApplicationException;
 use Boson\Exception\NoDefaultWindowException;
 use Boson\Extension\Exception\ExtensionNotFoundException;
 use Boson\Extension\Registry;
 use Boson\Internal\Poller\SaucerPoller;
-use Boson\Internal\ThreadsCountResolver;
 use Boson\Poller\PollerInterface;
 use Boson\Shared\Marker\BlockingOperation;
 use Boson\Shared\Marker\RequiresDealloc;
@@ -200,7 +200,7 @@ public function __construct(
 
         // Kernel initialization
         $this->saucer = $this->createLibSaucer($info->library);
-        $this->id = $this->createApplicationId($this->saucer, $this->info->name, $this->info->threads);
+        $this->id = $this->createApplicationId($this->saucer, $this->info->name);
         $this->windows = $this->createWindowManager($this->saucer, $this, $info, $this->listener);
         $this->poller = $this->createApplicationPoller($this->saucer);
 
@@ -323,7 +323,7 @@ protected function createWindowManager(
     private function registerSchemes(): void
     {
         foreach ($this->info->schemes as $scheme) {
-            $this->saucer->saucer_register_scheme($scheme);
+            $this->saucer->saucer_webview_register_scheme($scheme);
         }
     }
 
@@ -358,8 +358,7 @@ private function onWindowClose(): void
      */
     private function onApplicationStarted(): void
     {
-        // Resolve main window lazy proxy (facade)
-        $_ = $this->window->isClosed;
+        $this->windows->boot();
     }
 
     /**
@@ -379,13 +378,12 @@ protected function createEventListener(?EventDispatcherInterface $dispatcher): E
      * Creates a new application ID
      *
      * @param non-empty-string $name
-     * @param int<1, max>|null $threads
      */
-    protected function createApplicationId(SaucerInterface $api, string $name, ?int $threads): ApplicationId
+    protected function createApplicationId(SaucerInterface $api, string $name): ApplicationId
     {
         return ApplicationId::fromAppHandle(
             api: $api,
-            handle: $this->createApplicationPointer($api, $name, $threads),
+            handle: $this->createApplicationPointer($api, $name),
             name: $name,
         );
     }
@@ -394,38 +392,36 @@ protected function createApplicationId(SaucerInterface $api, string $name, ?int
      * Creates a new application instance pointer.
      *
      * @param non-empty-string $name
-     * @param int<1, max>|null $threads
      */
     #[RequiresDealloc]
-    protected function createApplicationPointer(SaucerInterface $api, string $name, ?int $threads): CData
+    protected function createApplicationPointer(SaucerInterface $api, string $name): CData
     {
-        $options = $this->createApplicationOptionsPointer($api, $name, $threads);
+        $options = $this->createApplicationOptionsPointer($api, $name);
 
         try {
-            return $api->saucer_application_init($options);
+            $result = $api->saucer_application_new($options, \FFI::addr(
+                $error = $this->saucer->new('int'),
+            ));
+
+            if ($error->cdata !== 0) {
+                throw new ApplicationException('An internal error occurred while creating application', $error->cdata);
+            }
+
+            return $result;
         } finally {
-            $api->saucer_options_free($options);
+            $api->saucer_application_options_free($options);
         }
     }
 
     /**
      * Creates a new application options pointer.
      *
      * @param non-empty-string $name
-     * @param int<1, max>|null $threads
      */
     #[RequiresDealloc]
-    protected function createApplicationOptionsPointer(SaucerInterface $api, string $name, ?int $threads): CData
+    protected function createApplicationOptionsPointer(SaucerInterface $api, string $name): CData
     {
-        $options = $api->saucer_options_new($name);
-
-        $threads = ThreadsCountResolver::resolve($threads);
-
-        if ($threads !== null) {
-            $api->saucer_options_set_threads($options, $threads);
-        }
-
-        return $options;
+        return $api->saucer_application_options_new($name);
     }
 
     /**

src/ApplicationCreateInfo.php

@@ -74,15 +74,6 @@ public function __construct(
          */
         public string $name = self::DEFAULT_APPLICATION_NAME,
         iterable $schemes = [],
-        /**
-         * An application threads count.
-         *
-         * The number of threads will be determined automatically if it
-         * is not explicitly specified (defined as {@see null}).
-         *
-         * @var int<1, max>|null
-         */
-        public ?int $threads = null,
         /**
          * Automatically detects debug environment if {@see null},
          * otherwise it forcibly enables or disables it.

src/Internal/Poller/SaucerPoller.php

@@ -40,11 +40,11 @@ final class SaucerPoller implements PollerInterface
     private readonly CData $ptr;
 
     public function __construct(
-        private readonly ApplicationId $id,
+        ApplicationId $id,
         private readonly SaucerInterface $saucer,
     ) {
         $this->ids = $this->createIdValueGenerator();
-        $this->ptr = $this->id->ptr;
+        $this->ptr = $this->saucer->saucer_loop_new($id->ptr);
     }
 
     /**
@@ -89,7 +89,7 @@ public function next(): void
 
     private function executeInternalTask(): void
     {
-        $this->saucer->saucer_application_run_once($this->ptr);
+        $this->saucer->saucer_loop_iteration($this->ptr);
     }
 
     private function executePeriodicTask(): void
@@ -156,4 +156,9 @@ public function cancel(int|string $taskId): void
     {
         unset($this->periodicMicroTasks[$taskId], $this->microTasks[$taskId]);
     }
+
+    public function __destruct()
+    {
+        $this->saucer->saucer_loop_free($this->ptr);
+    }
 }

src/Internal/PositiveIntId.php

@@ -0,0 +1,55 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Boson\Internal;
+
+use Boson\Contracts\Id\IntIdInterface;
+
+/**
+ * @template-implements IntIdInterface<int<0, max>>
+ */
+abstract readonly class PositiveIntId implements IntIdInterface
+{
+    final protected function __construct(
+        /**
+         * @var int<0, max>
+         */
+        protected int $id,
+    ) {}
+
+    /**
+     * @param int<0, max> $id
+     */
+    public static function new(int $id): static
+    {
+        return new static($id);
+    }
+
+    public function toInteger(): int
+    {
+        return $this->id;
+    }
+
+    public function equals(mixed $other): bool
+    {
+        return $other === $this
+            || ($other instanceof self
+                && $this->id === $other->id);
+    }
+
+    public function __debugInfo(): array
+    {
+        return [
+            'id' => $this->id,
+        ];
+    }
+
+    /**
+     * @return non-empty-string
+     */
+    public function __toString(): string
+    {
+        return \sprintf('%s(%d)', static::class, $this->id);
+    }
+}