Skip to content

armgit / moli

Public Imported from GitHub
0

Best headless browser for AI agents. Lite, Fast, High-Compatibility. Built in Rust

feat(cdp): expose Moli version in discovery

ldm0f12f497bf154
diff --git a/Cargo.lock b/Cargo.lock
index efe1502ce..8713e659b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3244,6 +3244,7 @@ dependencies = [
"time",
"tokio",
"tokio-tungstenite",
+ "toml",
"tracing",
"url",
"v8",
diff --git a/moli-protocol-server/src/protocol_server/cdp.rs b/moli-protocol-server/src/protocol_server/cdp.rs
index 3db7ff1ae..ef3ed2073 100644
--- a/moli-protocol-server/src/protocol_server/cdp.rs
+++ b/moli-protocol-server/src/protocol_server/cdp.rs
@@ -23,6 +23,7 @@ use super::{
pub(super) async fn json_version(State(state): State<AppState>) -> impl IntoResponse {
axum::Json(json!({
"Browser": version::PRODUCT,
+ "Moli-Version": version::MOLI_VERSION,
"Protocol-Version": version::PROTOCOL_VERSION,
"User-Agent": state.fetch_config.user_agent(),
"V8-Version": version::js_version(),
diff --git a/moli-protocol-server/src/protocol_server/tests/misc.rs b/moli-protocol-server/src/protocol_server/tests/misc.rs
index 035d1ed4c..7e7db9670 100644
--- a/moli-protocol-server/src/protocol_server/tests/misc.rs
+++ b/moli-protocol-server/src/protocol_server/tests/misc.rs
@@ -219,6 +219,7 @@ async fn discovery_endpoints_accept_trailing_slashes() {
json!("ws://127.0.0.1:9222/devtools/browser/moli-browser")
);
assert_eq!(version["Browser"], json!(version::PRODUCT));
+ assert_eq!(version["Moli-Version"], json!(version::MOLI_VERSION));
assert_eq!(
version["Protocol-Version"],
json!(version::PROTOCOL_VERSION)
diff --git a/moli-protocol/Cargo.toml b/moli-protocol/Cargo.toml
index 13cfb110d..f66a13ab2 100644
--- a/moli-protocol/Cargo.toml
+++ b/moli-protocol/Cargo.toml
@@ -63,6 +63,7 @@ moli-storage-service = { path = "../moli-storage-service" }
moli-v8-init = { path = "../moli-v8-init" }
[build-dependencies]
+toml = { version = "1.1", default-features = false, features = ["parse", "std"] }
vergen-gitcl = "10.0.2"
[lints]
diff --git a/moli-protocol/build.rs b/moli-protocol/build.rs
index eece489c1..196b69c80 100644
--- a/moli-protocol/build.rs
+++ b/moli-protocol/build.rs
@@ -1,7 +1,17 @@
-use std::process::Command;
+use std::{fs, path::Path, process::Command};
use vergen_gitcl::{Emitter, Gitcl};
fn main() -> Result<(), Box<dyn std::error::Error>> {
+ let moli_manifest_path = Path::new(env!("CARGO_MANIFEST_DIR")).join("../moli/Cargo.toml");
+ println!("cargo:rerun-if-changed={}", moli_manifest_path.display());
+ let moli_manifest: toml::Table = fs::read_to_string(moli_manifest_path)?.parse()?;
+ let moli_version = moli_manifest
+ .get("package")
+ .and_then(|package| package.get("version"))
+ .and_then(toml::Value::as_str)
+ .ok_or("Moli's package.version must be a string")?;
+ println!("cargo:rustc-env=MOLI_VERSION={moli_version}");
+
let git = Gitcl::builder().sha(false).build();
Emitter::default()
.fail_on_error()
diff --git a/moli-protocol/src/version.rs b/moli-protocol/src/version.rs
index 39acf3897..219d339f2 100644
--- a/moli-protocol/src/version.rs
+++ b/moli-protocol/src/version.rs
@@ -1,5 +1,6 @@
//! Shared CDP version metadata.
+pub const MOLI_VERSION: &str = env!("MOLI_VERSION");
pub const PROTOCOL_VERSION: &str = "1.3";
pub const PRODUCT: &str = moli_browser_profile::DEFAULT_CDP_PRODUCT;
pub const REVISION: &str = concat!("@", env!("VERGEN_GIT_SHA"));
diff --git a/moli/tests/cli.rs b/moli/tests/cli.rs
index d91f38cb5..e551e8151 100644
--- a/moli/tests/cli.rs
+++ b/moli/tests/cli.rs
@@ -706,6 +706,10 @@ fn rejects_removed_version_and_help_subcommands() {
#[test]
fn standard_version_and_help_flags_remain_available() {
+ assert_eq!(
+ moli_protocol::version::MOLI_VERSION,
+ env!("CARGO_PKG_VERSION")
+ );
for (flag, expected_kind) in [
("--version", clap::error::ErrorKind::DisplayVersion),
("--help", clap::error::ErrorKind::DisplayHelp),