Merge branch 'main' into augustoccesar/improve-linux-support

# Conflicts:
#	linkup-cli/src/services/caddy.rs

Author: augustoccesar

.gitignore

@@ -1,3 +1,5 @@
+.DS_Store
+
 .idea
 .vscode
 

Cargo.lock

@@ -22,6 +22,7 @@ regex = "1.11.0"
 reqwest = { version = "0.12.8", default-features = false, features = [
     "blocking",
     "rustls-tls",
+    "json",
 ] }
 serde = "1.0.210"
 serde_json = "1.0.129"
@@ -33,6 +34,8 @@ base64 = "0.22.1"
 env_logger = "0.11.5"
 crossterm = "0.28.1"
 sysinfo = "0.32.1"
+tar = "0.4.43"
+flate2 = "1.0.35"
 
 [dev-dependencies]
 mockall = "0.13.0"

linkup-cli/Cargo.toml

@@ -0,0 +1,97 @@
+if command -v linkup &>/dev/null; then
+    echo "Linkup is already installed. To update it, run 'linkup update'."
+    exit 0
+fi
+
+# region: Dependencies
+# TODO: Maybe we want this script to be able to install the dependencies as well?
+if ! command -v cloudflared &>/dev/null; then
+    echo "WARN: 'cloudflared' is not installed. Some features will not work as expected. Please install it.\nFor more info check: https://developers.cloudflare.com/cloudflare-one/connections/connect-networks/downloads/"
+fi
+
+if ! command -v caddy &>/dev/null; then
+    echo "WARN: 'caddy' is not installed. Some features will not work as expected. Please install it.\nFor more info check: https://caddyserver.com/docs/install"
+fi
+
+if ! command -v dnsmasq &>/dev/null; then
+    echo "WARN: 'dnsmasq' is not installed. Some features will not work as expected. Please install it.\nFor more info check: https://thekelleys.org.uk/dnsmasq/doc.html"
+fi
+# endregion: Dependencies
+
+OS=$(uname -s)
+ARCH=$(uname -m)
+
+FETCH_OS=''
+FETCH_ARCH=''
+if [[ "$OS" == "Darwin"* ]]; then
+    FETCH_OS='apple-darwin'
+
+    if [[ "$ARCH" == "arm64" ]]; then
+        FETCH_ARCH='aarch64'
+    elif [[ "$arch" == "x86_64" ]]; then
+        FETCH_ARCH='x86_64'
+    fi
+elif [[ "$OS" == "Linux"* ]]; then
+    FETCH_OS='unknown-linux'
+
+    if [[ "$ARCH" == "arm64" ]]; then
+        FETCH_ARCH='aarch64'
+    elif [[ "$arch" == "x86_64" ]]; then
+        FETCH_ARCH='x86_64'
+    fi
+fi
+
+if [[ -z "$FETCH_OS" || -z "$FETCH_ARCH" ]]; then
+    echo "Unsupported OS/Arch combination: $OS/$ARCH"
+    exit 1
+fi
+
+LOOKUP_FILE_DOWNLOAD_URL="https://github.com/mentimeter/linkup/releases/download/.*/linkup-.*-$FETCH_ARCH-$FETCH_OS.tar.gz"
+FILE_DOWNLOAD_URL=$(
+    curl -sL \
+        -H "Accept: application/vnd.github+json" \
+        -H "X-GitHub-Api-Version: 2022-11-28" \
+        https://api.github.com/repos/mentimeter/linkup/releases/latest |
+        grep -Eio "$LOOKUP_FILE_DOWNLOAD_URL"
+)
+
+if [ -z "$FILE_DOWNLOAD_URL" ]; then
+    echo "Could not find file with pattern '$LOOKUP_FILE_DOWNLOAD_URL' on the latest GitHub release."
+    exit 1
+fi
+
+echo "Downloading: $FILE_DOWNLOAD_URL"
+curl -sLO --output-dir "/tmp" $FILE_DOWNLOAD_URL
+
+LOCAL_FILE_PATH="/tmp/$(basename $FILE_DOWNLOAD_URL)"
+
+echo "Decompressing $LOCAL_FILE_PATH"
+tar -xzf $LOCAL_FILE_PATH -C /tmp
+
+mkdir -p $HOME/.linkup/bin
+mv /tmp/linkup $HOME/.linkup/bin/
+echo "Linkup installed on $HOME/.linkup/bin/linkup"
+
+rm "$LOCAL_FILE_PATH"
+
+if [[ ":$PATH:" != *":$HOME/.linkup/bin:"* ]]; then
+    SHELL_NAME=$(basename "$SHELL")
+    case "$SHELL_NAME" in
+    bash)
+        PROFILE_FILE="$HOME/.bashrc"
+        ;;
+    zsh)
+        PROFILE_FILE="$HOME/.zshrc"
+        ;;
+    fish)
+        PROFILE_FILE="$HOME/.config/fish/config.fish"
+        ;;
+    *)
+        PROFILE_FILE="$HOME/.profile"
+        ;;
+    esac
+
+    echo "Adding Linkup bin to PATH in $PROFILE_FILE"
+    echo "\n# Linkup bin\nexport PATH=\$PATH:\$HOME/.linkup/bin" >>"$PROFILE_FILE"
+    echo "Please source your profile file or restart your terminal to apply the changes."
+fi

linkup-cli/install.sh

@@ -153,9 +153,18 @@ fn uninstall_resolvers(resolve_domains: &[String]) -> Result<()> {
     Ok(())
 }
 
-pub fn list_resolvers() -> Result<Vec<String>> {
-    let resolvers = fs::read_dir("/etc/resolver/")?
-        .map(|f| f.unwrap().file_name().into_string().unwrap())
+pub fn list_resolvers() -> std::result::Result<Vec<String>, std::io::Error> {
+    let resolvers_dir = match fs::read_dir("/etc/resolver/") {
+        Ok(read_dir) => read_dir,
+        Err(err) => match err.kind() {
+            std::io::ErrorKind::NotFound => return Ok(vec![]),
+            _ => return Err(err),
+        },
+    };
+
+    let resolvers = resolvers_dir
+        .filter_map(|entry| entry.ok())
+        .filter_map(|entry| entry.file_name().into_string().ok())
         .collect();
 
     Ok(resolvers)

linkup-cli/src/commands/local_dns.rs

@@ -9,6 +9,8 @@ pub mod server;
 pub mod start;
 pub mod status;
 pub mod stop;
+pub mod uninstall;
+pub mod update;
 
 pub use {completion::completion, completion::Args as CompletionArgs};
 pub use {health::health, health::Args as HealthArgs};
@@ -21,3 +23,5 @@ pub use {server::server, server::Args as ServerArgs};
 pub use {start::start, start::Args as StartArgs};
 pub use {status::status, status::Args as StatusArgs};
 pub use {stop::stop, stop::Args as StopArgs};
+pub use {uninstall::uninstall, uninstall::Args as UninstallArgs};
+pub use {update::update, update::Args as UpdateArgs};

linkup-cli/src/commands/mod.rs

@@ -9,20 +9,24 @@ use crate::{services, CliError};
 pub struct Args {}
 
 pub fn stop(_args: &Args, clear_env: bool) -> Result<(), CliError> {
-    let state = LocalState::load()?;
+    match (LocalState::load(), clear_env) {
+        (Ok(state), true) => {
+            // Reset env vars back to what they were before
+            for service in &state.services {
+                let remove_res = match &service.directory {
+                    Some(d) => remove_service_env(d.clone(), state.linkup.config_path.clone()),
+                    None => Ok(()),
+                };
 
-    if clear_env {
-        // Reset env vars back to what they were before
-        for service in &state.services {
-            let remove_res = match &service.directory {
-                Some(d) => remove_service_env(d.clone(), state.linkup.config_path.clone()),
-                None => Ok(()),
-            };
-
-            if let Err(e) = remove_res {
-                println!("Could not remove env for service {}: {}", service.name, e);
+                if let Err(e) = remove_res {
+                    println!("Could not remove env for service {}: {}", service.name, e);
+                }
             }
         }
+        (Ok(_), false) => (),
+        (Err(err), _) => {
+            log::warn!("Failed to fetch local state: {}", err);
+        }
     }
 
     services::LocalServer::new().stop().unwrap();