From d6554ceea9aa863bcaa8d7793d54f6b676e72426 Mon Sep 17 00:00:00 2001
From: Nico Verbruggen <mail@nicoverbruggen.be>
Date: Wed, 14 Dec 2022 20:18:06 +0100
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Add=20site=20isolation=20to=20Valet?=
 =?UTF-8?q?Interactor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xcschemes/PHP Monitor DEV.xcscheme        |  2 +-
 phpmon/Domain/App/ServicesManager.swift       |  2 +-
 .../DomainList/DomainListVC+Actions.swift     | 58 +++++++++++++------
 .../Valet/Domains/ValetInteractor.swift       | 32 +++++++++-
 .../Integrations/Valet/Sites/ValetSite.swift  |  6 +-
 phpmon/Localizable.strings                    |  4 +-
 6 files changed, 78 insertions(+), 26 deletions(-)

diff --git a/PHP Monitor.xcodeproj/xcshareddata/xcschemes/PHP Monitor DEV.xcscheme b/PHP Monitor.xcodeproj/xcshareddata/xcschemes/PHP Monitor DEV.xcscheme
index b0a4d86..8642ae0 100644
--- a/PHP Monitor.xcodeproj/xcshareddata/xcschemes/PHP Monitor DEV.xcscheme	
+++ b/PHP Monitor.xcodeproj/xcshareddata/xcschemes/PHP Monitor DEV.xcscheme	
@@ -91,7 +91,7 @@
          </CommandLineArgument>
          <CommandLineArgument
             argument = "--configuration:~/.phpmon_fconf_working.json"
-            isEnabled = "YES">
+            isEnabled = "NO">
          </CommandLineArgument>
          <CommandLineArgument
             argument = "--configuration:~/.phpmon_fconf_broken.json"
diff --git a/phpmon/Domain/App/ServicesManager.swift b/phpmon/Domain/App/ServicesManager.swift
index ecc907f..4040a2d 100644
--- a/phpmon/Domain/App/ServicesManager.swift
+++ b/phpmon/Domain/App/ServicesManager.swift
@@ -18,7 +18,7 @@ class ServicesManager: ObservableObject {
     @Published var services: [String: ServiceWrapper] = [:]
 
     init() {
-        Log.info("Initializing ServicesManager")
+        Log.info("Initializing ServicesManager...")
 
         formulae = [
             Homebrew.Formulae.php,
diff --git a/phpmon/Domain/DomainList/DomainListVC+Actions.swift b/phpmon/Domain/DomainList/DomainListVC+Actions.swift
index 162e15e..dd481c4 100644
--- a/phpmon/Domain/DomainList/DomainListVC+Actions.swift
+++ b/phpmon/Domain/DomainList/DomainListVC+Actions.swift
@@ -110,32 +110,41 @@ extension DomainListVC {
         }
     }
 
-    #warning("ValetInteractor needs to be used here instead of directly issuing commands to valet")
     @objc func isolateSite(sender: PhpMenuItem) {
-        let command = "sudo \(Paths.valet) isolate php@\(sender.version) --site '\(self.selectedSite!.name)' && exit;"
+        guard let site = selectedSite else {
+            return
+        }
 
-        self.performAction(command: command) {
-            self.selectedSite!.determineIsolated()
-            self.selectedSite!.determineComposerPhpVersion()
-
-            if self.selectedSite!.isolatedPhpVersion == nil {
-                BetterAlert()
-                    .withInformation(
-                        title: "domain_list.alerts_isolation_failed.title".localized,
-                        subtitle: "domain_list.alerts_isolation_failed.subtitle".localized,
-                        description: "domain_list.alerts_isolation_failed.desc".localized(command)
-                    )
-                    .withPrimary(text: "OK")
-                    .show()
+        waitAndExecute {
+            do {
+                // Instruct Valet to isolate a given PHP version
+                try await site.isolate(version: sender.version)
+                // Reload the UI
+                self.reloadSelectedRow()
+            } catch {
+                // Notify the user about a failed command
+                let error = error as! ValetInteractionError
+                self.notifyAboutFailedSiteIsolation(command: error.command)
             }
         }
     }
 
-    #warning("ValetInteractor needs to be used here instead of directly issuing commands to valet")
     @objc func removeIsolatedSite() {
-        self.performAction(command: "sudo \(Paths.valet) unisolate --site '\(self.selectedSite!.name)' && exit;") {
-            self.selectedSite!.isolatedPhpVersion = nil
-            self.selectedSite!.determineComposerPhpVersion()
+        guard let site = selectedSite else {
+            return
+        }
+
+        waitAndExecute {
+            do {
+                // Instruct Valet to remove isolation
+                try await site.unisolate()
+                // Reload the UI
+                self.reloadSelectedRow()
+            } catch {
+                // Notify the user about a failed command
+                let error = error as! ValetInteractionError
+                self.notifyAboutFailedSiteIsolation(command: error.command)
+            }
         }
     }
 
@@ -214,4 +223,15 @@ extension DomainListVC {
             .withPrimary(text: "OK")
             .show()
     }
+
+    private func notifyAboutFailedSiteIsolation(command: String) {
+        BetterAlert()
+            .withInformation(
+                title: "domain_list.alerts_isolation_failed.title".localized,
+                subtitle: "domain_list.alerts_isolation_failed.subtitle".localized,
+                description: "domain_list.alerts_isolation_failed.desc".localized(command)
+            )
+            .withPrimary(text: "OK")
+            .show()
+    }
 }
diff --git a/phpmon/Domain/Integrations/Valet/Domains/ValetInteractor.swift b/phpmon/Domain/Integrations/Valet/Domains/ValetInteractor.swift
index 31d9ac2..39b8493 100644
--- a/phpmon/Domain/Integrations/Valet/Domains/ValetInteractor.swift
+++ b/phpmon/Domain/Integrations/Valet/Domains/ValetInteractor.swift
@@ -69,8 +69,36 @@ class ValetInteractor {
         await Actions.restartNginx()
     }
 
-    public func isolate(site: ValetSite, version: PhpVersionNumber) async throws {
-        // TODO
+    public func isolate(site: ValetSite, version: String) async throws {
+        let command = "sudo \(Paths.valet) isolate php@\(version) --site '\(site.name)'"
+
+        // Run the command
+        await Shell.quiet(command)
+
+        // Check if the secured status has actually changed
+        site.determineIsolated()
+        site.determineComposerPhpVersion()
+
+        // If the version is not isolated, this failed
+        if site.isolatedPhpVersion == nil {
+            throw ValetInteractionError(command: command)
+        }
+    }
+
+    public func unisolate(site: ValetSite) async throws {
+        let command = "sudo \(Paths.valet) unisolate --site '\(site.name)'"
+
+        // Run the command
+        await Shell.quiet(command)
+
+        // Check if the secured status has actually changed
+        site.determineIsolated()
+        site.determineComposerPhpVersion()
+
+        // If the version is somehow still isolated, this failed
+        if site.isolatedPhpVersion != nil {
+            throw ValetInteractionError(command: command)
+        }
     }
 
     public func unlink(site: ValetSite) async throws {
diff --git a/phpmon/Domain/Integrations/Valet/Sites/ValetSite.swift b/phpmon/Domain/Integrations/Valet/Sites/ValetSite.swift
index c05a987..b21fb3a 100644
--- a/phpmon/Domain/Integrations/Valet/Sites/ValetSite.swift
+++ b/phpmon/Domain/Integrations/Valet/Sites/ValetSite.swift
@@ -269,10 +269,14 @@ class ValetSite: ValetListable {
         try await ValetInteractor.shared.toggleSecure(site: self)
     }
 
-    func isolate(version: PhpVersionNumber) async throws {
+    func isolate(version: String) async throws {
         try await ValetInteractor.shared.isolate(site: self, version: version)
     }
 
+    func unisolate() async throws {
+        try await ValetInteractor.shared.unisolate(site: self)
+    }
+
     func unlink() async {
         try! await ValetInteractor.shared.unlink(site: self)
     }
diff --git a/phpmon/Localizable.strings b/phpmon/Localizable.strings
index 915c203..fadeff1 100644
--- a/phpmon/Localizable.strings
+++ b/phpmon/Localizable.strings
@@ -112,8 +112,8 @@
 "domain_list.tooltips.isolated" = "This domain is isolated and using PHP %@ instead of the globally linked PHP.";
 "domain_list.tooltips.checkmark" = "This domain is being served with a version of PHP that is compatible with this requirement (PHP %@). Click on the PHP version next to this checkmark to find out more information about how this requirement was determined.";
 
-"domain_list.alerts_isolation_failed.title" = "Oops! Site Not Isolated";
-"domain_list.alerts_isolation_failed.subtitle" = "Something went wrong trying to isolate this site. If this is your default site but it is not linked, I recommend manually linking the site prior to setting up isolation.";
+"domain_list.alerts_isolation_failed.title" = "Oops! Site Isolation Not Applied";
+"domain_list.alerts_isolation_failed.subtitle" = "Something went wrong trying to change the isolation status for this site. If this is your default site but it is not linked, I recommend manually linking the site prior to setting up isolation.";
 "domain_list.alerts_isolation_failed.desc" = "To find out what goes wrong, you can try running the command in your terminal manually: %@";
 
 "domain_list.alerts_status_not_changed.title" = "Oops! SSL Status Not Changed";