Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@
"e2e:test:l0:all": "cross-env BITFUN_E2E_APP_MODE=debug pnpm --dir tests/e2e run test:l0:all",
"e2e:test:l1": "cross-env BITFUN_E2E_APP_MODE=debug pnpm --dir tests/e2e run test:l1",
"e2e:test:smoke": "cross-env BITFUN_E2E_APP_MODE=debug pnpm --dir tests/e2e run test:smoke",
"e2e:test:chat": "cross-env BITFUN_E2E_APP_MODE=debug pnpm --dir tests/e2e run test:chat"
"e2e:test:chat": "cross-env BITFUN_E2E_APP_MODE=debug pnpm --dir tests/e2e run test:chat",
"e2e:test:perf:debug": "cross-env BITFUN_E2E_APP_MODE=debug pnpm --dir tests/e2e run test:perf",
"e2e:test:perf:release-fast": "cross-env BITFUN_E2E_APP_MODE=release-fast pnpm --dir tests/e2e run test:perf"
},
"devDependencies": {
"@tauri-apps/cli": "^2.10.0",
Expand Down
3 changes: 3 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/apps/desktop/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ default = []
# Enable webview devtools and element inspector for development builds.
# Only active in debug builds or when explicitly requested via --features devtools.
# Never enabled in release profile intended for end users.
devtools = ["tauri/devtools"]
devtools = ["tauri/devtools", "bitfun-webdriver/embedded"]

[target.'cfg(target_os = "linux")'.dependencies]
atspi = { workspace = true }
Expand Down
3 changes: 2 additions & 1 deletion src/apps/desktop/src/logging.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ pub struct LogConfig {
}

fn is_embedded_webdriver_mode() -> bool {
cfg!(debug_assertions) && std::env::var_os("BITFUN_WEBDRIVER_PORT").is_some()
(cfg!(debug_assertions) || cfg!(feature = "devtools"))
&& std::env::var_os("BITFUN_WEBDRIVER_PORT").is_some()
}

fn resolve_logs_root() -> PathBuf {
Expand Down
6 changes: 6 additions & 0 deletions src/apps/desktop/src/theme.rs
Original file line number Diff line number Diff line change
Expand Up @@ -276,11 +276,15 @@ impl ThemeConfig {
let theme_type = if self.is_light { "light" } else { "dark" };
let startup_trace_id_json = serde_json::to_string(startup_trace_id)
.unwrap_or_else(|_| "\"desktop-unknown\"".to_string());
let perf_trace_enabled = cfg!(debug_assertions)
|| ((cfg!(feature = "devtools") || std::env::var_os("BITFUN_PERF_TRACE").is_some())
&& std::env::var_os("BITFUN_WEBDRIVER_PORT").is_some());

format!(
r#"
(function() {{
window.__BITFUN_STARTUP_TRACE_ID__ = {startup_trace_id_json};
window.__BITFUN_PERF_TRACE_ENABLED__ = {perf_trace_enabled};
function applyTheme() {{
var root = document.documentElement;
if (!root) return false;
Expand All @@ -295,6 +299,7 @@ impl ThemeConfig {
root.style.setProperty('--color-bg-flowchat', '{bg_scene}');
root.style.setProperty('--color-bg-scene', '{bg_scene}');
root.style.setProperty('--color-text-primary', '{text_primary}');
root.style.setProperty('--bitfun-startup-bg', '{bg_primary}');

root.style.backgroundColor = '{bg_primary}';

Expand Down Expand Up @@ -323,6 +328,7 @@ impl ThemeConfig {
bg_scene = self.bg_scene,
text_primary = self.text_primary,
startup_trace_id_json = startup_trace_id_json,
perf_trace_enabled = perf_trace_enabled,
)
}

Expand Down
4 changes: 4 additions & 0 deletions src/crates/webdriver/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ authors.workspace = true
edition.workspace = true
description = "Embedded WebDriver server for BitFun desktop"

[features]
default = []
embedded = []

[dependencies]
anyhow = { workspace = true }
axum = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion src/crates/webdriver/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const DEFAULT_WEBDRIVER_LABEL: &str = "main";
static SERVER_STARTED: AtomicBool = AtomicBool::new(false);

pub fn maybe_start(app: AppHandle) {
if !cfg!(debug_assertions) {
if !(cfg!(debug_assertions) || cfg!(feature = "embedded")) {
return;
}

Expand Down
104 changes: 52 additions & 52 deletions src/crates/webdriver/src/server/router.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,208 +13,208 @@ pub fn create_router(state: Arc<AppState>) -> Router {
Router::new()
.route("/status", get(handlers::status))
.route("/session", post(handlers::session::create))
.route("/session/:session_id", delete(handlers::session::delete))
.route("/session/{session_id}", delete(handlers::session::delete))
.route(
"/session/:session_id/timeouts",
"/session/{session_id}/timeouts",
get(handlers::timeouts::get).post(handlers::timeouts::set),
)
.route(
"/session/:session_id/url",
"/session/{session_id}/url",
get(handlers::navigation::get_url).post(handlers::navigation::navigate),
)
.route(
"/session/:session_id/back",
"/session/{session_id}/back",
post(handlers::navigation::back),
)
.route(
"/session/:session_id/forward",
"/session/{session_id}/forward",
post(handlers::navigation::forward),
)
.route(
"/session/:session_id/refresh",
"/session/{session_id}/refresh",
post(handlers::navigation::refresh),
)
.route(
"/session/:session_id/title",
"/session/{session_id}/title",
get(handlers::navigation::get_title),
)
.route(
"/session/:session_id/source",
"/session/{session_id}/source",
get(handlers::navigation::get_source),
)
.route(
"/session/:session_id/window",
"/session/{session_id}/window",
get(handlers::window::get_window_handle)
.post(handlers::window::switch_to_window)
.delete(handlers::window::close_window),
)
.route(
"/session/:session_id/window/new",
"/session/{session_id}/window/new",
post(handlers::window::new_window),
)
.route(
"/session/:session_id/window/handles",
"/session/{session_id}/window/handles",
get(handlers::window::get_window_handles),
)
.route(
"/session/:session_id/window/rect",
"/session/{session_id}/window/rect",
get(handlers::window::get_window_rect).post(handlers::window::set_window_rect),
)
.route(
"/session/:session_id/window/maximize",
"/session/{session_id}/window/maximize",
post(handlers::window::maximize),
)
.route(
"/session/:session_id/window/minimize",
"/session/{session_id}/window/minimize",
post(handlers::window::minimize),
)
.route(
"/session/:session_id/window/fullscreen",
"/session/{session_id}/window/fullscreen",
post(handlers::window::fullscreen),
)
.route(
"/session/:session_id/frame",
"/session/{session_id}/frame",
post(handlers::frame::switch_to_frame),
)
.route(
"/session/:session_id/frame/parent",
"/session/{session_id}/frame/parent",
post(handlers::frame::switch_to_parent_frame),
)
.route(
"/session/:session_id/alert/dismiss",
"/session/{session_id}/alert/dismiss",
post(handlers::alert::dismiss),
)
.route(
"/session/:session_id/alert/accept",
"/session/{session_id}/alert/accept",
post(handlers::alert::accept),
)
.route(
"/session/:session_id/alert/text",
"/session/{session_id}/alert/text",
get(handlers::alert::get_text).post(handlers::alert::send_text),
)
.route(
"/session/:session_id/element",
"/session/{session_id}/element",
post(handlers::element::find),
)
.route(
"/session/:session_id/elements",
"/session/{session_id}/elements",
post(handlers::element::find_all),
)
.route(
"/session/:session_id/element/active",
"/session/{session_id}/element/active",
get(handlers::element::get_active),
)
.route(
"/session/:session_id/element/:element_id/element",
"/session/{session_id}/element/{element_id}/element",
post(handlers::element::find_from_element),
)
.route(
"/session/:session_id/element/:element_id/elements",
"/session/{session_id}/element/{element_id}/elements",
post(handlers::element::find_all_from_element),
)
.route(
"/session/:session_id/element/:element_id/selected",
"/session/{session_id}/element/{element_id}/selected",
get(handlers::element::is_selected),
)
.route(
"/session/:session_id/element/:element_id/displayed",
"/session/{session_id}/element/{element_id}/displayed",
get(handlers::element::is_displayed),
)
.route(
"/session/:session_id/element/:element_id/attribute/:name",
"/session/{session_id}/element/{element_id}/attribute/{name}",
get(handlers::element::get_attribute),
)
.route(
"/session/:session_id/element/:element_id/property/:name",
"/session/{session_id}/element/{element_id}/property/{name}",
get(handlers::element::get_property),
)
.route(
"/session/:session_id/element/:element_id/css/:property_name",
"/session/{session_id}/element/{element_id}/css/{property_name}",
get(handlers::element::get_css_value),
)
.route(
"/session/:session_id/element/:element_id/text",
"/session/{session_id}/element/{element_id}/text",
get(handlers::element::get_text),
)
.route(
"/session/:session_id/element/:element_id/name",
"/session/{session_id}/element/{element_id}/name",
get(handlers::element::get_name),
)
.route(
"/session/:session_id/element/:element_id/rect",
"/session/{session_id}/element/{element_id}/rect",
get(handlers::element::get_rect),
)
.route(
"/session/:session_id/element/:element_id/enabled",
"/session/{session_id}/element/{element_id}/enabled",
get(handlers::element::is_enabled),
)
.route(
"/session/:session_id/element/:element_id/computedrole",
"/session/{session_id}/element/{element_id}/computedrole",
get(handlers::element::get_computed_role),
)
.route(
"/session/:session_id/element/:element_id/computedlabel",
"/session/{session_id}/element/{element_id}/computedlabel",
get(handlers::element::get_computed_label),
)
.route(
"/session/:session_id/element/:element_id/click",
"/session/{session_id}/element/{element_id}/click",
post(handlers::element::click),
)
.route(
"/session/:session_id/element/:element_id/clear",
"/session/{session_id}/element/{element_id}/clear",
post(handlers::element::clear),
)
.route(
"/session/:session_id/element/:element_id/value",
"/session/{session_id}/element/{element_id}/value",
post(handlers::element::send_keys),
)
.route(
"/session/:session_id/execute/sync",
"/session/{session_id}/execute/sync",
post(handlers::script::execute_sync),
)
.route(
"/session/:session_id/execute/async",
"/session/{session_id}/execute/async",
post(handlers::script::execute_async),
)
.route("/session/:session_id/print", post(handlers::print::print))
.route("/session/{session_id}/print", post(handlers::print::print))
.route(
"/session/:session_id/actions",
"/session/{session_id}/actions",
post(handlers::actions::perform).delete(handlers::actions::release),
)
.route(
"/session/:session_id/screenshot",
"/session/{session_id}/screenshot",
get(handlers::screenshot::take),
)
.route(
"/session/:session_id/element/:element_id/screenshot",
"/session/{session_id}/element/{element_id}/screenshot",
get(handlers::screenshot::take_element),
)
.route(
"/session/:session_id/element/:element_id/shadow",
"/session/{session_id}/element/{element_id}/shadow",
get(handlers::shadow::get_shadow_root),
)
.route(
"/session/:session_id/shadow/:shadow_id/element",
"/session/{session_id}/shadow/{shadow_id}/element",
post(handlers::shadow::find_element_in_shadow),
)
.route(
"/session/:session_id/shadow/:shadow_id/elements",
"/session/{session_id}/shadow/{shadow_id}/elements",
post(handlers::shadow::find_elements_in_shadow),
)
.route(
"/session/:session_id/se/log/types",
"/session/{session_id}/se/log/types",
get(handlers::logs::get_types),
)
.route(
"/session/:session_id/cookie",
"/session/{session_id}/cookie",
get(handlers::cookie::get_all)
.post(handlers::cookie::add)
.delete(handlers::cookie::delete_all),
)
.route(
"/session/:session_id/cookie/:name",
"/session/{session_id}/cookie/{name}",
get(handlers::cookie::get).delete(handlers::cookie::delete),
)
.route("/session/:session_id/se/log", post(handlers::logs::get))
.route("/session/{session_id}/se/log", post(handlers::logs::get))
.with_state(state)
}
2 changes: 2 additions & 0 deletions src/web-ui/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
var m = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)');
var root = document.documentElement;
var bg = root.style.backgroundColor || (m && m.matches ? dark : light);
root.style.setProperty('--bitfun-startup-bg', bg);
root.style.backgroundColor = bg;
function paintBody() {
if (document.body) document.body.style.backgroundColor = bg;
Expand Down Expand Up @@ -64,6 +65,7 @@
display: flex;
align-items: center;
justify-content: center;
background: var(--bitfun-startup-bg, inherit);
color: rgba(143, 143, 153, 0.92);
font-family: "Noto Sans SC", "Inter", "Segoe UI", system-ui, sans-serif;
font-size: 13px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -703,6 +703,9 @@ const SessionsSection: React.FC<SessionsSectionProps> = ({
]
.filter(Boolean)
.join(' ')}
data-testid="session-nav-item"
data-session-id={session.sessionId}
data-session-title={sessionTitle}
onClick={() => handleSwitch(session.sessionId)}
>
{showSessionModeIcon ? (
Expand Down Expand Up @@ -869,6 +872,7 @@ const SessionsSection: React.FC<SessionsSectionProps> = ({
<button
type="button"
className={`bitfun-nav-panel__inline-toggle${metadataPageState.isLoading ? ' is-loading' : ''}`}
data-testid="session-nav-show-more"
disabled={metadataPageState.isLoading}
onClick={() => { void handleExpandToggle(); }}
>
Expand Down
4 changes: 1 addition & 3 deletions src/web-ui/src/app/components/SplashScreen/SplashScreen.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@
display: flex;
align-items: center;
justify-content: center;
// Explicit dark background as fallback for Linux WebKitGTK
// where CSS variable might not load synchronously
background: var(--color-bg-primary, #121214);
background: var(--bitfun-startup-bg, var(--color-bg-primary, #f3f3f5));
pointer-events: none;

// ── Exit state ─────────────────────────────────────────────────────────────
Expand Down
Loading
Loading