[POC] macOS support

.vscode/launch.json

@@ -13,17 +13,31 @@
             "build",
             "--manifest-path=./src-tauri/Cargo.toml",
             "--no-default-features"
-          ]
+          ],
         },
         // task for the `beforeDevCommand` if used, must be configured in `.vscode/tasks.json`
         "preLaunchTask": "ui:dev"
       },
+      {
+        "type": "lldb",
+        "request": "launch",
+        "name": "Tauri Development Debug yarn tauri dev",
+        "cargo": {
+          "args": [
+            "build",
+            "--manifest-path=./src-tauri/Cargo.toml",
+            "--no-default-features"
+          ],
+        },
+        // task for the `beforeDevCommand` if used, must be configured in `.vscode/tasks.json`
+        "postDebugTask": "ui:tauri-dev"
+      },
       {
         "type": "lldb",
         "request": "launch",
         "name": "Tauri Production Debug",
         "cargo": {
-          "args": ["build", "--release", "--manifest-path=./src-tauri/Cargo.toml"]
+          "args": ["build", "--release", "--manifest-path=./src-tauri/Cargo.toml"],
         },
         // task for the `beforeBuildCommand` if used, must be configured in `.vscode/tasks.json`
         "preLaunchTask": "ui:build"

.vscode/tasks.json

@@ -12,14 +12,33 @@
         "isBackground": true,
         // change this to your `beforeDevCommand`:
         "command": "yarn",
-        "args": ["dev"]
+        "args": ["dev"],
+      },
+      {
+        "label": "ui:tauri-dev",
+        "type": "shell",
+        // `dev` keeps running in the background
+        // ideally you should also configure a `problemMatcher`
+        // see https://code.visualstudio.com/docs/editor/tasks#_can-a-background-task-be-used-as-a-prelaunchtask-in-launchjson
+        "isBackground": true,
+        // change this to your `beforeDevCommand`:
+        "command": "yarn",
+        "args": ["tauri", "dev"],
+        "group": {
+          "kind": "test",
+          "isDefault": true,
+        }
       },
       {
         "label": "ui:build",
         "type": "shell",
         // change this to your `beforeBuildCommand`:
         "command": "yarn",
-        "args": ["build"]
+        "args": ["build"],
+        "group": {
+          "kind": "build",
+          "isDefault": true,
+        }
       }
     ]
   }

src-tauri/src/main.rs

@@ -61,8 +61,9 @@ async fn initialize_app(app: AppHandle) -> Result<(), String> {
 }
 
 #[command]
-fn launch_game(build_name: &str, language: &str, token: Option<&str>) -> Result<(), String> {
+fn launch_game(app: AppHandle, build_name: &str, language: &str, token: Option<&str>) -> Result<(), String> {
     let (flash_runtime_path, _) = get_platform_flash_runtime(&env::consts::OS)?;
+    emit_event(&app, "infoLog", ("Flash runtime path: ").to_string() + &flash_runtime_path.clone().into_os_string().into_string().unwrap());
 
     if !flash_runtime_path.exists() {
         eprintln!("cannot find file: {}", flash_runtime_path.display());

src-tauri/src/version_manager.rs

@@ -57,12 +57,22 @@ pub async fn download_runtime(
 }
 
 pub fn get_platform_flash_runtime(platform: &str) -> Result<(PathBuf, String), String> {
+    // NOTE: This match case was only meant to match darwin, but it is named macos (for a long time now)
     let flash_runtimes = match platform {
         "windows" => Ok("flashplayer.exe".to_string()),
-        "darwin" => Ok("flashplayer.dmg".to_string()),
+        "darwin" | "macos" => Ok("flashplayer.dmg".to_string()),
         "linux" => Ok("flashplayer".to_string()),
         _ => Err(format!("unsupported platform: {}", platform)),
     };
 
-    flash_runtimes.map(|runtime| (PathBuf::from(RUNTIMES_DIR).join(runtime.clone()), runtime))
+    flash_runtimes.map(|runtime| {
+        if matches!(platform, "darwin" | "macos") {
+            // Return path to the systems Flash Player explicitly
+            (PathBuf::from("/Applications/Flash Player.app/Contents/MacOS/Flash Player"), runtime)
+        }
+        else {
+            // Use RUNTIMES_DIR as usual
+            (PathBuf::from(RUNTIMES_DIR).join(runtime.clone()), runtime)
+        }
+    })
 }

src/lib/utils/invokeApiRequest.ts

@@ -9,6 +9,7 @@ import {
   type HttpVerb,
   ResponseType,
 } from "@tauri-apps/api/http";
+import { addInfoLog } from "$lib/stores/debugLogStore";
 
 /**
  * Represents a generic API response.

src/routes/+layout.svelte

@@ -34,8 +34,11 @@
 
   const initializeLauncher = async () => {
     try {
-      const [launcherVersionManifest, currentGameVersionManifest, _] =
-        await Promise.all([
+      const [
+        launcherVersionManifest,
+        currentGameVersionManifest,
+        _
+      ] = await Promise.all([
           getVersion(),
           invoke<string>("get_current_game_version"),
           invoke("initialize_app"),