use proper jobs for events

Author: limenet

composer.json

@@ -23,16 +23,16 @@
     },
     "require-dev": {
         "driftingly/rector-laravel": "^2.0.2",
-        "larastan/larastan": "^3.1",
-        "laravel/pint": "^1.21.1",
-        "nunomaduro/collision": "^8.6.1",
+        "larastan/larastan": "^3.2",
+        "laravel/pint": "^1.21.2",
+        "nunomaduro/collision": "^8.7.0",
         "orchestra/testbench": "^9.11 || ^10.1",
         "phpstan/extension-installer": "^1.4.3",
-        "phpstan/phpstan": "^2.1.8",
+        "phpstan/phpstan": "^2.1.11",
         "phpstan/phpstan-deprecation-rules": "^2.0.1",
-        "phpstan/phpstan-phpunit": "^2.0.4",
-        "phpstan/phpstan-strict-rules": "^2.0.3",
-        "phpunit/phpunit": "^11.5.12",
+        "phpstan/phpstan-phpunit": "^2.0.6",
+        "phpstan/phpstan-strict-rules": "^2.0.4",
+        "phpunit/phpunit": "^11.5.15",
         "psr/log": "^3.0.2",
         "rector/rector": "^2.0.10",
         "sentry/sentry": "^4.10.0",

phpstan-baseline.neon

@@ -12,6 +12,12 @@ parameters:
 			count: 1
 			path: src/Commands/IndexCommand.php
 
+		-
+			message: '#^Parameter \#1 \$callback of method Illuminate\\Support\\Collection\<\(int\|string\),Limenet\\LaravelElasticaBridge\\Model\\ElasticsearchableInterface\>\:\:each\(\) expects callable\(Limenet\\LaravelElasticaBridge\\Model\\ElasticsearchableInterface, int\|string\)\: mixed, Closure\(Illuminate\\Database\\Eloquent\\Model\)\: Illuminate\\Foundation\\Bus\\PendingDispatch given\.$#'
+			identifier: argument.type
+			count: 1
+			path: src/Events/EventHandler.php
+
 		-
 			message: '#^Unable to resolve the template type TKey in call to function collect$#'
 			identifier: argument.templateType

phpstan.neon

@@ -11,6 +11,7 @@ parameters:
     tmpDir: build/phpstan
     checkOctaneCompatibility: true
     checkModelProperties: true
+    treatPhpDocTypesAsCertain: false
 
     ignoreErrors:
         -

src/Client/ElasticaClient.php

@@ -23,10 +23,13 @@ public function __construct()
         }
 
         $client = new Client(
-            [
-                'host' => config('elastica-bridge.elasticsearch.host'),
-                'port' => config('elastica-bridge.elasticsearch.port'),
-            ], logger: $logger);
+            sprintf(
+                'http://%s:%d',
+                config('elastica-bridge.elasticsearch.host'),
+                config('elastica-bridge.elasticsearch.port')
+            ),
+            logger: $logger
+        );
 
         $this->client = $client;
     }

src/Commands/StatusCommand.php

@@ -29,8 +29,8 @@ public function handle(): int
         $table
             ->setHeaders(['Host', 'Port', 'Version'])
             ->setRows([[
-                $this->elastica->getClient()->getConfig('host'),
-                $this->elastica->getClient()->getConfig('port'),
+                $this->elastica->getClient()->getTransport()->getNodePool()->nextNode()->getUri()->getHost(),
+                $this->elastica->getClient()->getTransport()->getNodePool()->nextNode()->getUri()->getPort(),
                 $this->elastica->getClient()->getVersion(),
             ]])
             ->setHeaderTitle('Cluster');

src/Events/EventHandler.php

@@ -5,33 +5,32 @@
 use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Database\Eloquent\Model;
 use Limenet\LaravelElasticaBridge\Client\ElasticaClient;
-use Limenet\LaravelElasticaBridge\Services\ModelEventListener;
+use Limenet\LaravelElasticaBridge\Jobs\ModelEvent;
+use Limenet\LaravelElasticaBridge\Model\ElasticsearchableInterface;
 
 class EventHandler
 {
-    public function __construct(
-        private readonly ModelEventListener $modelEventListener
-    ) {}
-
     public function subscribe(Dispatcher $events): void
     {
         $events->listen(
-            collect(ModelEventListener::EVENTS)
+            collect(ModelEvent::EVENTS)
                 ->map(fn (string $name): string => sprintf('eloquent.%s:*', $name))
                 ->toArray(),
             function ($event, $models): void {
                 if (! ElasticaClient::listensToEvents()) {
                     return;
                 }
 
-                dispatch(function () use ($event, $models): void {
-                    $name = (str($event)->before(':')->after('.'));
-                    if (! ElasticaClient::listensToEvents()) {
-                        return;
-                    }
+                $name = str($event)->before(':')->after('.')->toString();
 
-                    collect($models)->each(fn (Model $model) => $this->modelEventListener->handle($name, $model));
-                })->onConnection(config('elastica-bridge.connection'));
+                collect($models)
+                    ->filter(fn (Model $model): bool => $model instanceof ElasticsearchableInterface)
+                    ->each(fn (Model $model) => ModelEvent::dispatch(
+                        $name,
+                        $model::class,
+                        $model->getKeyName(),
+                        $model->getKey()
+                    ));
             });
     }
 }

src/Services/ModelEventListener.php renamed to src/Jobs/ModelEvent.php

@@ -2,16 +2,28 @@
 
 declare(strict_types=1);
 
-namespace Limenet\LaravelElasticaBridge\Services;
+namespace Limenet\LaravelElasticaBridge\Jobs;
 
 use Elastic\Elasticsearch\Exception\ClientResponseException;
+use Illuminate\Bus\Batchable;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
 use Limenet\LaravelElasticaBridge\Index\IndexInterface;
 use Limenet\LaravelElasticaBridge\Model\ElasticsearchableInterface;
 use Limenet\LaravelElasticaBridge\Repository\IndexRepository;
 
-class ModelEventListener
+class ModelEvent implements ShouldQueue
 {
+    use Batchable;
+    use Dispatchable;
+    use InteractsWithQueue;
+    use Queueable;
+    use SerializesModels;
+
     private const EVENT_CREATED = 'created';
 
     private const EVENT_UPDATED = 'updated';
@@ -30,9 +42,27 @@ class ModelEventListener
         self::EVENT_DELETED,
     ];
 
-    public function handle(string $event, Model $model): void
+    /**
+     * @template TModel of ElasticsearchableInterface&Model
+     *
+     * @param  class-string<TModel>  $modelClass
+     * @param  model-property<TModel>  $keyName
+     * @return void
+     */
+    public function __construct(
+        private readonly string $event,
+        private readonly string $modelClass,
+        private readonly string $keyName,
+        private readonly mixed $keyValue
+    ) {
+        $this->onConnection(config('elastica-bridge.connection'));
+    }
+
+    public function handle(): void
     {
-        if (! $model instanceof ElasticsearchableInterface) {
+        $model = $this->modelClass::query()->where($this->keyName, $this->keyValue)->first();
+
+        if (! $model instanceof ElasticsearchableInterface || ! $model instanceof Model) {
             return;
         }
 
@@ -43,7 +73,7 @@ public function handle(string $event, Model $model): void
 
             $shouldBePresent = true;
 
-            if (! $model->shouldIndex($index) || $event === self::EVENT_DELETED) {
+            if (! $model->shouldIndex($index) || $this->event === self::EVENT_DELETED) {
                 $shouldBePresent = false;
             }
 

src/LaravelElasticaBridgeServiceProvider.php

@@ -10,7 +10,6 @@
 use Limenet\LaravelElasticaBridge\Commands\StatusCommand;
 use Limenet\LaravelElasticaBridge\Events\EventHandler;
 use Limenet\LaravelElasticaBridge\Repository\IndexRepository;
-use Limenet\LaravelElasticaBridge\Services\ModelEventListener;
 use Spatie\LaravelPackageTools\Package;
 use Spatie\LaravelPackageTools\PackageServiceProvider;
 
@@ -32,7 +31,6 @@ public function configurePackage(Package $package): void
     public function packageRegistered(): void
     {
         $this->app->singleton(ElasticaClient::class);
-        $this->app->bind(ModelEventListener::class);
         $this->app->tag(config('elastica-bridge.indices'), 'elasticaBridgeIndices');
 
         $this->app->when(IndexRepository::class)