chore: begin refactor of strfry29 install

Author: jchiarulli

cmd/install.go

@@ -248,8 +248,8 @@ var installCmd = &cobra.Command{
 				strfry29.ConfigureNginxHttps(relayDomain)
 			}
 
-			// Step 9: Download and install the relay binary
-			strfry29.InstallRelayBinary()
+			// Step 9: Download and install the relay binaries
+			strfry29.InstallRelayBinaries()
 
 			// Step 10: Set up the relay data directory
 			strfry29.SetUpRelayDataDir()

pkg/relays/strfry29/install.go

@@ -12,84 +12,95 @@ import (
 	"path/filepath"
 )
 
-// Function to download and make the binary and plugin binary executable
-func InstallRelayBinary() {
-	downloadSpinner, _ := pterm.DefaultSpinner.Start(fmt.Sprintf("Downloading %s binaries...", RelayName))
+// TODO
+// Abstract this even more
 
+func cloneTmpGitRepo() {
 	// Check for and remove existing git repository
 	directories.RemoveDirectory(GitRepoTmpDirPath)
 
 	// Download git repository
 	git.Clone(GitRepoBranch, GitRepoURL, GitRepoTmpDirPath)
 
 	directories.SetPermissions(GitRepoTmpDirPath, 0755)
+}
 
-	// Install
-	// Determine the file name from the URL
-	tmpBinaryFileName := filepath.Base(DownloadURL)
+// Determine the temporary file name from the provided path
+func tmpFilePathFromFilePath(path string) string {
+	tmpFileName := filepath.Base(path)
 
-	// Temporary file path
-	tmpBinaryFilePath := fmt.Sprintf("%s/%s", relays.TmpDirPath, tmpBinaryFileName)
+	tmpFilePath := fmt.Sprintf("%s/%s", relays.TmpDirPath, tmpFileName)
 
-	// Check if the temporary file exists and remove it if it does
-	files.RemoveFile(tmpBinaryFilePath)
+	return tmpFilePath
+}
 
-	// Download and copy the file
-	files.DownloadAndCopyFile(tmpBinaryFilePath, DownloadURL)
+func installRelayBinary(compressedBinaryFilePath, binaryName string) {
+	// Extract relay binary
+	files.ExtractFile(compressedBinaryFilePath, relays.BinaryDestDir)
 
-	// Determine the file name from the URL
-	tmpBinaryPluginFileName := filepath.Base(BinaryPluginDownloadURL)
+	// TODO
+	// Currently, the downloaded binary is expected to have a name that matches the binaryName variable
+	// Ideally, the extracted binary file should be renamed to match the binaryName variable
 
-	// Temporary file path
-	tmpBinaryPluginFilePath := fmt.Sprintf("%s/%s", relays.TmpDirPath, tmpBinaryPluginFileName)
+	// Define the final destination path
+	destPath := filepath.Join(relays.BinaryDestDir, binaryName)
 
-	// Check if the temporary file exists and remove it if it does
-	files.RemoveFile(tmpBinaryPluginFilePath)
+	// Make the file executable
+	files.SetPermissions(destPath, 0755)
+}
 
-	// Download and copy the file
-	files.DownloadAndCopyFile(tmpBinaryPluginFilePath, BinaryPluginDownloadURL)
+// Function to download and make the binary and plugin binary executable
+func InstallRelayBinaries() {
+	pterm.Println()
+	relayBinaryCheckSpinner, _ := pterm.DefaultSpinner.Start(fmt.Sprintf("Checking for existing %s binary...", BinaryName))
 
-	downloadSpinner.Success(fmt.Sprintf("%s binaries downloaded", RelayName))
+	cloneTmpGitRepo()
 
-	// Verify relay binary
-	verification.VerifyRelayBinary(BinaryName, tmpBinaryFilePath)
+	// Check if the service file exists and disable and stop the service if it does
+	systemd.DisableAndStopService(ServiceFilePath, ServiceName)
 
-	// Verify relay binary plugin
-	verification.VerifyRelayBinary(fmt.Sprintf("%s plugin", RelayName), tmpBinaryPluginFilePath)
+	// Check if relay binary exists
+	if !files.FileExists(BinaryFilePath) {
+		relayBinaryCheckSpinner.Info(fmt.Sprintf("%s binary not found", BinaryName))
+		pterm.Println()
 
-	installSpinner, _ := pterm.DefaultSpinner.Start(fmt.Sprintf("Installing %s binaries...", RelayName))
+		// Determine the temporary file path
+		tmpCompressedBinaryFilePath := tmpFilePathFromFilePath(DownloadURL)
 
-	// Check if the service file exists and disable and stop the service if it does
-	if files.FileExists(ServiceFilePath) {
-		// Disable and stop the Nostr relay service
-		installSpinner.UpdateText("Disabling and stopping service...")
-		systemd.DisableService(ServiceName)
-		systemd.StopService(ServiceName)
-	} else {
-		installSpinner.UpdateText("Service file not found...")
-	}
+		// Check if the temporary file exists and remove it if it does
+		files.RemoveFile(tmpCompressedBinaryFilePath)
 
-	// Extract relay binary
-	files.ExtractFile(tmpBinaryFilePath, relays.BinaryDestDir)
+		// Download and copy the file
+		downloadSpinner, _ := pterm.DefaultSpinner.Start(fmt.Sprintf("Downloading %s binary...", BinaryName))
+		files.DownloadAndCopyFile(tmpCompressedBinaryFilePath, DownloadURL)
+		downloadSpinner.Success(fmt.Sprintf("%s binary downloaded", BinaryName))
 
-	// Extract relay binary plugin
-	files.ExtractFile(tmpBinaryPluginFilePath, relays.BinaryDestDir)
+		// Verify relay binary
+		verification.VerifyRelayBinary(BinaryName, tmpCompressedBinaryFilePath)
 
-	// TODO
-	// Currently, the downloaded binary is expected to have a name that matches the BinaryName variable
-	// Ideally, the extracted binary file should be renamed to match the BinaryName variable
+		installSpinner, _ := pterm.DefaultSpinner.Start(fmt.Sprintf("Installing %s binary...", BinaryName))
+		installRelayBinary(tmpCompressedBinaryFilePath, BinaryName)
+		installSpinner.Success(fmt.Sprintf("%s binary installed", BinaryName))
+	} else {
+		relayBinaryCheckSpinner.Info(fmt.Sprintf("%s binary found", BinaryName))
+		pterm.Println()
+	}
 
-	// Define the final destination path
-	destPath := filepath.Join(relays.BinaryDestDir, BinaryName)
+	// Determine the temporary file path
+	tmpCompressedBinaryPluginFilePath := tmpFilePathFromFilePath(BinaryPluginDownloadURL)
 
-	// Make the file executable
-	files.SetPermissions(destPath, 0755)
+	// Check if the temporary file exists and remove it if it does
+	files.RemoveFile(tmpCompressedBinaryPluginFilePath)
 
-	// Define the final destination path
-	destPath = filepath.Join(relays.BinaryDestDir, BinaryPluginName)
+	// Download and copy the file
+	binaryPluginDownloadSpinner, _ := pterm.DefaultSpinner.Start(fmt.Sprintf("Downloading %s plugin binary...", BinaryPluginName))
+	files.DownloadAndCopyFile(tmpCompressedBinaryPluginFilePath, BinaryPluginDownloadURL)
+	binaryPluginDownloadSpinner.Success(fmt.Sprintf("%s plugin binary downloaded", BinaryPluginName))
 
-	// Make the file executable
-	files.SetPermissions(destPath, 0755)
+	// Verify relay binary plugin
+	verification.VerifyRelayBinary(fmt.Sprintf("%s plugin", BinaryPluginName), tmpCompressedBinaryPluginFilePath)
 
-	installSpinner.Success(fmt.Sprintf("%s binaries installed", RelayName))
+	binaryPluginInstallSpinner, _ := pterm.DefaultSpinner.Start(fmt.Sprintf("Installing %s plugin binary...", BinaryPluginName))
+	installRelayBinary(tmpCompressedBinaryPluginFilePath, BinaryPluginName)
+	binaryPluginInstallSpinner.Success(fmt.Sprintf("%s plugin binary installed", BinaryPluginName))
 }

pkg/utils/systemd/utils.go

@@ -2,6 +2,7 @@ package systemd
 
 import (
 	"fmt"
+	"github.com/nodetec/rwz/pkg/utils/files"
 	"github.com/pterm/pterm"
 	"os"
 	"os/exec"
@@ -100,3 +101,10 @@ func RestartService(name string) {
 		os.Exit(1)
 	}
 }
+
+func DisableAndStopService(path, name string) {
+	if files.FileExists(path) {
+		DisableService(name)
+		StopService(name)
+	}
+}