Add msi builder for windows (#50)

Tells playit program to use platform specific config path by default unless a local playit.toml file is present

* Use config path and add wix to build msi

* Move Directory def

* wix: Try fixes

* wix: register key for app data folder

* wix: set product id and ref component

* wix: add start menu shortcut

* wix: fix path name for shortcut

* wix: fix shortcut?

* github actions: add wix builder for windows

* Fix install command

* github actions: fix windows msi asset path

.github/workflows/build-release.yml

@@ -38,16 +38,6 @@ jobs:
             apt_install: gcc-arm-linux-gnueabihf
             artifact: playit-linux-armv7
 
-          - name: windows 32bit
-            os: windows-latest
-            arch: i686-pc-windows-msvc
-            artifact: playit-windows-i686.exe
-
-          - name: windows 64bit
-            os: windows-latest
-            arch: x86_64-pc-windows-msvc
-            artifact: playit-windows-amd64.exe
-
     runs-on: ${{ matrix.platform.os }}
     steps:
       - uses: actions/checkout@v3
@@ -72,24 +62,71 @@ jobs:
           command: build
           args: --target ${{ matrix.platform.arch }} --release --all
 
+      - name: Upload Binary
+        if: matrix.platform.os != 'windows-latest'
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./target/${{ matrix.platform.arch }}/release/playit-cli
+          asset_name: ${{ matrix.platform.artifact }}
+          asset_content_type: application/octet-stream
+  windows_build:
+    strategy:
+      fail-fast: false
+      matrix:
+        platform:
+          - name: windows 32bit
+            os: windows-latest
+            arch: i686-pc-windows-msvc
+            artifact: playit-windows-x86
+            arch_code: x86
+          - name: windows 64bit
+            os: windows-latest
+            arch: x86_64-pc-windows-msvc
+            artifact: playit-windows-x86_64
+            arch_code: x86_64
+    runs-on: ${{ matrix.platform.os }}
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Get release
+        id: get_release
+        uses: bruceadams/[email protected]
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+
+      - name: Setup MSBuild
+        uses: microsoft/setup-msbuild@v1
+
+      - name: Set path for candle and light
+        run: echo "C:\Program Files (x86)\WiX Toolset v3.11\bin" >> $GITHUB_PATH
+        shell: bash
+
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: ${{ matrix.platform.arch }}
+
+      - run: cargo install cargo-wix
+      - run: cargo wix --target ${{ matrix.platform.arch }} --package playit-cli --nocapture
+
       - name: Upload .exe
-        if: matrix.platform.os == 'windows-latest'
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ github.token }}
         with:
           upload_url: ${{ steps.get_release.outputs.upload_url }}
           asset_path: ./target/${{ matrix.platform.arch }}/release/playit-cli.exe
-          asset_name: ${{ matrix.platform.artifact }}
+          asset_name: ${{ matrix.platform.artifact }}.exe
           asset_content_type: application/octet-stream
 
-      - name: Upload Binary
-        if: matrix.platform.os != 'windows-latest'
+      - name: Upload .msi
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ github.token }}
         with:
           upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ./target/${{ matrix.platform.arch }}/release/playit-cli
-          asset_name: ${{ matrix.platform.artifact }}
+          asset_path: ./target/wix/playit-cli-*-${{ matrix.platform.arch_code }}.msi
+          asset_name: ${{ matrix.platform.artifact }}.msi
           asset_content_type: application/octet-stream

packages/agent_cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "playit-cli"
-version = "1.0.0-rc7"
+version = "0.10.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -20,6 +20,10 @@ clap = { version = "4.4", features = ["derive"] }
 urlencoding = "2.1"
 serde_yaml = "0.9"
 crossterm = "0.26"
+dirs = "5.0.1"
 
 playit-agent-core = { path = "../agent_core" }
-playit-agent-proto = { path = "../agent_proto" }
+playit-agent-proto = { path = "../agent_proto" }
+
+[target.'cfg(windows)'.build-dependencies]
+winres = "0.1"

packages/agent_cli/build.rs

@@ -0,0 +1,10 @@
+#[cfg(windows)]
+fn main() {
+    let mut res = winres::WindowsResource::new();
+    res.set_icon("wix/Product.ico");
+    res.compile().unwrap();
+}
+
+#[cfg(not(windows))]
+fn main() {
+}

packages/agent_cli/src/autorun.rs

@@ -17,7 +17,7 @@ use crate::{match_ip::MatchIp, playit_secret::PlayitSecret, ui::UI, CliError};
 
 pub async fn autorun(ui: &mut UI, mut secret: PlayitSecret) -> Result<(), CliError> {
     let secret_code = secret
-        .with_default_path()
+        .with_default_path().await
         .ensure_valid(ui)
         .await?
         .get_or_setup(ui)

packages/agent_cli/src/main.rs

@@ -26,11 +26,9 @@ use crate::ui::UI;
 
 pub const API_BASE: &'static str = "https://api.playit.gg";
 
-// pub mod launch;
 pub mod util;
 pub mod autorun;
 pub mod playit_secret;
-pub mod playit_agent;
 pub mod match_ip;
 pub mod ui;
 

packages/agent_cli/src/playit_secret.rs

@@ -22,10 +22,26 @@ impl PlayitSecret {
         Ok(PlayitApi::create(API_BASE.to_string(), Some(secret)))
     }
 
-    pub fn with_default_path(&mut self) -> &mut Self {
-        if self.path.is_none() {
-            self.path.replace("playit.toml".to_string());
+    pub async fn with_default_path(&mut self) -> &mut Self {
+        if self.path.is_some() {
+            return self;
+        }
+
+        let config_path = dirs::config_local_dir();
+
+        if config_path.is_none() || tokio::fs::try_exists("playit.toml").await.unwrap_or(false) {
+            self.path = Some("playit.toml".to_string());
+            return self;
         }
+
+        let config_folder = format!("{}/playit_gg", config_path.unwrap().to_string_lossy());
+        if let Err(error) = tokio::fs::create_dir_all(&config_folder).await {
+            tracing::error!(?error, "failed to create configuration folder");
+            self.path = Some("playit.toml".to_string());
+            return self;
+        }
+
+        self.path = Some(format!("{}/playit.toml", config_folder));
         self
     }