Add chromium compatibility backend with per-app profiles
This commit is contained in:
51
README.md
51
README.md
@@ -91,6 +91,7 @@ flowchart TD
|
|||||||
|
|
||||||
- Requires Tauri/Linux system dependencies to be installed locally before `deskify build`
|
- Requires Tauri/Linux system dependencies to be installed locally before `deskify build`
|
||||||
- Generated app build success can vary by distro/system setup (WebKitGTK/Tauri prerequisites)
|
- Generated app build success can vary by distro/system setup (WebKitGTK/Tauri prerequisites)
|
||||||
|
- Some modern sites fail or degrade in the system WebView backend (`tauri`) due to engine/runtime differences
|
||||||
- No official cross-platform support (Windows/macOS) yet
|
- No official cross-platform support (Windows/macOS) yet
|
||||||
- GitHub Releases / binary automation for `deskify` itself may lag behind source updates during early MVP
|
- GitHub Releases / binary automation for `deskify` itself may lag behind source updates during early MVP
|
||||||
- DRM/protected-media services may not work reliably in the system WebView backend even if they work in a full browser (depends on WebView/DRM support)
|
- DRM/protected-media services may not work reliably in the system WebView backend even if they work in a full browser (depends on WebView/DRM support)
|
||||||
@@ -211,11 +212,20 @@ Once the build finishes, `ChatGPT` will instantly appear in your system Applicat
|
|||||||
|
|
||||||
`deskify` derives a safe internal ID from the app name (for example, `ChatGPT` becomes `chatgpt`).
|
`deskify` derives a safe internal ID from the app name (for example, `ChatGPT` becomes `chatgpt`).
|
||||||
|
|
||||||
|
### Backend Modes (`--backend`)
|
||||||
|
|
||||||
|
Deskify supports two backend modes:
|
||||||
|
|
||||||
|
- `tauri` (default): Uses the system WebView (`webkit2gtk` on Linux). Produces small wrappers and strong Linux desktop integration, but some sites may fail due to engine compatibility.
|
||||||
|
- `chromium`: Uses an already installed Chromium-based browser (`chromium`, `google-chrome`, `brave`, etc.) in app mode. Better site compatibility and no local Tauri build, but depends on a browser installed on the system.
|
||||||
|
|
||||||
|
If a site does not work in the default `tauri` backend, try `--backend chromium`.
|
||||||
|
|
||||||
#### Advanced Build Options
|
#### Advanced Build Options
|
||||||
```bash
|
```bash
|
||||||
deskify build \
|
deskify build \
|
||||||
--url "https://web.whatsapp.com" \
|
--url "https://example.com/dashboard" \
|
||||||
--name "WhatsApp" \
|
--name "Dashboard" \
|
||||||
--fullscreen \
|
--fullscreen \
|
||||||
--user-agent "Mozilla/5.0 (Windows NT 10.0; Win64; x64) Chrome/120.0.0.0 Safari/537.36" \
|
--user-agent "Mozilla/5.0 (Windows NT 10.0; Win64; x64) Chrome/120.0.0.0 Safari/537.36" \
|
||||||
--dark-mode \
|
--dark-mode \
|
||||||
@@ -240,6 +250,32 @@ Preview the generated Tauri config without building/installing:
|
|||||||
deskify build --url "https://chat.com" --name "Chat" --print-config
|
deskify build --url "https://chat.com" --name "Chat" --print-config
|
||||||
```
|
```
|
||||||
|
|
||||||
|
Chromium compatibility mode (no local Tauri build):
|
||||||
|
|
||||||
|
```bash
|
||||||
|
deskify build --url "https://mail.proton.me" --name "Proton Mail" --backend chromium
|
||||||
|
```
|
||||||
|
|
||||||
|
Chromium with shared browser profile (uses existing browser profile/session model):
|
||||||
|
|
||||||
|
```bash
|
||||||
|
deskify build \
|
||||||
|
--url "https://app.slack.com" \
|
||||||
|
--name "Slack" \
|
||||||
|
--backend chromium \
|
||||||
|
--profile-scope shared
|
||||||
|
```
|
||||||
|
|
||||||
|
Chromium with explicit browser binary:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
deskify build \
|
||||||
|
--url "https://github.com" \
|
||||||
|
--name "GitHub" \
|
||||||
|
--backend chromium \
|
||||||
|
--browser-bin /usr/bin/brave-browser
|
||||||
|
```
|
||||||
|
|
||||||
Preview planned actions only (dry run):
|
Preview planned actions only (dry run):
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
@@ -252,9 +288,17 @@ deskify build --url "https://chat.com" --name "Chat" --dry-run
|
|||||||
* `--user-agent <UA>`: Useful to bypass webview restrictions on certain platforms.
|
* `--user-agent <UA>`: Useful to bypass webview restrictions on certain platforms.
|
||||||
* `--dark-mode`: Forces the Tauri webview into a dark theme.
|
* `--dark-mode`: Forces the Tauri webview into a dark theme.
|
||||||
* `--width <PX>` / `--height <PX>`: Sets the startup resolution.
|
* `--width <PX>` / `--height <PX>`: Sets the startup resolution.
|
||||||
|
* `--backend <tauri|chromium>`: Choose system WebView (`tauri`) or Chromium app mode (`chromium`).
|
||||||
|
* `--browser-bin <PATH>`: Use a specific Chromium-based browser binary (Chromium backend only).
|
||||||
|
* `--profile-scope <isolated|shared>`: Chromium backend profile behavior (`isolated` creates a per-app profile under `~/.local/share/deskify/profiles/`).
|
||||||
* `--print-config`: Prints the generated `tauri.conf.json` and exits.
|
* `--print-config`: Prints the generated `tauri.conf.json` and exits.
|
||||||
* `--dry-run`: Shows planned actions without building/installing.
|
* `--dry-run`: Shows planned actions without building/installing.
|
||||||
|
|
||||||
|
Note for Chromium backend:
|
||||||
|
|
||||||
|
- `--no-decorations` is best-effort and may be ignored by the browser/window manager.
|
||||||
|
- `--width` and `--height` are applied together (`--window-size`) only when both are provided.
|
||||||
|
|
||||||
### Managing Apps (`list` & `remove`)
|
### Managing Apps (`list` & `remove`)
|
||||||
You can view all applications generated by `deskify`:
|
You can view all applications generated by `deskify`:
|
||||||
```bash
|
```bash
|
||||||
@@ -284,6 +328,7 @@ deskify update chat --url "https://chat.com" --name "Chat" --no-decorations
|
|||||||
```
|
```
|
||||||
|
|
||||||
Alpha note: `update` currently requires `--url` because Deskify does not persist app URLs/config metadata yet.
|
Alpha note: `update` currently requires `--url` because Deskify does not persist app URLs/config metadata yet.
|
||||||
|
`update <id>` keeps the existing internal ID stable even if you change the display name.
|
||||||
|
|
||||||
You can also preview an update:
|
You can also preview an update:
|
||||||
|
|
||||||
@@ -300,6 +345,8 @@ Check local prerequisites and common environment issues (Rust/Cargo, `cargo taur
|
|||||||
deskify doctor
|
deskify doctor
|
||||||
```
|
```
|
||||||
|
|
||||||
|
`doctor` also checks whether a Chromium-based browser is available in `PATH` for `--backend chromium`.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## 🧪 Manual Smoke Test Checklist (Before a Public Release)
|
## 🧪 Manual Smoke Test Checklist (Before a Public Release)
|
||||||
|
|||||||
493
src/main.rs
493
src/main.rs
@@ -4,6 +4,7 @@ use directories::BaseDirs;
|
|||||||
use image::{DynamicImage, ImageFormat};
|
use image::{DynamicImage, ImageFormat};
|
||||||
use regex::Regex;
|
use regex::Regex;
|
||||||
use serde_json::{Map, Value, json};
|
use serde_json::{Map, Value, json};
|
||||||
|
use std::env;
|
||||||
use std::fs;
|
use std::fs;
|
||||||
use std::io::Read;
|
use std::io::Read;
|
||||||
use std::path::{Path, PathBuf};
|
use std::path::{Path, PathBuf};
|
||||||
@@ -11,10 +12,23 @@ use std::process::Command;
|
|||||||
use tempfile::tempdir;
|
use tempfile::tempdir;
|
||||||
use url::Url;
|
use url::Url;
|
||||||
|
|
||||||
|
#[derive(clap::ValueEnum, Debug, Clone, Copy, PartialEq, Eq)]
|
||||||
|
enum Backend {
|
||||||
|
Tauri,
|
||||||
|
Chromium,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(clap::ValueEnum, Debug, Clone, Copy, PartialEq, Eq)]
|
||||||
|
enum ProfileScope {
|
||||||
|
Isolated,
|
||||||
|
Shared,
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
struct BuildArgs {
|
struct BuildArgs {
|
||||||
url: String,
|
url: String,
|
||||||
name: String,
|
name: String,
|
||||||
|
internal_id: String,
|
||||||
icon: Option<String>,
|
icon: Option<String>,
|
||||||
fullscreen: bool,
|
fullscreen: bool,
|
||||||
no_decorations: bool,
|
no_decorations: bool,
|
||||||
@@ -22,6 +36,9 @@ struct BuildArgs {
|
|||||||
width: Option<f64>,
|
width: Option<f64>,
|
||||||
height: Option<f64>,
|
height: Option<f64>,
|
||||||
dark_mode: bool,
|
dark_mode: bool,
|
||||||
|
backend: Backend,
|
||||||
|
browser_bin: Option<String>,
|
||||||
|
profile_scope: ProfileScope,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Deskify - Turn any URL into a native Linux desktop application using Tauri.
|
/// Deskify - Turn any URL into a native Linux desktop application using Tauri.
|
||||||
@@ -72,6 +89,18 @@ enum Commands {
|
|||||||
#[arg(short, long)]
|
#[arg(short, long)]
|
||||||
dark_mode: bool,
|
dark_mode: bool,
|
||||||
|
|
||||||
|
/// Backend to use for the generated app
|
||||||
|
#[arg(long, value_enum, default_value_t = Backend::Tauri)]
|
||||||
|
backend: Backend,
|
||||||
|
|
||||||
|
/// Path to a Chromium-based browser binary (only for `--backend chromium`)
|
||||||
|
#[arg(long)]
|
||||||
|
browser_bin: Option<String>,
|
||||||
|
|
||||||
|
/// Profile isolation for Chromium backend (only for `--backend chromium`)
|
||||||
|
#[arg(long, value_enum, default_value_t = ProfileScope::Isolated)]
|
||||||
|
profile_scope: ProfileScope,
|
||||||
|
|
||||||
/// Print the generated Tauri config JSON and exit
|
/// Print the generated Tauri config JSON and exit
|
||||||
#[arg(long)]
|
#[arg(long)]
|
||||||
print_config: bool,
|
print_config: bool,
|
||||||
@@ -130,6 +159,18 @@ enum Commands {
|
|||||||
#[arg(short, long)]
|
#[arg(short, long)]
|
||||||
dark_mode: bool,
|
dark_mode: bool,
|
||||||
|
|
||||||
|
/// Backend to use for the updated app
|
||||||
|
#[arg(long, value_enum, default_value_t = Backend::Tauri)]
|
||||||
|
backend: Backend,
|
||||||
|
|
||||||
|
/// Path to a Chromium-based browser binary (only for `--backend chromium`)
|
||||||
|
#[arg(long)]
|
||||||
|
browser_bin: Option<String>,
|
||||||
|
|
||||||
|
/// Profile isolation for Chromium backend (only for `--backend chromium`)
|
||||||
|
#[arg(long, value_enum, default_value_t = ProfileScope::Isolated)]
|
||||||
|
profile_scope: ProfileScope,
|
||||||
|
|
||||||
/// Show planned update actions without rebuilding/installing
|
/// Show planned update actions without rebuilding/installing
|
||||||
#[arg(long)]
|
#[arg(long)]
|
||||||
dry_run: bool,
|
dry_run: bool,
|
||||||
@@ -163,6 +204,13 @@ fn validate_remove_id(id: &str) -> Result<()> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn profile_scope_str(scope: ProfileScope) -> &'static str {
|
||||||
|
match scope {
|
||||||
|
ProfileScope::Isolated => "isolated",
|
||||||
|
ProfileScope::Shared => "shared",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fn build_tauri_config_value(args: &BuildArgs, safe_identifier: &str, bundle_active: bool) -> Value {
|
fn build_tauri_config_value(args: &BuildArgs, safe_identifier: &str, bundle_active: bool) -> Value {
|
||||||
let mut window_config = Map::<String, Value>::new();
|
let mut window_config = Map::<String, Value>::new();
|
||||||
window_config.insert("title".to_string(), json!(args.name));
|
window_config.insert("title".to_string(), json!(args.name));
|
||||||
@@ -207,27 +255,188 @@ fn build_tauri_config_value(args: &BuildArgs, safe_identifier: &str, bundle_acti
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn desktop_exec_escape(arg: &str) -> String {
|
||||||
|
if arg.is_empty() {
|
||||||
|
return "\"\"".to_string();
|
||||||
|
}
|
||||||
|
|
||||||
|
let needs_quotes = arg
|
||||||
|
.chars()
|
||||||
|
.any(|c| c.is_whitespace() || c == '"' || c == '\\');
|
||||||
|
if !needs_quotes {
|
||||||
|
return arg.to_string();
|
||||||
|
}
|
||||||
|
|
||||||
|
let escaped = arg.replace('\\', "\\\\").replace('"', "\\\"");
|
||||||
|
format!("\"{}\"", escaped)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn desktop_exec_join(args: &[String]) -> String {
|
||||||
|
args.iter()
|
||||||
|
.map(|arg| desktop_exec_escape(arg))
|
||||||
|
.collect::<Vec<_>>()
|
||||||
|
.join(" ")
|
||||||
|
}
|
||||||
|
|
||||||
|
fn chromium_candidates() -> &'static [&'static str] {
|
||||||
|
&[
|
||||||
|
"google-chrome",
|
||||||
|
"chromium",
|
||||||
|
"chromium-browser",
|
||||||
|
"brave-browser",
|
||||||
|
"vivaldi",
|
||||||
|
"microsoft-edge",
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
fn find_binary_in_path(name: &str) -> Option<PathBuf> {
|
||||||
|
let path_var = env::var_os("PATH")?;
|
||||||
|
for dir in env::split_paths(&path_var) {
|
||||||
|
let candidate = dir.join(name);
|
||||||
|
if candidate.is_file() {
|
||||||
|
return Some(candidate);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
|
fn resolve_chromium_binary(explicit: Option<&str>) -> Result<PathBuf> {
|
||||||
|
if let Some(path) = explicit {
|
||||||
|
let candidate = PathBuf::from(path);
|
||||||
|
if candidate.is_file() {
|
||||||
|
return Ok(candidate);
|
||||||
|
}
|
||||||
|
return Err(anyhow!(
|
||||||
|
"Specified browser binary does not exist or is not a file: {}",
|
||||||
|
candidate.display()
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
for candidate in chromium_candidates() {
|
||||||
|
if let Some(path) = find_binary_in_path(candidate) {
|
||||||
|
return Ok(path);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Err(anyhow!(
|
||||||
|
"No Chromium-based browser found in PATH. Install Chromium/Chrome/Brave or use --browser-bin /path/to/browser."
|
||||||
|
))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn chromium_profile_dir(internal_id: &str) -> Result<PathBuf> {
|
||||||
|
validate_remove_id(internal_id)?;
|
||||||
|
let base_dirs = BaseDirs::new().ok_or_else(|| anyhow!("Could not find system BaseDirs"))?;
|
||||||
|
Ok(base_dirs
|
||||||
|
.data_local_dir()
|
||||||
|
.join("deskify")
|
||||||
|
.join("profiles")
|
||||||
|
.join(internal_id))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn chromium_window_size_arg(width: Option<f64>, height: Option<f64>) -> Option<String> {
|
||||||
|
match (width, height) {
|
||||||
|
(Some(w), Some(h)) => Some(format!("--window-size={},{}", w as i64, h as i64)),
|
||||||
|
_ => None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn build_chromium_exec(
|
||||||
|
args: &BuildArgs,
|
||||||
|
browser_path: &Path,
|
||||||
|
profile_dir: Option<&Path>,
|
||||||
|
) -> String {
|
||||||
|
let mut parts = vec![browser_path.display().to_string()];
|
||||||
|
parts.push("--no-first-run".to_string());
|
||||||
|
parts.push("--no-default-browser-check".to_string());
|
||||||
|
parts.push(format!("--class={}", args.internal_id));
|
||||||
|
parts.push(format!("--app={}", args.url));
|
||||||
|
|
||||||
|
if let Some(profile_dir) = profile_dir {
|
||||||
|
parts.push(format!("--user-data-dir={}", profile_dir.display()));
|
||||||
|
}
|
||||||
|
if args.fullscreen {
|
||||||
|
parts.push("--start-fullscreen".to_string());
|
||||||
|
}
|
||||||
|
if let Some(window_size) = chromium_window_size_arg(args.width, args.height) {
|
||||||
|
parts.push(window_size);
|
||||||
|
}
|
||||||
|
if let Some(user_agent) = &args.user_agent {
|
||||||
|
parts.push(format!("--user-agent={}", user_agent));
|
||||||
|
}
|
||||||
|
if args.dark_mode {
|
||||||
|
parts.push("--force-dark-mode".to_string());
|
||||||
|
}
|
||||||
|
|
||||||
|
desktop_exec_join(&parts)
|
||||||
|
}
|
||||||
|
|
||||||
fn print_generated_config(args: &BuildArgs) -> Result<()> {
|
fn print_generated_config(args: &BuildArgs) -> Result<()> {
|
||||||
let safe_identifier = sanitize_app_id(&args.name);
|
match args.backend {
|
||||||
let config = build_tauri_config_value(args, &safe_identifier, false);
|
Backend::Tauri => {
|
||||||
|
let config = build_tauri_config_value(args, &args.internal_id, false);
|
||||||
println!(
|
println!(
|
||||||
"{}",
|
"{}",
|
||||||
serde_json::to_string_pretty(&config).context("Failed to serialize generated config")?
|
serde_json::to_string_pretty(&config)
|
||||||
|
.context("Failed to serialize generated config")?
|
||||||
);
|
);
|
||||||
|
}
|
||||||
|
Backend::Chromium => {
|
||||||
|
let browser = resolve_chromium_binary(args.browser_bin.as_deref())?;
|
||||||
|
let profile_dir = chromium_profile_dir(&args.internal_id)?;
|
||||||
|
let profile_dir = match args.profile_scope {
|
||||||
|
ProfileScope::Isolated => Some(profile_dir),
|
||||||
|
ProfileScope::Shared => None,
|
||||||
|
};
|
||||||
|
let exec = build_chromium_exec(args, &browser, profile_dir.as_deref());
|
||||||
|
let value = json!({
|
||||||
|
"backend": "chromium",
|
||||||
|
"name": args.name,
|
||||||
|
"id": args.internal_id,
|
||||||
|
"url": args.url,
|
||||||
|
"browser": browser.display().to_string(),
|
||||||
|
"profileScope": profile_scope_str(args.profile_scope),
|
||||||
|
"exec": exec,
|
||||||
|
});
|
||||||
|
println!(
|
||||||
|
"{}",
|
||||||
|
serde_json::to_string_pretty(&value)
|
||||||
|
.context("Failed to serialize generated config")?
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn print_build_plan(action: &str, args: &BuildArgs, existing_id: Option<&str>) {
|
fn print_build_plan(action: &str, args: &BuildArgs, existing_id: Option<&str>) {
|
||||||
let safe_name = sanitize_app_id(&args.name);
|
let id = existing_id.unwrap_or(&args.internal_id);
|
||||||
println!("{} plan:", action);
|
println!("{} plan:", action);
|
||||||
if let Some(id) = existing_id {
|
if let Some(id) = existing_id {
|
||||||
println!("- Existing app ID: {}", id);
|
println!("- Existing app ID: {}", id);
|
||||||
}
|
}
|
||||||
println!("- URL: {}", args.url);
|
println!("- URL: {}", args.url);
|
||||||
println!("- Name: {}", args.name);
|
println!("- Name: {}", args.name);
|
||||||
println!("- New internal ID: {}", safe_name);
|
println!("- Internal ID: {}", id);
|
||||||
|
match args.backend {
|
||||||
|
Backend::Tauri => {
|
||||||
|
println!("- Backend: tauri (system WebView)");
|
||||||
println!("- Local build: cargo tauri build (temporary generated project)");
|
println!("- Local build: cargo tauri build (temporary generated project)");
|
||||||
println!("- Install targets: local binary + XDG icon + .desktop entry");
|
println!("- Install targets: local binary + XDG icon + .desktop entry");
|
||||||
|
}
|
||||||
|
Backend::Chromium => {
|
||||||
|
println!("- Backend: chromium (installed browser runtime)");
|
||||||
|
println!("- Local build: none");
|
||||||
|
println!("- Install targets: XDG icon + .desktop entry (+ optional isolated profile)");
|
||||||
|
println!("- Profile scope: {}", profile_scope_str(args.profile_scope));
|
||||||
|
if let Some(path) = &args.browser_bin {
|
||||||
|
println!("- Browser binary: {}", path);
|
||||||
|
} else {
|
||||||
|
println!("- Browser binary: auto-detect from PATH");
|
||||||
|
}
|
||||||
|
if args.no_decorations {
|
||||||
|
println!("- Note: --no-decorations is not guaranteed in Chromium app mode");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
if args.fullscreen {
|
if args.fullscreen {
|
||||||
println!("- Window: fullscreen enabled");
|
println!("- Window: fullscreen enabled");
|
||||||
}
|
}
|
||||||
@@ -402,8 +611,6 @@ fn main() {
|
|||||||
fs::write(src_dir.join("main.rs"), main_rs).context("Failed to write src/main.rs")?;
|
fs::write(src_dir.join("main.rs"), main_rs).context("Failed to write src/main.rs")?;
|
||||||
|
|
||||||
// 4. tauri.conf.json
|
// 4. tauri.conf.json
|
||||||
let safe_identifier = sanitize_app_id(&args.name);
|
|
||||||
|
|
||||||
let dist_dir = project_dir.join("dist");
|
let dist_dir = project_dir.join("dist");
|
||||||
fs::create_dir_all(&dist_dir).context("Failed to create dist directory")?;
|
fs::create_dir_all(&dist_dir).context("Failed to create dist directory")?;
|
||||||
fs::write(
|
fs::write(
|
||||||
@@ -417,7 +624,7 @@ fn main() {
|
|||||||
|
|
||||||
fetch_or_create_icon(&args.url, args.icon.as_ref(), &icons_dir.join("icon.png"))?;
|
fetch_or_create_icon(&args.url, args.icon.as_ref(), &icons_dir.join("icon.png"))?;
|
||||||
|
|
||||||
let tauri_conf = build_tauri_config_value(args, &safe_identifier, false);
|
let tauri_conf = build_tauri_config_value(args, &args.internal_id, false);
|
||||||
fs::write(
|
fs::write(
|
||||||
project_dir.join("tauri.conf.json"),
|
project_dir.join("tauri.conf.json"),
|
||||||
serde_json::to_string_pretty(&tauri_conf).context("Failed to serialize tauri.conf.json")?,
|
serde_json::to_string_pretty(&tauri_conf).context("Failed to serialize tauri.conf.json")?,
|
||||||
@@ -466,9 +673,7 @@ fn build_project(project_dir: &Path) -> Result<PathBuf> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn install_app(name: &str, bin_path: &Path, project_dir: &Path) -> Result<()> {
|
fn desktop_paths(internal_id: &str) -> Result<(PathBuf, PathBuf, PathBuf, PathBuf)> {
|
||||||
let safe_name = sanitize_app_id(name);
|
|
||||||
|
|
||||||
let base_dirs =
|
let base_dirs =
|
||||||
BaseDirs::new().ok_or_else(|| anyhow!("Could not find system BaseDirs (e.g. $HOME)"))?;
|
BaseDirs::new().ok_or_else(|| anyhow!("Could not find system BaseDirs (e.g. $HOME)"))?;
|
||||||
let data_local_dir = base_dirs.data_local_dir(); // Usually ~/.local/share
|
let data_local_dir = base_dirs.data_local_dir(); // Usually ~/.local/share
|
||||||
@@ -480,23 +685,46 @@ fn install_app(name: &str, bin_path: &Path, project_dir: &Path) -> Result<()> {
|
|||||||
base_dirs.home_dir().join(".local/bin")
|
base_dirs.home_dir().join(".local/bin")
|
||||||
});
|
});
|
||||||
|
|
||||||
|
let applications_dir = data_local_dir.join("applications");
|
||||||
|
let icon_dir = data_local_dir.join("icons/hicolor/128x128/apps");
|
||||||
|
let target_bin = executable_dir.join(internal_id);
|
||||||
|
let target_icon = icon_dir.join(format!("{}.png", internal_id));
|
||||||
|
let desktop_file_path = applications_dir.join(format!("{}.desktop", internal_id));
|
||||||
|
|
||||||
|
Ok((
|
||||||
|
target_bin,
|
||||||
|
target_icon,
|
||||||
|
desktop_file_path,
|
||||||
|
data_local_dir.to_path_buf(),
|
||||||
|
))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn install_tauri_app(args: &BuildArgs, bin_path: &Path, project_dir: &Path) -> Result<()> {
|
||||||
|
let (target_bin, target_icon, desktop_file_path, _data_local_dir) =
|
||||||
|
desktop_paths(&args.internal_id)?;
|
||||||
|
let executable_dir = target_bin
|
||||||
|
.parent()
|
||||||
|
.ok_or_else(|| anyhow!("Invalid executable target path"))?;
|
||||||
|
let icon_dir = target_icon
|
||||||
|
.parent()
|
||||||
|
.ok_or_else(|| anyhow!("Invalid icon target path"))?;
|
||||||
|
let applications_dir = desktop_file_path
|
||||||
|
.parent()
|
||||||
|
.ok_or_else(|| anyhow!("Invalid applications target path"))?;
|
||||||
|
|
||||||
// 1. Move binary
|
// 1. Move binary
|
||||||
fs::create_dir_all(&executable_dir).context("Failed to create ~/.local/bin directory")?;
|
fs::create_dir_all(executable_dir).context("Failed to create ~/.local/bin directory")?;
|
||||||
let target_bin = executable_dir.join(&safe_name);
|
|
||||||
fs::copy(bin_path, &target_bin).context("Failed to move binary to installation directory")?;
|
fs::copy(bin_path, &target_bin).context("Failed to move binary to installation directory")?;
|
||||||
|
|
||||||
// 2. Install Icon
|
// 2. Install Icon
|
||||||
let icon_dir = data_local_dir.join("icons/hicolor/128x128/apps");
|
fs::create_dir_all(icon_dir).context("Failed to create icons directory")?;
|
||||||
fs::create_dir_all(&icon_dir).context("Failed to create icons directory")?;
|
|
||||||
let target_icon = icon_dir.join(format!("{}.png", safe_name));
|
|
||||||
let source_icon = project_dir.join("icons/icon.png");
|
let source_icon = project_dir.join("icons/icon.png");
|
||||||
if source_icon.exists() {
|
if source_icon.exists() {
|
||||||
let _ = fs::copy(&source_icon, &target_icon);
|
let _ = fs::copy(&source_icon, &target_icon);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 3. Create .desktop file
|
// 3. Create .desktop file
|
||||||
let applications_dir = data_local_dir.join("applications");
|
fs::create_dir_all(applications_dir).context("Failed to create applications directory")?;
|
||||||
fs::create_dir_all(&applications_dir).context("Failed to create applications directory")?;
|
|
||||||
|
|
||||||
let desktop_entry = format!(
|
let desktop_entry = format!(
|
||||||
r#"
|
r#"
|
||||||
@@ -510,22 +738,106 @@ Terminal=false
|
|||||||
Type=Application
|
Type=Application
|
||||||
Categories=Network;WebBrowser;
|
Categories=Network;WebBrowser;
|
||||||
X-Deskify-Managed=true
|
X-Deskify-Managed=true
|
||||||
|
X-Deskify-Backend=tauri
|
||||||
"#,
|
"#,
|
||||||
name,
|
args.name,
|
||||||
target_bin.to_string_lossy(),
|
target_bin.to_string_lossy(),
|
||||||
safe_name, // Icon name
|
args.internal_id, // Icon name
|
||||||
safe_name // Window class for wayland/x11 proper grouping
|
args.internal_id // Window class for wayland/x11 proper grouping
|
||||||
);
|
);
|
||||||
|
|
||||||
let desktop_file_path = applications_dir.join(format!("{}.desktop", safe_name));
|
|
||||||
fs::write(&desktop_file_path, desktop_entry.trim()).context("Failed to write .desktop file")?;
|
fs::write(&desktop_file_path, desktop_entry.trim()).context("Failed to write .desktop file")?;
|
||||||
|
|
||||||
println!("App successfully installed!");
|
println!("App successfully installed!");
|
||||||
println!("You can now launch '{}' from your application menu.", name);
|
println!(
|
||||||
|
"You can now launch '{}' from your application menu.",
|
||||||
|
args.name
|
||||||
|
);
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn install_chromium_app(args: &BuildArgs) -> Result<()> {
|
||||||
|
let browser = resolve_chromium_binary(args.browser_bin.as_deref())?;
|
||||||
|
let profile_dir = match args.profile_scope {
|
||||||
|
ProfileScope::Isolated => Some(chromium_profile_dir(&args.internal_id)?),
|
||||||
|
ProfileScope::Shared => None,
|
||||||
|
};
|
||||||
|
|
||||||
|
if matches!((args.width, args.height), (Some(_), None) | (None, Some(_))) {
|
||||||
|
eprintln!(
|
||||||
|
"Warning: Chromium backend requires both --width and --height for --window-size; ignoring partial size override."
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if args.no_decorations {
|
||||||
|
eprintln!(
|
||||||
|
"Warning: --no-decorations is not reliably supported in Chromium app mode and may be ignored."
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
let (target_bin, target_icon, desktop_file_path, _data_local_dir) =
|
||||||
|
desktop_paths(&args.internal_id)?;
|
||||||
|
let icon_dir = target_icon
|
||||||
|
.parent()
|
||||||
|
.ok_or_else(|| anyhow!("Invalid icon target path"))?;
|
||||||
|
let applications_dir = desktop_file_path
|
||||||
|
.parent()
|
||||||
|
.ok_or_else(|| anyhow!("Invalid applications target path"))?;
|
||||||
|
|
||||||
|
fs::create_dir_all(icon_dir).context("Failed to create icons directory")?;
|
||||||
|
fs::create_dir_all(applications_dir).context("Failed to create applications directory")?;
|
||||||
|
if let Some(profile_dir) = &profile_dir {
|
||||||
|
fs::create_dir_all(profile_dir).context("Failed to create Chromium profile directory")?;
|
||||||
|
}
|
||||||
|
|
||||||
|
let temp = tempdir().context("Failed to create temporary directory for icon fetch")?;
|
||||||
|
let temp_icon = temp.path().join("icon.png");
|
||||||
|
fetch_or_create_icon(&args.url, args.icon.as_ref(), &temp_icon)?;
|
||||||
|
let _ = fs::copy(&temp_icon, &target_icon);
|
||||||
|
|
||||||
|
let exec = build_chromium_exec(args, &browser, profile_dir.as_deref());
|
||||||
|
let desktop_entry = format!(
|
||||||
|
r#"
|
||||||
|
[Desktop Entry]
|
||||||
|
Version=1.0
|
||||||
|
Name={}
|
||||||
|
Exec={}
|
||||||
|
Icon={}
|
||||||
|
StartupWMClass={}
|
||||||
|
Terminal=false
|
||||||
|
Type=Application
|
||||||
|
Categories=Network;WebBrowser;
|
||||||
|
X-Deskify-Managed=true
|
||||||
|
X-Deskify-Backend=chromium
|
||||||
|
X-Deskify-URL={}
|
||||||
|
X-Deskify-ProfileScope={}
|
||||||
|
X-Deskify-Browser={}
|
||||||
|
"#,
|
||||||
|
args.name,
|
||||||
|
exec,
|
||||||
|
args.internal_id,
|
||||||
|
args.internal_id,
|
||||||
|
args.url,
|
||||||
|
profile_scope_str(args.profile_scope),
|
||||||
|
browser.display()
|
||||||
|
);
|
||||||
|
fs::write(&desktop_file_path, desktop_entry.trim()).context("Failed to write .desktop file")?;
|
||||||
|
|
||||||
|
if target_bin.exists() {
|
||||||
|
println!(
|
||||||
|
"Note: existing binary {} left in place (Chromium backend does not use it).",
|
||||||
|
target_bin.display()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
println!("App successfully installed (Chromium backend)!");
|
||||||
|
println!(
|
||||||
|
"You can now launch '{}' from your application menu.",
|
||||||
|
args.name
|
||||||
|
);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
fn list_apps() -> Result<()> {
|
fn list_apps() -> Result<()> {
|
||||||
let base_dirs = BaseDirs::new().ok_or_else(|| anyhow!("Could not find system BaseDirs"))?;
|
let base_dirs = BaseDirs::new().ok_or_else(|| anyhow!("Could not find system BaseDirs"))?;
|
||||||
let applications_dir = base_dirs.data_local_dir().join("applications");
|
let applications_dir = base_dirs.data_local_dir().join("applications");
|
||||||
@@ -549,18 +861,20 @@ fn list_apps() -> Result<()> {
|
|||||||
.and_then(|l| l.strip_prefix("Name="))
|
.and_then(|l| l.strip_prefix("Name="))
|
||||||
.unwrap_or("Unknown");
|
.unwrap_or("Unknown");
|
||||||
|
|
||||||
let exec = content
|
let internal_id = path
|
||||||
|
.file_stem()
|
||||||
|
.and_then(|s| s.to_str())
|
||||||
|
.unwrap_or("Unknown");
|
||||||
|
let backend = content
|
||||||
.lines()
|
.lines()
|
||||||
.find(|l| l.starts_with("Exec="))
|
.find(|l| l.starts_with("X-Deskify-Backend="))
|
||||||
.and_then(|l| l.strip_prefix("Exec="))
|
.and_then(|l| l.strip_prefix("X-Deskify-Backend="))
|
||||||
.unwrap_or("Unknown");
|
.unwrap_or("legacy");
|
||||||
|
|
||||||
let bin_name = Path::new(exec)
|
println!(
|
||||||
.file_name()
|
"- {} (Internal ID: {}, Backend: {})",
|
||||||
.and_then(|n| n.to_str())
|
name, internal_id, backend
|
||||||
.unwrap_or("Unknown");
|
);
|
||||||
|
|
||||||
println!("- {} (Internal ID: {})", name, bin_name);
|
|
||||||
found = true;
|
found = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -653,6 +967,11 @@ fn run_doctor() -> Result<()> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
match resolve_chromium_binary(None) {
|
||||||
|
Ok(path) => println!("[ok] chromium browser found: {}", path.display()),
|
||||||
|
Err(_) => println!("[warn] no chromium-based browser found in PATH"),
|
||||||
|
}
|
||||||
|
|
||||||
let base_dirs = BaseDirs::new().ok_or_else(|| anyhow!("Could not find system BaseDirs"))?;
|
let base_dirs = BaseDirs::new().ok_or_else(|| anyhow!("Could not find system BaseDirs"))?;
|
||||||
let executable_dir = base_dirs
|
let executable_dir = base_dirs
|
||||||
.executable_dir()
|
.executable_dir()
|
||||||
@@ -675,6 +994,10 @@ fn run_doctor() -> Result<()> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn remove_app(safe_name: &str) -> Result<()> {
|
fn remove_app(safe_name: &str) -> Result<()> {
|
||||||
|
remove_app_with_options(safe_name, true)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn remove_app_with_options(safe_name: &str, remove_profile: bool) -> Result<()> {
|
||||||
validate_remove_id(safe_name)?;
|
validate_remove_id(safe_name)?;
|
||||||
|
|
||||||
let base_dirs = BaseDirs::new().ok_or_else(|| anyhow!("Could not find system BaseDirs"))?;
|
let base_dirs = BaseDirs::new().ok_or_else(|| anyhow!("Could not find system BaseDirs"))?;
|
||||||
@@ -716,6 +1039,19 @@ fn remove_app(safe_name: &str) -> Result<()> {
|
|||||||
println!("Icon not found: {:?}", icon_path);
|
println!("Icon not found: {:?}", icon_path);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 4. Remove Chromium profile (optional)
|
||||||
|
let profile_path = data_local_dir.join("deskify/profiles").join(safe_name);
|
||||||
|
if remove_profile {
|
||||||
|
if profile_path.exists() {
|
||||||
|
fs::remove_dir_all(&profile_path).context("Failed to remove Chromium profile")?;
|
||||||
|
println!("Removed Chromium profile: {:?}", profile_path);
|
||||||
|
} else {
|
||||||
|
println!("Chromium profile not found: {:?}", profile_path);
|
||||||
|
}
|
||||||
|
} else if profile_path.exists() {
|
||||||
|
println!("Keeping Chromium profile: {:?}", profile_path);
|
||||||
|
}
|
||||||
|
|
||||||
println!("Successfully removed app '{}'.", safe_name);
|
println!("Successfully removed app '{}'.", safe_name);
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
@@ -730,6 +1066,8 @@ fn execute_build(args: &BuildArgs, dry_run: bool, print_config: bool) -> Result<
|
|||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
match args.backend {
|
||||||
|
Backend::Tauri => {
|
||||||
println!(
|
println!(
|
||||||
"Generating native app '{}' for URL: {}",
|
"Generating native app '{}' for URL: {}",
|
||||||
args.name, args.url
|
args.name, args.url
|
||||||
@@ -748,8 +1086,17 @@ fn execute_build(args: &BuildArgs, dry_run: bool, print_config: bool) -> Result<
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
install_app(&args.name, &bin_path, dir.path())?;
|
install_tauri_app(args, &bin_path, dir.path())?;
|
||||||
Ok(())
|
Ok(())
|
||||||
|
}
|
||||||
|
Backend::Chromium => {
|
||||||
|
println!(
|
||||||
|
"Installing Chromium app '{}' for URL: {}",
|
||||||
|
args.name, args.url
|
||||||
|
);
|
||||||
|
install_chromium_app(args)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn execute_update(id: &str, args: &BuildArgs, dry_run: bool, print_config: bool) -> Result<()> {
|
fn execute_update(id: &str, args: &BuildArgs, dry_run: bool, print_config: bool) -> Result<()> {
|
||||||
@@ -769,7 +1116,11 @@ fn execute_update(id: &str, args: &BuildArgs, dry_run: bool, print_config: bool)
|
|||||||
}
|
}
|
||||||
|
|
||||||
println!("Updating app '{}' -> '{}' ({})", id, args.name, args.url);
|
println!("Updating app '{}' -> '{}' ({})", id, args.name, args.url);
|
||||||
remove_app(id)?;
|
let remove_profile = match args.backend {
|
||||||
|
Backend::Chromium => false,
|
||||||
|
Backend::Tauri => true,
|
||||||
|
};
|
||||||
|
remove_app_with_options(id, remove_profile)?;
|
||||||
execute_build(args, false, false)
|
execute_build(args, false, false)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -787,12 +1138,17 @@ fn main() -> Result<()> {
|
|||||||
width,
|
width,
|
||||||
height,
|
height,
|
||||||
dark_mode,
|
dark_mode,
|
||||||
|
backend,
|
||||||
|
browser_bin,
|
||||||
|
profile_scope,
|
||||||
print_config,
|
print_config,
|
||||||
dry_run,
|
dry_run,
|
||||||
} => {
|
} => {
|
||||||
|
let internal_id = sanitize_app_id(&name);
|
||||||
let args = BuildArgs {
|
let args = BuildArgs {
|
||||||
url,
|
url,
|
||||||
name,
|
name,
|
||||||
|
internal_id,
|
||||||
icon,
|
icon,
|
||||||
fullscreen,
|
fullscreen,
|
||||||
no_decorations,
|
no_decorations,
|
||||||
@@ -800,6 +1156,9 @@ fn main() -> Result<()> {
|
|||||||
width,
|
width,
|
||||||
height,
|
height,
|
||||||
dark_mode,
|
dark_mode,
|
||||||
|
backend,
|
||||||
|
browser_bin,
|
||||||
|
profile_scope,
|
||||||
};
|
};
|
||||||
execute_build(&args, dry_run, print_config)?;
|
execute_build(&args, dry_run, print_config)?;
|
||||||
}
|
}
|
||||||
@@ -823,6 +1182,9 @@ fn main() -> Result<()> {
|
|||||||
width,
|
width,
|
||||||
height,
|
height,
|
||||||
dark_mode,
|
dark_mode,
|
||||||
|
backend,
|
||||||
|
browser_bin,
|
||||||
|
profile_scope,
|
||||||
dry_run,
|
dry_run,
|
||||||
print_config,
|
print_config,
|
||||||
} => {
|
} => {
|
||||||
@@ -834,6 +1196,7 @@ fn main() -> Result<()> {
|
|||||||
let args = BuildArgs {
|
let args = BuildArgs {
|
||||||
url,
|
url,
|
||||||
name: resolved_name,
|
name: resolved_name,
|
||||||
|
internal_id: id.clone(),
|
||||||
icon,
|
icon,
|
||||||
fullscreen,
|
fullscreen,
|
||||||
no_decorations,
|
no_decorations,
|
||||||
@@ -841,6 +1204,9 @@ fn main() -> Result<()> {
|
|||||||
width,
|
width,
|
||||||
height,
|
height,
|
||||||
dark_mode,
|
dark_mode,
|
||||||
|
backend,
|
||||||
|
browser_bin,
|
||||||
|
profile_scope,
|
||||||
};
|
};
|
||||||
execute_update(&id, &args, dry_run, print_config)?;
|
execute_update(&id, &args, dry_run, print_config)?;
|
||||||
}
|
}
|
||||||
@@ -851,7 +1217,11 @@ fn main() -> Result<()> {
|
|||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::{is_deskify_desktop_entry, sanitize_app_id, validate_remove_id};
|
use super::{
|
||||||
|
Backend, BuildArgs, ProfileScope, build_chromium_exec, chromium_window_size_arg,
|
||||||
|
is_deskify_desktop_entry, sanitize_app_id, validate_remove_id,
|
||||||
|
};
|
||||||
|
use std::path::Path;
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn sanitize_app_id_replaces_spaces_and_strips_symbols() {
|
fn sanitize_app_id_replaces_spaces_and_strips_symbols() {
|
||||||
@@ -891,4 +1261,55 @@ mod tests {
|
|||||||
let content = "[Desktop Entry]\nExec=/usr/bin/firefox\nCategories=Network;WebBrowser;\n";
|
let content = "[Desktop Entry]\nExec=/usr/bin/firefox\nCategories=Network;WebBrowser;\n";
|
||||||
assert!(!is_deskify_desktop_entry(content));
|
assert!(!is_deskify_desktop_entry(content));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn sample_build_args() -> BuildArgs {
|
||||||
|
BuildArgs {
|
||||||
|
url: "https://chat.com".to_string(),
|
||||||
|
name: "Chat".to_string(),
|
||||||
|
internal_id: "chat".to_string(),
|
||||||
|
icon: None,
|
||||||
|
fullscreen: false,
|
||||||
|
no_decorations: false,
|
||||||
|
user_agent: None,
|
||||||
|
width: None,
|
||||||
|
height: None,
|
||||||
|
dark_mode: false,
|
||||||
|
backend: Backend::Chromium,
|
||||||
|
browser_bin: None,
|
||||||
|
profile_scope: ProfileScope::Isolated,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn chromium_window_size_requires_both_dimensions() {
|
||||||
|
assert_eq!(
|
||||||
|
chromium_window_size_arg(Some(1200.0), Some(800.0)).as_deref(),
|
||||||
|
Some("--window-size=1200,800")
|
||||||
|
);
|
||||||
|
assert!(chromium_window_size_arg(Some(1200.0), None).is_none());
|
||||||
|
assert!(chromium_window_size_arg(None, Some(800.0)).is_none());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn chromium_exec_contains_required_args() {
|
||||||
|
let mut args = sample_build_args();
|
||||||
|
args.fullscreen = true;
|
||||||
|
args.dark_mode = true;
|
||||||
|
args.user_agent = Some("UA Test".to_string());
|
||||||
|
args.width = Some(1280.0);
|
||||||
|
args.height = Some(720.0);
|
||||||
|
let exec = build_chromium_exec(
|
||||||
|
&args,
|
||||||
|
Path::new("/usr/bin/chromium"),
|
||||||
|
Some(Path::new("/tmp/profile")),
|
||||||
|
);
|
||||||
|
assert!(exec.contains("/usr/bin/chromium"));
|
||||||
|
assert!(exec.contains("--app=https://chat.com"));
|
||||||
|
assert!(exec.contains("--class=chat"));
|
||||||
|
assert!(exec.contains("--user-data-dir=/tmp/profile"));
|
||||||
|
assert!(exec.contains("--start-fullscreen"));
|
||||||
|
assert!(exec.contains("--window-size=1280,720"));
|
||||||
|
assert!(exec.contains("--force-dark-mode"));
|
||||||
|
assert!(exec.contains("--user-agent="));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user