Add native self-hosted instance connection to fluxer_desktop
Trimmed monorepo checkout (fluxer_desktop + packages/voice_engine_v2 + tools/ci) with a "Connect to a Different Server" menu item and popout that lets the desktop app switch to any self-hosted Fluxer instance, plus fixes for well-known discovery on single-domain self-hosted deployments and a false-positive ERR_ABORTED on same-origin client redirects during the switch. Defaults to chat.fluxr.chat and uses an isolated userData directory from the official build.
This commit is contained in:
@@ -0,0 +1,386 @@
|
||||
// SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
|
||||
use crate::common::{CommandSpec, command_succeeds, env_bool, output_text, run_command};
|
||||
use anyhow::{Context, Result, anyhow, ensure};
|
||||
use base64::Engine;
|
||||
use base64::engine::general_purpose::STANDARD as BASE64;
|
||||
use clap::Args;
|
||||
use std::env;
|
||||
use std::ffi::OsString;
|
||||
use std::fs;
|
||||
use std::path::{Path, PathBuf};
|
||||
use tempfile::TempDir;
|
||||
|
||||
const LIBFLUXCORE_WASM_BINDGEN_VERSION: &str = "0.2.122";
|
||||
const LIBFLUXCORE_WASM_SIZE_BUDGET_BYTES: u64 = 300 * 1024;
|
||||
const LIBFLUXCORE_WRAPPER_JS: &str = include_str!("../templates/libfluxcore_wrapper.js");
|
||||
const LIBFLUXCORE_WRAPPER_DTS: &str = include_str!("../templates/libfluxcore_wrapper.d.ts");
|
||||
|
||||
#[derive(Debug, Args, Clone)]
|
||||
pub struct BuildAppWasmArgs {
|
||||
#[arg(long)]
|
||||
app_dir: Option<PathBuf>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Args, Clone)]
|
||||
pub struct BuildMarkdownParserWasmArgs {
|
||||
#[arg(long)]
|
||||
app_dir: Option<PathBuf>,
|
||||
}
|
||||
|
||||
pub fn run_build_app_wasm(args: BuildAppWasmArgs) -> Result<()> {
|
||||
let app_dir = args.app_dir.unwrap_or(resolve_app_dir()?);
|
||||
build_markdown_parser_wasm(&app_dir)?;
|
||||
build_libfluxcore_wasm(&app_dir)
|
||||
}
|
||||
|
||||
pub fn run_build_markdown_parser_wasm(args: BuildMarkdownParserWasmArgs) -> Result<()> {
|
||||
let app_dir = args.app_dir.unwrap_or(resolve_app_dir()?);
|
||||
build_markdown_parser_wasm(&app_dir)
|
||||
}
|
||||
|
||||
fn build_markdown_parser_wasm(app_dir: &Path) -> Result<()> {
|
||||
let rust_source_dir = app_dir.join("../packages/markdown_parser/rust");
|
||||
let bytes_path =
|
||||
app_dir.join("src/features/messaging/utils/markdown/parser/MarkdownParserWasmBytes.ts");
|
||||
let temp = TempDir::new().context("Failed to create source temp directory")?;
|
||||
let target_dir = temp.path().join("target");
|
||||
|
||||
run_command(
|
||||
CommandSpec::new("cargo")
|
||||
.args(["build", "--release", "--target", "wasm32-unknown-unknown"])
|
||||
.env("CARGO_TARGET_DIR", target_dir.to_string_lossy().as_ref())
|
||||
.current_dir(&rust_source_dir),
|
||||
)?;
|
||||
|
||||
let wasm_path = target_dir.join("wasm32-unknown-unknown/release/fluxer_markdown_parser.wasm");
|
||||
let wasm =
|
||||
fs::read(&wasm_path).with_context(|| format!("Failed to read {}", wasm_path.display()))?;
|
||||
let content = markdown_wasm_bytes_content(&wasm);
|
||||
if let Some(parent) = bytes_path.parent() {
|
||||
fs::create_dir_all(parent)
|
||||
.with_context(|| format!("Failed to create {}", parent.display()))?;
|
||||
}
|
||||
fs::write(&bytes_path, content)
|
||||
.with_context(|| format!("Failed to write {}", bytes_path.display()))
|
||||
}
|
||||
|
||||
fn build_libfluxcore_wasm(app_dir: &Path) -> Result<()> {
|
||||
let rust_package_dir = app_dir.join("rust/libfluxcore");
|
||||
let out_dir = app_dir.join("pkgs/libfluxcore");
|
||||
let wasm_path = out_dir.join("libfluxcore_bg.wasm");
|
||||
let previous_wasm_size = file_size(&wasm_path)?;
|
||||
|
||||
fs::create_dir_all(&out_dir)
|
||||
.with_context(|| format!("Failed to create {}", out_dir.display()))?;
|
||||
|
||||
let mut build = CommandSpec::new("cargo")
|
||||
.args([
|
||||
"build",
|
||||
"--release",
|
||||
"--target",
|
||||
"wasm32-unknown-unknown",
|
||||
"--manifest-path",
|
||||
])
|
||||
.arg(rust_package_dir.join("Cargo.toml"))
|
||||
.current_dir(&rust_package_dir);
|
||||
|
||||
if env_bool("FLUXCORE_WASM_SIMD") {
|
||||
let rustflags = match env::var("RUSTFLAGS") {
|
||||
Ok(value) if !value.trim().is_empty() => format!("{value} -C target-feature=+simd128"),
|
||||
_ => "-C target-feature=+simd128".to_string(),
|
||||
};
|
||||
build = build.env("RUSTFLAGS", rustflags);
|
||||
}
|
||||
|
||||
run_command(build)?;
|
||||
let wasm_bindgen = ensure_wasm_bindgen_cli()?;
|
||||
let temp = TempDir::new().context("Failed to create libfluxcore wasm-bindgen temp dir")?;
|
||||
let bindgen_dir = temp.path().join("bindgen");
|
||||
fs::create_dir_all(&bindgen_dir)
|
||||
.with_context(|| format!("Failed to create {}", bindgen_dir.display()))?;
|
||||
|
||||
run_command(
|
||||
CommandSpec::new(wasm_bindgen)
|
||||
.args(["--target", "web", "--out-dir"])
|
||||
.arg(&bindgen_dir)
|
||||
.args(["--out-name", "libfluxcore"])
|
||||
.arg(rust_package_dir.join("target/wasm32-unknown-unknown/release/libfluxcore.wasm"))
|
||||
.current_dir(&rust_package_dir),
|
||||
)?;
|
||||
|
||||
let bindgen_js_path = bindgen_dir.join("libfluxcore.js");
|
||||
let bindgen_dts_path = bindgen_dir.join("libfluxcore.d.ts");
|
||||
let bindgen_wasm_path = bindgen_dir.join("libfluxcore_bg.wasm");
|
||||
let bindgen_wasm_dts_path = bindgen_dir.join("libfluxcore_bg.wasm.d.ts");
|
||||
|
||||
write_with_spdx(
|
||||
&out_dir.join("libfluxcore_bindgen.js"),
|
||||
&patch_libfluxcore_bindgen_js(
|
||||
&fs::read_to_string(&bindgen_js_path)
|
||||
.with_context(|| format!("Failed to read {}", bindgen_js_path.display()))?,
|
||||
)?,
|
||||
)?;
|
||||
write_with_spdx(
|
||||
&out_dir.join("libfluxcore_bindgen.d.ts"),
|
||||
&patch_libfluxcore_bindgen_dts(
|
||||
&fs::read_to_string(&bindgen_dts_path)
|
||||
.with_context(|| format!("Failed to read {}", bindgen_dts_path.display()))?,
|
||||
)?,
|
||||
)?;
|
||||
fs::copy(&bindgen_wasm_path, &wasm_path).with_context(|| {
|
||||
format!(
|
||||
"Failed to copy {} to {}",
|
||||
bindgen_wasm_path.display(),
|
||||
wasm_path.display()
|
||||
)
|
||||
})?;
|
||||
fs::copy(
|
||||
&bindgen_wasm_dts_path,
|
||||
out_dir.join("libfluxcore_bg.wasm.d.ts"),
|
||||
)
|
||||
.with_context(|| format!("Failed to copy {}", bindgen_wasm_dts_path.display()))?;
|
||||
|
||||
fs::write(
|
||||
out_dir.join("libfluxcore.js"),
|
||||
libfluxcore_index_js_content(),
|
||||
)
|
||||
.with_context(|| {
|
||||
format!(
|
||||
"Failed to write {}",
|
||||
out_dir.join("libfluxcore.js").display()
|
||||
)
|
||||
})?;
|
||||
fs::write(
|
||||
out_dir.join("libfluxcore.d.ts"),
|
||||
libfluxcore_index_dts_content(),
|
||||
)
|
||||
.with_context(|| {
|
||||
format!(
|
||||
"Failed to write {}",
|
||||
out_dir.join("libfluxcore.d.ts").display()
|
||||
)
|
||||
})?;
|
||||
fs::write(
|
||||
out_dir.join("package.json"),
|
||||
libfluxcore_package_json_content(),
|
||||
)
|
||||
.with_context(|| format!("Failed to write {}", out_dir.join("package.json").display()))?;
|
||||
fs::write(out_dir.join("README.md"), libfluxcore_readme_content())
|
||||
.with_context(|| format!("Failed to write {}", out_dir.join("README.md").display()))?;
|
||||
|
||||
let wasm_size = file_size(&wasm_path)?
|
||||
.ok_or_else(|| anyhow!("libfluxcore build did not emit {}", wasm_path.display()))?;
|
||||
ensure!(
|
||||
wasm_size <= LIBFLUXCORE_WASM_SIZE_BUDGET_BYTES,
|
||||
"libfluxcore_bg.wasm is {}, over the {} budget",
|
||||
format_bytes(wasm_size),
|
||||
format_bytes(LIBFLUXCORE_WASM_SIZE_BUDGET_BYTES)
|
||||
);
|
||||
|
||||
let size_comparison = match previous_wasm_size {
|
||||
Some(previous) => format!("{} -> {}", format_bytes(previous), format_bytes(wasm_size)),
|
||||
None => "no previous artifact".to_string(),
|
||||
};
|
||||
println!(
|
||||
"libfluxcore_bg.wasm size: {size_comparison} (budget {})",
|
||||
format_bytes(LIBFLUXCORE_WASM_SIZE_BUDGET_BYTES)
|
||||
);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn patch_libfluxcore_bindgen_js(content: &str) -> Result<String> {
|
||||
const MARKER: &str = "\nasync function __wbg_load(module, imports) {";
|
||||
const RESET_EXPORT: &str = r#"
|
||||
export function __resetLibfluxcoreWasmForMemoryPressure() {
|
||||
wasmModule = undefined;
|
||||
wasmInstance = undefined;
|
||||
wasm = undefined;
|
||||
cachedDataViewMemory0 = null;
|
||||
cachedUint8ArrayMemory0 = null;
|
||||
heap = new Array(1024).fill(undefined);
|
||||
heap.push(undefined, null, true, false);
|
||||
heap_next = heap.length;
|
||||
numBytesDecoded = 0;
|
||||
}
|
||||
"#;
|
||||
ensure!(
|
||||
content.contains(MARKER),
|
||||
"libfluxcore wasm-bindgen JS output did not contain reset insertion marker"
|
||||
);
|
||||
Ok(content.replacen(MARKER, &format!("{RESET_EXPORT}{MARKER}"), 1))
|
||||
}
|
||||
|
||||
fn patch_libfluxcore_bindgen_dts(content: &str) -> Result<String> {
|
||||
const MARKER: &str = "\nexport type InitInput";
|
||||
const RESET_EXPORT: &str =
|
||||
"\nexport function __resetLibfluxcoreWasmForMemoryPressure(): void;\n";
|
||||
ensure!(
|
||||
content.contains(MARKER),
|
||||
"libfluxcore wasm-bindgen DTS output did not contain reset insertion marker"
|
||||
);
|
||||
Ok(content.replacen(MARKER, &format!("{RESET_EXPORT}{MARKER}"), 1))
|
||||
}
|
||||
|
||||
pub(crate) fn resolve_app_dir() -> Result<PathBuf> {
|
||||
let cwd = env::current_dir().context("Failed to resolve current directory")?;
|
||||
if cwd.file_name().and_then(|value| value.to_str()) == Some("fluxer_app") {
|
||||
return Ok(cwd);
|
||||
}
|
||||
if cwd.join("fluxer_app").is_dir() {
|
||||
return Ok(cwd.join("fluxer_app"));
|
||||
}
|
||||
Err(anyhow!(
|
||||
"Could not resolve fluxer_app directory from {}",
|
||||
cwd.display()
|
||||
))
|
||||
}
|
||||
|
||||
fn ensure_wasm_bindgen_cli() -> Result<OsString> {
|
||||
let expected = format!("wasm-bindgen {LIBFLUXCORE_WASM_BINDGEN_VERSION}");
|
||||
if command_succeeds(CommandSpec::new("wasm-bindgen").arg("--version")) {
|
||||
let version = output_text(CommandSpec::new("wasm-bindgen").arg("--version"))?;
|
||||
if version.trim() == expected {
|
||||
return Ok("wasm-bindgen".into());
|
||||
}
|
||||
}
|
||||
|
||||
run_command(CommandSpec::new("cargo").args([
|
||||
"install",
|
||||
"wasm-bindgen-cli",
|
||||
"--version",
|
||||
LIBFLUXCORE_WASM_BINDGEN_VERSION,
|
||||
"--locked",
|
||||
"--force",
|
||||
]))?;
|
||||
Ok("wasm-bindgen".into())
|
||||
}
|
||||
|
||||
fn file_size(path: &Path) -> Result<Option<u64>> {
|
||||
match fs::metadata(path) {
|
||||
Ok(metadata) => Ok(Some(metadata.len())),
|
||||
Err(error) if error.kind() == std::io::ErrorKind::NotFound => Ok(None),
|
||||
Err(error) => Err(error).with_context(|| format!("Failed to stat {}", path.display())),
|
||||
}
|
||||
}
|
||||
|
||||
fn format_bytes(bytes: u64) -> String {
|
||||
format!("{bytes} B")
|
||||
}
|
||||
|
||||
fn write_with_spdx(path: &Path, content: &str) -> Result<()> {
|
||||
fs::write(
|
||||
path,
|
||||
format!("// SPDX-License-Identifier: AGPL-3.0-or-later\n{content}"),
|
||||
)
|
||||
.with_context(|| format!("Failed to write {}", path.display()))
|
||||
}
|
||||
|
||||
fn libfluxcore_index_js_content() -> String {
|
||||
format!(
|
||||
"// SPDX-License-Identifier: AGPL-3.0-or-later\n\n\
|
||||
import {{crop_rotate_rgba_raw}} from './libfluxcore_bindgen.js';\n\
|
||||
{LIBFLUXCORE_WRAPPER_JS}\n\
|
||||
export * from './libfluxcore_bindgen.js';\n\
|
||||
export {{default}} from './libfluxcore_bindgen.js';\n"
|
||||
)
|
||||
}
|
||||
|
||||
fn libfluxcore_index_dts_content() -> String {
|
||||
format!(
|
||||
"// SPDX-License-Identifier: AGPL-3.0-or-later\n\n\
|
||||
export * from './libfluxcore_bindgen.js';\n\
|
||||
export {{default}} from './libfluxcore_bindgen.js';\n\n\
|
||||
{LIBFLUXCORE_WRAPPER_DTS}"
|
||||
)
|
||||
}
|
||||
|
||||
fn libfluxcore_package_json_content() -> String {
|
||||
let manifest = serde_json::json!({
|
||||
"name": "libfluxcore",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"version": "0.0.0",
|
||||
"license": "AGPL-3.0-or-later",
|
||||
"sideEffects": false,
|
||||
"files": [
|
||||
"libfluxcore.js",
|
||||
"libfluxcore.d.ts",
|
||||
"libfluxcore_bindgen.js",
|
||||
"libfluxcore_bindgen.d.ts",
|
||||
"libfluxcore_bg.wasm",
|
||||
"libfluxcore_bg.wasm.d.ts",
|
||||
"README.md"
|
||||
],
|
||||
"main": "libfluxcore.js",
|
||||
"module": "libfluxcore.js",
|
||||
"types": "libfluxcore.d.ts",
|
||||
"exports": {
|
||||
".": {
|
||||
"types": "./libfluxcore.d.ts",
|
||||
"default": "./libfluxcore.js"
|
||||
},
|
||||
"./libfluxcore_bg.wasm": "./libfluxcore_bg.wasm"
|
||||
}
|
||||
});
|
||||
format!("{manifest:#}\n")
|
||||
}
|
||||
|
||||
fn libfluxcore_readme_content() -> &'static str {
|
||||
"<!-- SPDX-License-Identifier: AGPL-3.0-or-later -->\n\
|
||||
# libfluxcore\n\n\
|
||||
Rust WebAssembly helpers and JavaScript codec wrappers for Fluxer media processing.\n"
|
||||
}
|
||||
|
||||
fn markdown_wasm_bytes_content(wasm: &[u8]) -> String {
|
||||
format!(
|
||||
"// SPDX-License-Identifier: AGPL-3.0-or-later\n\n\
|
||||
export const MARKDOWN_PARSER_WASM_BASE64 =\n\
|
||||
\t'{}';\n",
|
||||
BASE64.encode(wasm)
|
||||
)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn markdown_wasm_bytes_content_matches_legacy_node_output() {
|
||||
assert_eq!(
|
||||
markdown_wasm_bytes_content(b"hello"),
|
||||
"// SPDX-License-Identifier: AGPL-3.0-or-later\n\n\
|
||||
export const MARKDOWN_PARSER_WASM_BASE64 =\n\
|
||||
\t'aGVsbG8=';\n"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn libfluxcore_index_reexports_bindgen_module() {
|
||||
let content = libfluxcore_index_js_content();
|
||||
assert!(content.contains("import {crop_rotate_rgba_raw} from './libfluxcore_bindgen.js';"));
|
||||
assert!(content.contains("export * from './libfluxcore_bindgen.js';"));
|
||||
assert!(content.contains("export function crop_rotate_rgba("));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn libfluxcore_bindgen_js_reset_hook_is_inserted() {
|
||||
let content =
|
||||
"function __wbg_finalize_init() {}\nasync function __wbg_load(module, imports) {}";
|
||||
let patched = patch_libfluxcore_bindgen_js(content).expect("patch should succeed");
|
||||
assert!(patched.contains("export function __resetLibfluxcoreWasmForMemoryPressure()"));
|
||||
assert!(patched.contains("wasm = undefined;"));
|
||||
assert!(patched.contains("async function __wbg_load(module, imports) {}"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn libfluxcore_bindgen_dts_reset_hook_is_inserted() {
|
||||
let content = "export function is_animated_image(input: Uint8Array): boolean;\nexport type InitInput = RequestInfo;";
|
||||
let patched = patch_libfluxcore_bindgen_dts(content).expect("patch should succeed");
|
||||
assert!(
|
||||
patched.contains("export function __resetLibfluxcoreWasmForMemoryPressure(): void;")
|
||||
);
|
||||
assert!(patched.contains("export type InitInput = RequestInfo;"));
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user