commands and logs to the database

src/Channel/ChannelService.php

@@ -31,7 +31,7 @@ final class ChannelService
         $schemasCollection = (new Collection($schemasArray["schemas"] ?? []))->map([$schemaService, 'fromArray']);
 
         $userCommands = [];
-        foreach (config("lucent.commands") as $signature => $desc) {
+        foreach (config("lucent.commands") ?? [] as $signature => $desc) {
             $userCommands[] = new UserCommand($desc, $signature);
         }
 

src/Command/CommandRepo.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace Lucent\Command;
+
+use Illuminate\Support\Facades\DB;
+use Lucent\Command\Data\CommandLogItem;
+
+class CommandRepo
+{
+    public function findBySignature($signature): ?CommandLogItem
+    {
+
+        $row = DB::table("command_logs")->where("signature", $signature)->first();
+        if (empty($row)) {
+            return null;
+        }
+        return CommandLogItem::fromDB($row);
+    }
+
+
+    public function upsertCommand(CommandLogItem $commandLogItem): void
+    {
+        $foundCommandLogItem = $this->findBySignature($commandLogItem->signature);
+        if (empty($foundCommandLogItem)) {
+            DB::table("command_logs")->insert(toArray($commandLogItem));
+            return;
+        }
+
+        DB::table("command_logs")->where("signature", $commandLogItem->signature)->update(toArray($commandLogItem));
+    }
+
+    public function appendToLogs(string $signature, string $line): void
+    {
+       $res =  DB::update(
+            'update command_logs set logs = logs || ?  where signature = ?',
+            [$line, $signature]
+        );
+
+    }
+}

src/Command/CommandService.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace Lucent\Command;
+
+use Lucent\Command\Data\CommandLogItem;
+use Lucent\Id\Id;
+use Lucent\LucentException;
+use Symfony\Component\Process\PhpExecutableFinder;
+
+
+class CommandService
+{
+
+    public function __construct(
+        private CommandRepo $commandRepo,
+    )
+    {
+    }
+
+    public function run(string $signature): CommandLogItem
+    {
+        $commandLogItem = $this->commandRepo->findBySignature($signature);
+
+        if (empty($commandLogItem)) {
+            $commandLogItem = new CommandLogItem(
+                id: Id::new(),
+                signature: $signature,
+                pid: null,
+                logs: ""
+            );
+        } elseif ($this->commandIsRunning($commandLogItem->pid)) {
+            throw new LucentException('Command is already running');
+        }
+
+        $commandLogItem->pid = $this->runCommand($signature);
+        $commandLogItem->logs = "";
+        $this->commandRepo->upsertCommand($commandLogItem);
+        return $commandLogItem;
+    }
+
+    public function logWriter(string $signature): callable
+    {
+        return function (string $line) use($signature) {
+            $this->commandRepo->appendToLogs($signature, $line.PHP_EOL);
+        };
+    }
+
+    private function runCommand(string $signature): int
+    {
+        $phpBinaryFinder = new PhpExecutableFinder();
+        $phpBinaryPath = $phpBinaryFinder->find();
+        $pid = (int)shell_exec("cd " . base_path() . " && $phpBinaryPath artisan {$signature} > /dev/null 2>&1 & echo $!");
+        return $pid;
+    }
+
+    public function commandIsRunning(int $pid): bool
+    {
+        return file_exists("/proc/$pid");
+    }
+}

src/Command/Data/CommandLogItem.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Lucent\Command\Data;
+
+use stdClass;
+
+class CommandLogItem
+{
+    public function __construct(
+        public string $id,
+        public string $signature,
+        public ?int $pid,
+        public string $logs,
+    )
+    {
+    }
+
+    public static function fromDB(stdClass $data): self
+    {
+        return new self(
+            id: $data->id,
+            signature: $data->signature,
+            pid: $data->pid,
+            logs: $data->logs,
+        );
+    }
+}

src/Database/migrations/0000_create_users_table.php

@@ -6,7 +6,7 @@ use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration {
 
-    protected $connection = 'lucentDb';
+    protected $connection = 'lucentdb';
 
     /**
      * Run the migrations.

src/Database/migrations/0001_create_sessions_table.php

@@ -6,7 +6,7 @@ use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {
-    protected $connection = 'lucentDb';
+    protected $connection = 'lucentdb';
 
     /**
      * Run the migrations.

src/Database/migrations/0002_records.php

@@ -6,7 +6,7 @@ use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration {
 
-    protected $connection = 'lucentDb';
+    protected $connection = 'lucentdb';
     /**
      * Run the migrations.
      *

src/Database/migrations/0003_revisions.php

@@ -6,7 +6,7 @@ use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration {
 
-    protected $connection = 'lucentDb';
+    protected $connection = 'lucentdb';
     /**
      * Run the migrations.
      *

src/Database/migrations/0004_generatedIndexColumn.php

@@ -6,7 +6,7 @@ use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration {
 
-    protected $connection = 'lucentDb';
+    protected $connection = 'lucentdb';
     /**
      * Run the migrations.
      *

src/Database/migrations/0005_RecordsUpdatedIndex.php

@@ -6,7 +6,7 @@ use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration {
 
-    protected $connection = 'lucentDb';
+    protected $connection = 'lucentdb';
 
     /**
      * Run the migrations.

src/Database/migrations/0006_CommandLogs.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+
+    protected $connection = 'lucentdb';
+
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('command_logs', function (Blueprint $table) {
+            $table->uuid('id')->primary();
+            $table->string('signature');
+            $table->integer('pid')->nullable();
+            $table->text('logs');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('command_logs');
+    }
+};

src/Http/Controller/BuildController.php

@@ -6,13 +6,17 @@ use App\Http\Controllers\Controller;
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\Request;
 use Lucent\Channel\ChannelService;
+use Lucent\Command\CommandRepo;
+use Lucent\Command\CommandService;
 use Lucent\Svelte\Svelte;
 
 class BuildController extends Controller
 {
     public function __construct(
-        public readonly Svelte         $svelte,
-        public readonly ChannelService $channelService,
+        private readonly Svelte         $svelte,
+        private readonly ChannelService $channelService,
+        private readonly CommandService $commandService,
+        private readonly CommandRepo    $commandRepo,
     )
     {
     }
@@ -20,19 +24,8 @@ class BuildController extends Controller
     public function build(Request $request)
     {
         $commandSignature = $request->route("signature");
-        $buildLogFile = $this->getLogFile($commandSignature);
-        $pidFile = $this->getPidFile($commandSignature);
-        if (file_exists($buildLogFile)) {
-            unlink($buildLogFile);
-        }
-        if (file_exists($pidFile)) {
-            unlink($pidFile);
-        }
+        $this->commandService->run($commandSignature);
 
-        exec("cd " . base_path() . " && php8.3 artisan {$commandSignature} > " . $buildLogFile . " 2>&1 & echo $!", $op);
-        $pid = (int)$op[0];
-        file_put_contents($pidFile, $pid);
-        return redirect($this->channelService->channel->lucentUrl . "/command-report/" . $commandSignature);
     }
 
     public function report(Request $request): View
@@ -55,8 +48,10 @@ class BuildController extends Controller
         $commandSignature = $request->route("signature");
         return response()->stream(function () use ($commandSignature) {
             while (true) {
+
+                $commandLogItem = $this->commandRepo->findBySignature($commandSignature);
                 $data["date"] = date("Y-m-d H:i:s");
-                $data["logs"] = file_get_contents($this->getLogFile($commandSignature));
+                $data["logs"] = $commandLogItem->logs ?? "";
 //                $lines = explode("\n",$data["logs"]);
 
                 echo 'data: ' . json_encode($data);
@@ -64,19 +59,8 @@ class BuildController extends Controller
 
                 ob_flush();
                 flush();
-
-                $pidFile = $this->getPidFile($commandSignature);
-                if (file_exists($pidFile)) {
-                    $pid = file_get_contents($pidFile);
-                } else {
-                    break;
-                }
-
-                if (empty($pid)) {
-                    break;
-                }
-
-                if (!file_exists("/proc/$pid")) {
+                logger($this->commandService->commandIsRunning($commandLogItem->pid));
+                if (!$this->commandService->commandIsRunning($commandLogItem->pid)) {
                     break;
                 }
 
@@ -93,13 +77,4 @@ class BuildController extends Controller
         ]);
     }
 
-    private function getLogFile(string $signature): string
-    {
-        return storage_path("lucent/$signature.log");
-    }
-
-    private function getPidFile(string $signature): string
-    {
-        return storage_path("lucent/$signature.pid.log");
-    }
 }

src/LucentServiceProvider.php

@@ -33,8 +33,11 @@ class LucentServiceProvider extends ServiceProvider
             return new ImageManager(['driver' => 'imagick']);
         });
 
+
+
         $this->app->bind(DatabaseGraph::class, function () {
-            return match (config("lucent.database")) {
+            $dbConnection = config("lucent.database");
+            return match (config("database.connections.$dbConnection.driver")) {
                 "sqlite" => new SqliteDatabaseGraph(),
                 "pgsql" => new PgsqlDatabaseGraph(),
             };

src/StaticGenerator/StaticGenerator.php

@@ -3,51 +3,51 @@
 
 use Carbon\Carbon;
 use Illuminate\Contracts\Filesystem\Filesystem;
-use Illuminate\Contracts\View\View;
-use Illuminate\Support\Facades\File;
-use Illuminate\Support\Facades\Storage;
+use Lucent\Command\CommandService;
 use Throwable;
 
 class StaticGenerator
 {
 
     public function __construct(
-        public Writer $writer,
-        public Filesystem $filesystem
+        public Filesystem     $filesystem,
+        public CommandService $commandService,
     )
     {
     }
 
-    public function run(callable $callback): void
+    public function run(string $signature, callable $callback): void
     {
-
-        echo "Start ".Carbon::now()->format("Y-m-d H:i:s").PHP_EOL;
+        $logWriter = $this->commandService->logWriter($signature);
+        $logWriter("Start " . Carbon::now()->format("Y-m-d H:i:s"));
         $this->removeBuildDirectory();
-        echo "Removing previous data".PHP_EOL;
+        $logWriter("Removing previous data");
         try {
-            $callback($this->writer);
-        }catch (Throwable $th){
-            echo "Finished with errors".Carbon::now()->format("Y-m-d H:i:s")." ".$th->getMessage().PHP_EOL;
+            $callback(new Writer($logWriter));
+        } catch (Throwable $th) {
+            $logWriter("Finished with errors" . Carbon::now()->format("Y-m-d H:i:s") . " " . $th->getMessage());
         }
 
         $this->copyBuildDirectory();
-        echo "Finished ".Carbon::now()->format("Y-m-d H:i:s").PHP_EOL;
+        $logWriter("Finished " . Carbon::now()->format("Y-m-d H:i:s"));
     }
 
-    private function removeBuildDirectory() :void{
-        if(!file_exists(storage_path("lucent/build"))){
+    private function removeBuildDirectory(): void
+    {
+        if (!file_exists(storage_path("lucent/build"))) {
             return;
         }
-        $cmd = "rm -rf ".storage_path("lucent/build");
+        $cmd = "rm -rf " . storage_path("lucent/build");
         exec($cmd);
     }
 
-    private function copyBuildDirectory() :void{
-        if(file_exists(storage_path("lucent/live"))){
-            $cmd = "rm -rf ".storage_path("lucent/live");
+    private function copyBuildDirectory(): void
+    {
+        if (file_exists(storage_path("lucent/live"))) {
+            $cmd = "rm -rf " . storage_path("lucent/live");
             exec($cmd);
         }
-        $cmd = sprintf("cp -R %s %s",storage_path("lucent/build"),storage_path("lucent/live"));
+        $cmd = sprintf("cp -R %s %s", storage_path("lucent/build"), storage_path("lucent/live"));
         exec($cmd);
     }
 

src/StaticGenerator/Writer.php

@@ -1,13 +1,10 @@
 <?php namespace Lucent\StaticGenerator;
 
-
-use Illuminate\Contracts\View\View;
-
 class Writer
 {
 
 
-    public function __construct()
+    public function __construct( private  $logWriter)
     {
     }
 
@@ -27,7 +24,8 @@ class Writer
             make_dir_r(pathinfo($filepath, PATHINFO_DIRNAME));
         }
         file_put_contents($filepath, $html);
-        echo "Path: $path" . PHP_EOL;
+        $logWriter = $this->logWriter;
+        $logWriter("Path: $path");
     }