feat: public encoding path, better version control, client user agent

src/api/client/mod.rs

@@ -65,17 +65,13 @@ impl ApiClient {
 
 fn default_reqwest_client() -> Result<RClient, ApiClientError> {
     let mut default_headers = HeaderMap::new();
-
     default_headers.insert("Content-Type", HeaderValue::from_static("application/json"));
 
-    let user_agent = format!("banyanfs/{}", crate::version::version());
-    default_headers.insert(
-        "User-Agent",
-        HeaderValue::from_str(&user_agent).expect("valid user agent version"),
-    );
+    let user_agent = format!("banyanfs/{}", crate::version::minimal_version());
 
     let client = RClient::builder()
         .default_headers(default_headers)
+        .user_agent(user_agent)
         .build()?;
 
     Ok(client)

src/filesystem/drive/mod.rs

@@ -30,6 +30,8 @@ use crate::filesystem::nodes::{Node, NodeBuilder, NodeBuilderError, NodeId};
 pub struct Drive {
     current_key: Arc<SigningKey>,
     filesystem_id: FilesystemId,
+    private: bool,
+
     // todo: need to switch to a mutex, can't have state being modified during an encoding session
     // and the cooperative multitasking model of async/await means we can't guarantee that some
     // other task isn't going to tweak it
@@ -44,7 +46,19 @@ pub(crate) struct InnerDrive {
 }
 
 impl Drive {
-    pub async fn encode_private<W: AsyncWrite + Unpin + Send>(
+    pub async fn encode<W: AsyncWrite + Unpin + Send>(
+        &self,
+        rng: &mut impl CryptoRngCore,
+        writer: &mut W,
+    ) -> std::io::Result<usize> {
+        if self.private {
+            self.encode_private(rng, writer).await
+        } else {
+            unimplemented!("public encoding not implemented")
+        }
+    }
+
+    async fn encode_private<W: AsyncWrite + Unpin + Send>(
         &self,
         rng: &mut impl CryptoRngCore,
         writer: &mut W,
@@ -115,6 +129,7 @@ impl Drive {
         let drive = Self {
             current_key,
             filesystem_id,
+            private: true,
 
             inner: Arc::new(RwLock::new(InnerDrive {
                 access,

src/main.rs

@@ -27,7 +27,7 @@ async fn main() -> BanyanFsResult<()> {
         .with_filter(env_filter);
 
     tracing_subscriber::registry().with(stderr_layer).init();
-    debug!("running banyanfs {}", version());
+    debug!("running banyanfs {}", full_version());
 
     let mut rng = banyanfs::utils::crypto_rng();
 
@@ -114,7 +114,7 @@ async fn main() -> BanyanFsResult<()> {
         }
     };
 
-    if let Err(err) = drive.encode_private(&mut rng, &mut fh).await {
+    if let Err(err) = drive.encode(&mut rng, &mut fh).await {
         tracing::error!("failed to encode drive to file: {err}");
         return Ok(());
     }

src/version.rs

@@ -1,4 +1,4 @@
-pub fn version() -> String {
+pub fn full_version() -> String {
     format!(
         "build-profile={} build-timestamp={} features={} repo-version={}",
         env!("BUILD_PROFILE"),
@@ -7,3 +7,7 @@ pub fn version() -> String {
         env!("REPO_VERSION"),
     )
 }
+
+pub fn minimal_version() -> String {
+    format!("repo-version={}", env!("REPO_VERSION"),)
+}

src/wasm/mod.rs

@@ -8,7 +8,9 @@ pub(crate) mod tomb_compat;
 #[cfg(feature = "tomb-compat")]
 pub use tomb_compat::*;
 
-use crate::version::version;
+use crate::version::full_version;
+
+use tracing::info;
 
 // Pending needed improvements for the WASM components:
 //
@@ -32,7 +34,10 @@ pub fn wasm_init() -> Result<(), JsValue> {
         .build();
 
     tracing_wasm::set_as_global_default_with_config(wasm_log_config);
-    tracing::info!("successfully loaded banyanfs WASM module {}", version());
+    info!(
+        "successfully loaded banyanfs WASM module {}",
+        full_version()
+    );
 
     Ok(())
 }