refactoring (#116)

- refactoring architecture
- fix incomplete ssh logs
- code editor for scripts in the app
- remove Jobs and SSHCommands

app/Actions/Site/CreateRedirect.php

@@ -1,51 +0,0 @@
-<?php
-
-namespace App\Actions\Site;
-
-use App\Models\Redirect;
-use App\Models\Site;
-use Exception;
-use Illuminate\Support\Facades\Validator;
-use Illuminate\Validation\ValidationException;
-
-class CreateRedirect
-{
-    /**
-     * @throws Exception
-     */
-    public function handle(Site $site, array $input): void
-    {
-        $this->validate($input);
-
-        $redirect = new Redirect([
-            'site_id' => $site->id,
-            'mode' => $input['mode'],
-            'from' => $input['from'],
-            'to' => $input['to'],
-        ]);
-        $redirect->save();
-        $redirect->addToServer();
-    }
-
-    /**
-     * @throws ValidationException
-     */
-    private function validate(array $input): void
-    {
-        $rules = [
-            'mode' => [
-                'required',
-                'in:301,302',
-            ],
-            'from' => [
-                'required',
-            ],
-            'to' => [
-                'required',
-                'url',
-            ],
-        ];
-
-        Validator::make($input, $rules)->validateWithBag('createRedirect');
-    }
-}

app/Actions/Site/CreateSite.php

@@ -4,8 +4,11 @@
 
 use App\Enums\SiteStatus;
 use App\Exceptions\SourceControlIsNotConnected;
+use App\Facades\Notifier;
 use App\Models\Server;
 use App\Models\Site;
+use App\Notifications\SiteInstallationFailed;
+use App\Notifications\SiteInstallationSucceed;
 use App\ValidationRules\DomainRule;
 use Exception;
 use Illuminate\Support\Facades\DB;
@@ -30,11 +33,11 @@ public function create(Server $server, array $input): Site
                 'type' => $input['type'],
                 'domain' => $input['domain'],
                 'aliases' => isset($input['alias']) ? [$input['alias']] : [],
-                'path' => '/home/'.$server->ssh_user.'/'.$input['domain'],
+                'path' => '/home/'.$server->getSshUser().'/'.$input['domain'],
                 'status' => SiteStatus::INSTALLING,
             ]);
 
-            // fields based on type
+            // fields based on the type
             $site->fill($site->type()->createFields($input));
 
             // check has access to repository
@@ -63,8 +66,19 @@ public function create(Server $server, array $input): Site
                 'content' => '',
             ]);
 
-            // install server
-            $site->install();
+            // install site
+            dispatch(function () use ($site) {
+                $site->type()->install();
+                $site->update([
+                    'status' => SiteStatus::READY,
+                    'progress' => 100,
+                ]);
+                Notifier::send($site, new SiteInstallationSucceed($site));
+            })->catch(function () use ($site) {
+                $site->status = SiteStatus::INSTALLATION_FAILED;
+                $site->save();
+                Notifier::send($site, new SiteInstallationFailed($site));
+            })->onConnection('ssh');
 
             DB::commit();
 
@@ -105,7 +119,7 @@ private function validateInputs(Server $server, array $input): void
      */
     private function validateType(Site $site, array $input): void
     {
-        $rules = $site->type()->createValidationRules($input);
+        $rules = $site->type()->createRules($input);
 
         Validator::make($input, $rules)->validate();
     }

app/Actions/Site/DeleteSite.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Actions\Site;
+
+use App\Models\Site;
+
+class DeleteSite
+{
+    public function delete(Site $site): void
+    {
+        $site->server->webserver()->handler()->deleteSite($site);
+        $site->delete();
+    }
+}

app/Actions/Site/Deploy.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Actions\Site;
+
+use App\Enums\DeploymentStatus;
+use App\Exceptions\DeploymentScriptIsEmptyException;
+use App\Exceptions\SourceControlIsNotConnected;
+use App\Models\Deployment;
+use App\Models\Site;
+
+class Deploy
+{
+    /**
+     * @throws SourceControlIsNotConnected
+     * @throws DeploymentScriptIsEmptyException
+     */
+    public function run(Site $site): Deployment
+    {
+        if ($site->sourceControl()) {
+            $site->sourceControl()->getRepo($site->repository);
+        }
+
+        if (! $site->deploymentScript?->content) {
+            throw new DeploymentScriptIsEmptyException();
+        }
+
+        $deployment = new Deployment([
+            'site_id' => $site->id,
+            'deployment_script_id' => $site->deploymentScript->id,
+            'status' => DeploymentStatus::DEPLOYING,
+        ]);
+        $lastCommit = $site->sourceControl()->provider()->getLastCommit($site->repository, $site->branch);
+        if ($lastCommit) {
+            $deployment->commit_id = $lastCommit['commit_id'];
+            $deployment->commit_data = $lastCommit['commit_data'];
+        }
+        $deployment->save();
+
+        dispatch(function () use ($site, $deployment) {
+            $log = $site->server->os()->runScript($site->path, $site->deploymentScript->content, $site->id);
+            $deployment->status = DeploymentStatus::FINISHED;
+            $deployment->log_id = $log->id;
+            $deployment->save();
+        })->catch(function () use ($deployment) {
+            $deployment->status = DeploymentStatus::FAILED;
+            $deployment->save();
+        })->onConnection('ssh');
+
+        return $deployment;
+    }
+}

app/Actions/Site/EditSite.php

@@ -1,41 +0,0 @@
-<?php
-
-namespace App\Actions\Site;
-
-use App\Models\Site;
-use Illuminate\Support\Facades\Validator;
-use Illuminate\Validation\ValidationException;
-
-class EditSite
-{
-    /**
-     * @throws ValidationException
-     */
-    public function handle(Site $site, array $input): Site
-    {
-        // validate type
-        $this->validateType($site, $input);
-
-        // set type data
-        $site->type_data = $site->type()->data($input);
-
-        // save
-        $site->port = $input['port'] ?? null;
-        $site->save();
-
-        // edit
-        $site->type()->edit();
-
-        return $site;
-    }
-
-    /**
-     * @throws ValidationException
-     */
-    private function validateType(Site $site, array $input): void
-    {
-        $rules = $site->type()->editValidationRules($input);
-
-        Validator::make($input, $rules)->validateWithBag('editSite');
-    }
-}

app/Actions/Site/GetSites.php

@@ -1,14 +0,0 @@
-<?php
-
-namespace App\Actions\Site;
-
-use App\Models\Server;
-use Illuminate\Database\Eloquent\Collection;
-
-class GetSites
-{
-    public function handle(Server $server): Collection
-    {
-        return $server->sites()->orderBy('id', 'desc')->get();
-    }
-}

app/Actions/Site/UpdateBranch.php

@@ -3,6 +3,7 @@
 namespace App\Actions\Site;
 
 use App\Models\Site;
+use App\SSH\Git\Git;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\ValidationException;
 
@@ -14,8 +15,9 @@ class UpdateBranch
     public function update(Site $site, array $input): void
     {
         $this->validate($input);
-
-        $site->updateBranch($input['branch']);
+        $site->branch = $input['branch'];
+        app(Git::class)->checkout($site);
+        $site->save();
     }
 
     /**
@@ -25,6 +27,6 @@ protected function validate(array $input): void
     {
         Validator::make($input, [
             'branch' => 'required',
-        ])->validateWithBag('updateBranch');
+        ]);
     }
 }

app/Actions/Site/UpdateDeploymentScript.php

@@ -27,6 +27,6 @@ protected function validate(array $input): void
     {
         Validator::make($input, [
             'script' => 'required',
-        ])->validateWithBag('updateDeploymentScript');
+        ]);
     }
 }

app/Actions/Site/UpdateEnv.php

@@ -3,22 +3,14 @@
 namespace App\Actions\Site;
 
 use App\Models\Site;
-use App\SSHCommands\System\EditFileCommand;
 
 class UpdateEnv
 {
     public function update(Site $site, array $input): void
     {
-        $typeData = $site->type_data;
-        $typeData['env'] = $input['env'];
-        $site->type_data = $typeData;
-        $site->save();
-
-        $site->server->ssh()->exec(
-            new EditFileCommand(
-                $site->path.'/.env',
-                $site->env
-            )
+        $site->server->os()->editFile(
+            $site->path.'/.env',
+            $input['env']
         );
     }
 }