fingerprint

Author: epompeii

Cargo.lock

@@ -26,7 +26,6 @@ bencher_adapter = { path = "lib/bencher_adapter" }
 bencher_boundary = { path = "lib/bencher_boundary" }
 bencher_client = { path = "lib/bencher_client" }
 bencher_comment = { path = "lib/bencher_comment" }
-bencher_fingerprint = { path = "lib/bencher_fingerprint" }
 bencher_github = { path = "lib/bencher_github" }
 bencher_json = { path = "lib/bencher_json" }
 bencher_logger = { path = "lib/bencher_logger" }

Cargo.toml

@@ -168,7 +168,7 @@ impl From<bencher_json::DateTimeMillis> for types::DateTimeMillis {
     }
 }
 
-macro_rules! into_uuids {
+macro_rules! try_into_json_uuids {
     ($($list:ident[$name:ident]),*) => {
         $(
             impl TryFrom<types::$list> for bencher_json::JsonUuids {
@@ -189,7 +189,7 @@ macro_rules! into_uuids {
     };
 }
 
-into_uuids!(
+try_into_json_uuids!(
     JsonOrganizations[JsonOrganization],
     JsonMembers[JsonMember],
     JsonProjects[JsonProject],
@@ -203,7 +203,7 @@ into_uuids!(
     JsonAlerts[JsonAlert]
 );
 
-macro_rules! into_uuid {
+macro_rules! try_into_json_uuid {
     ($($name:ident),*) => {
         $(
             impl TryFrom<types::$name> for bencher_json::JsonUuid {
@@ -220,7 +220,7 @@ macro_rules! into_uuid {
     };
 }
 
-into_uuid!(
+try_into_json_uuid!(
     JsonOrganization,
     JsonMember,
     JsonProject,
@@ -234,3 +234,17 @@ into_uuid!(
     JsonModel,
     JsonAlert
 );
+
+macro_rules! from_uuid {
+    ($($name:ident),*) => {
+        $(
+            impl From<bencher_json::$name> for types::$name  {
+                fn from(json: bencher_json::$name) -> Self {
+                    Self::from(uuid::Uuid::from(json))
+                }
+            }
+        )*
+    };
+}
+
+from_uuid!(Fingerprint);

lib/bencher_client/src/lib.rs

@@ -1,10 +1,10 @@
 use std::sync::LazyLock;
 
 pub use bencher_valid::{
-    BenchmarkName, Boundary, BranchName, CdfBoundary, DateTime, DateTimeMillis, Email, GitHash,
-    Index, IqrBoundary, Jwt, Model, ModelTest, NameId, NameIdKind, NonEmpty, PercentageBoundary,
-    ResourceId, ResourceIdKind, ResourceName, SampleSize, Sanitize, Secret, Slug, Units, Url,
-    UserName, ValidError, Window,
+    BenchmarkName, Boundary, BranchName, CdfBoundary, DateTime, DateTimeMillis, Email, Fingerprint,
+    GitHash, Index, IqrBoundary, Jwt, Model, ModelTest, NameId, NameIdKind, NonEmpty,
+    PercentageBoundary, ResourceId, ResourceIdKind, ResourceName, SampleSize, Sanitize, Secret,
+    Slug, Units, Url, UserName, ValidError, Window,
 };
 #[cfg(feature = "plus")]
 pub use bencher_valid::{

lib/bencher_fingerprint/Cargo.toml

@@ -48,6 +48,11 @@ regex = { version = "1.11", optional = true }
 regex-lite = { version = "0.1", optional = true }
 wasm-bindgen = { version = "0.2", optional = true }
 
+[target.'cfg(target_os = "windows")'.dependencies]
+windows = { version = "0.60", optional = true, features = [
+    "System_Profile_SystemManufacturers",
+] }
+
 [dev-dependencies]
 # Workspace
 pretty_assertions.workspace = true

lib/bencher_fingerprint/src/lib.rs

@@ -56,6 +56,8 @@ pub enum ValidError {
     Index(u8),
     #[error("Failed to parse plot index: {0}")]
     IndexStr(std::num::ParseIntError),
+    #[error("Failed to validate fingerprint: {0}")]
+    Fingerprint(String),
 
     #[cfg(feature = "plus")]
     #[error("Failed to validate plan level: {0}")]

lib/bencher_json/src/lib.rs

@@ -0,0 +1,37 @@
+use std::str::FromStr;
+
+use derive_more::Display;
+#[cfg(feature = "schema")]
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+use uuid::Uuid;
+#[cfg(feature = "wasm")]
+use wasm_bindgen::prelude::*;
+
+use crate::ValidError;
+
+#[cfg(feature = "lite")]
+mod target_os;
+
+#[typeshare::typeshare]
+#[derive(Debug, Display, Clone, Copy, Eq, PartialEq, Hash, Serialize, Deserialize)]
+#[cfg_attr(feature = "schema", derive(JsonSchema))]
+#[cfg_attr(feature = "db", derive(diesel::FromSqlRow, diesel::AsExpression))]
+#[cfg_attr(feature = "db", diesel(sql_type = diesel::sql_types::Text))]
+pub struct Fingerprint(Uuid);
+
+impl FromStr for Fingerprint {
+    type Err = ValidError;
+
+    fn from_str(fingerprint: &str) -> Result<Self, Self::Err> {
+        Ok(Self(fingerprint.parse().map_err(|_e| {
+            ValidError::Fingerprint(fingerprint.to_owned())
+        })?))
+    }
+}
+
+impl From<Fingerprint> for Uuid {
+    fn from(fingerprint: Fingerprint) -> Self {
+        fingerprint.0
+    }
+}

lib/bencher_valid/Cargo.toml

@@ -1,5 +1,7 @@
 use std::fs;
 
+use uuid::Uuid;
+
 const HEX_BASE: u32 = 16;
 
 impl crate::Fingerprint {
@@ -10,8 +12,9 @@ impl crate::Fingerprint {
     }
 }
 
-fn parse_machine_id(path: &str) -> Option<u128> {
+fn parse_machine_id(path: &str) -> Option<Uuid> {
     fs::read_to_string(path)
         .ok()
         .and_then(|id| u128::from_str_radix(id.trim(), HEX_BASE).ok())
+        .map(Uuid::from_u128)
 }