fix: store agent in cache to improve performance

agentTemplate/forest_admin.php

@@ -2,12 +2,15 @@
 
 use ForestAdmin\AgentPHP\Agent\Builder\AgentFactory;
 use ForestAdmin\AgentPHP\DatasourceEloquent\EloquentDatasource;
+use ForestAdmin\LaravelForestAdmin\Providers\AgentProvider;
 
 return static function () {
     $defaultDB = config('database.default');
-    $forestAgent =  app()->make(AgentFactory::class);
+    $forestAgent =  AgentProvider::getAgentInstance();
 
     $forestAgent->addDatasource(
         new EloquentDatasource(config('database.connections.' . $defaultDB)),
     );
+
+    $forestAgent->build();
 };

composer.json

@@ -16,8 +16,8 @@
     "illuminate/http": "^8.0|^9.0|^10.0|^11.0",
     "illuminate/routing": "^8.0|^9.0|^10.0|^11.0",
     "illuminate/support": "^8.0|^9.0|^10.0|^11.0",
-    "forestadmin/php-datasource-customizer": "^1.10.0",
-    "forestadmin/php-datasource-eloquent": "^1.10.0",
+    "forestadmin/php-datasource-customizer": "^1.11.1",
+    "forestadmin/php-datasource-eloquent": "^1.11.1",
     "doctrine/dbal": "^3.0"
   },
   "require-dev": {

config/forest.php

@@ -10,5 +10,6 @@
     'permissionExpiration' => env('FOREST_PERMISSIONS_EXPIRATION_IN_SECONDS', 300),
     'cacheDir'             => storage_path('framework/cache/data/forest'),
     'schemaPath'           => base_path() . '/.forestadmin-schema.json',
+    'disabledApcuCache'    => true,
     'projectDir'           => base_path(),
-];
+];

src/Commands/SendApimap.php

@@ -3,6 +3,8 @@
 namespace ForestAdmin\LaravelForestAdmin\Commands;
 
 use ForestAdmin\AgentPHP\Agent\Builder\AgentFactory;
+use ForestAdmin\AgentPHP\Agent\Facades\Cache;
+use ForestAdmin\LaravelForestAdmin\Providers\AgentProvider;
 use Illuminate\Console\Command;
 
 class SendApimap extends Command
@@ -13,7 +15,8 @@ class SendApimap extends Command
 
     public function handle()
     {
-        app()->make(AgentFactory::class)->sendSchema();
+        Cache::flush();
+        AgentProvider::getAgentInstance()->sendSchema();
 
         $this->info('✅ Apimap sent');
     }

src/Providers/AgentProvider.php

@@ -3,23 +3,53 @@
 namespace ForestAdmin\LaravelForestAdmin\Providers;
 
 use ForestAdmin\AgentPHP\Agent\Builder\AgentFactory;
+use ForestAdmin\AgentPHP\Agent\Facades\Cache;
 use ForestAdmin\AgentPHP\Agent\Http\Router as AgentRouter;
+use ForestAdmin\AgentPHP\Agent\Utils\Filesystem;
 use ForestAdmin\LaravelForestAdmin\Http\Controllers\ForestController;
 use Illuminate\Routing\RouteCollection;
 use Illuminate\Support\ServiceProvider;
+use Laravel\SerializableClosure\SerializableClosure;
 
 class AgentProvider extends ServiceProvider
 {
     protected RouteCollection $routes;
 
     public function boot()
     {
-        if ($this->forestIsPlanted()) {
-            $this->app->instance(AgentFactory::class, new AgentFactory(config('forest')));
+        if ($this->forestIsPlanted() && (request()->getMethod() !== 'OPTIONS')) {
+            // set cache file configuration
+            $filesystem = new Filesystem();
+            $directory = config('forest')['cacheDir'];
+            $disabledApcuCache = config('forest')['disabledApcuCache'];
+            AgentFactory::$fileCacheOptions = compact('filesystem', 'directory', 'disabledApcuCache');
+
+            $this->app->instance(AgentFactory::class, self::getAgentInstance());
+
             $this->loadConfiguration();
         }
     }
 
+    public static function getAgentInstance(bool $forceReload = false)
+    {
+        if (! $forceReload &&
+            Cache::enabled() &&
+            Cache::has('forestAgent') &&
+            Cache::get('forestAgentExpireAt') > strtotime('+ 30 seconds')
+        ) {
+            $forestAgentClosure = Cache::get('forestAgent');
+
+            return $forestAgentClosure();
+        }
+
+        $agent = new AgentFactory(config('forest'));
+        $expireAt = strtotime('+ '. AgentFactory::TTL .' seconds');
+        Cache::put('forestAgent', new SerializableClosure(fn () => $agent), AgentFactory::TTL);
+        Cache::put('forestAgentExpireAt', $expireAt, AgentFactory::TTL);
+
+        return $agent;
+    }
+
     /**
      * @return RouteCollection
      */
@@ -49,10 +79,15 @@ private function transformMethodsValuesToUpper(array|string $methods): array
     private function loadConfiguration(): void
     {
         if (file_exists($this->appForestConfig())) {
-            $callback = require $this->appForestConfig();
-            $callback($this);
+            $hash = sha1(file_get_contents($this->appForestConfig()));
+            $agent = self::getAgentInstance();
+            if($hash !== Cache::get('forestConfigHash') || AgentFactory::get('datasource') === null) {
+                $this->app->instance(AgentFactory::class, self::getAgentInstance(true));
+                $callback = require $this->appForestConfig();
+                $callback();
 
-            $this->app->make(AgentFactory::class)->build();
+                Cache::put('forestConfigHash', $hash, 3600);
+            }
             $this->loadRoutes();
         }
     }