fix: copy extension to resources folder

Author: bcho

standalone/src-tauri/build.rs

@@ -1,4 +1,4 @@
-use std::{env, fs, path::PathBuf};
+use std::{env, fs, path::PathBuf, process::Command};
 
 fn main() {
     prepare_sqlite_extension();
@@ -35,20 +35,33 @@ fn prepare_sqlite_extension() {
         target_dir.join(&profile).join(dylib_name),
     ];
 
-    let extension_path = candidates.into_iter().find(|path| path.exists()).unwrap_or_else(|| {
-        panic!(
-            "absurd_sqlite_extension artifact not found. Build it with `cargo build -p absurd_sqlite_extension --target {target_triple} {}` first.",
-            if profile == "debug" {
-                "".to_string()
-            } else {
-                format!("--profile {profile}")
-            }
-        );
-    });
-
-    let bin_dir = manifest_dir.join("bin");
-    fs::create_dir_all(&bin_dir).expect("create bin directory");
-    let dest = bin_dir.join(format!("absurd-extension-{}", target_triple));
+    if candidates.iter().all(|path| !path.exists()) {
+        let mut cmd = Command::new("cargo");
+        cmd.current_dir(workspace_root)
+            .args(["build", "-p", "absurd_sqlite_extension"])
+            .arg("--target")
+            .arg(&target_triple);
+        if profile != "debug" {
+            cmd.arg("--profile").arg(&profile);
+        }
+        let status = cmd
+            .status()
+            .expect("failed to invoke cargo build for absurd-sqlite-extension");
+        if !status.success() {
+            panic!("cargo build -p absurd-sqlite-extension failed");
+        }
+    }
+
+    let extension_path = candidates
+        .into_iter()
+        .find(|path| path.exists())
+        .unwrap_or_else(|| {
+            panic!("absurd_sqlite_extension artifact not found after build");
+        });
+
+    let resources_dir = manifest_dir.join("resources");
+    fs::create_dir_all(&resources_dir).expect("create resources directory");
+    let dest = resources_dir.join(dylib_name);
     fs::copy(&extension_path, &dest).expect("copy SQLite extension into resources");
     println!(
         "cargo:info=Copying absurd_sqlite_extension from {} to {}",

standalone/src-tauri/src/db.rs

@@ -106,18 +106,28 @@ impl DatabaseHandle {
     }
 }
 
-fn resolve_extension_path(_app_handle: &AppHandle) -> Option<PathBuf> {
-    let mut candidates: Vec<(&str, PathBuf)> = Vec::new();
-    match std::env::current_exe() {
-        Ok(current_exe) => {
-            if let Some(exe_dir) = current_exe.parent() {
-                candidates.push(("sidecar", exe_dir.join("absurd-extension")));
-                candidates.push(("sidecar bin", exe_dir.join("bin").join("absurd-extension")));
-            } else {
-                log::warn!("Failed to resolve current executable directory");
+fn resolve_extension_path(app_handle: &AppHandle) -> Option<PathBuf> {
+    let lib_name = extension_lib_name();
+    match app_handle.path().resource_dir() {
+        Ok(resource_dir) => {
+            let resource_path = resource_dir.join(&lib_name);
+            log::debug!(
+                "Checking resource SQLite extension at {}",
+                resource_path.display()
+            );
+            if resource_path.exists() {
+                log::info!(
+                    "Using resource SQLite extension at {}",
+                    resource_path.display()
+                );
+                return Some(resource_path);
             }
+            log::warn!(
+                "SQLite extension not found in resources at {}",
+                resource_path.display()
+            );
         }
-        Err(err) => log::warn!("Failed to resolve current executable path: {}", err),
+        Err(err) => log::warn!("Failed to resolve resource directory: {}", err),
     }
 
     let manifest_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
@@ -126,9 +136,10 @@ fn resolve_extension_path(_app_handle: &AppHandle) -> Option<PathBuf> {
         .and_then(Path::parent)
         .unwrap_or(&manifest_dir);
     let target_dir = workspace_root.join("target");
-    let lib_name = extension_lib_name();
-    candidates.push(("debug build", target_dir.join("debug").join(&lib_name)));
-    candidates.push(("release build", target_dir.join("release").join(&lib_name)));
+    let candidates = [
+        ("debug build", target_dir.join("debug").join(&lib_name)),
+        ("release build", target_dir.join("release").join(&lib_name)),
+    ];
 
     for (label, path) in candidates {
         log::debug!("Checking {} SQLite extension at {}", label, path.display());
@@ -139,7 +150,7 @@ fn resolve_extension_path(_app_handle: &AppHandle) -> Option<PathBuf> {
     }
 
     log::warn!(
-        "SQLite extension not found. Checked bundled resource and build outputs in {}",
+        "SQLite extension not found. Checked bundled resources and build outputs in {}",
         target_dir.display()
     );
     None

standalone/src-tauri/tauri.conf.json

@@ -25,8 +25,8 @@
   "bundle": {
     "active": true,
     "targets": "all",
-    "externalBin": [
-      "bin/absurd-extension"
+    "resources": [
+      "resources/*"
     ],
     "icon": [
       "icons/logo-32x32.png",