feat: Simplify Timestamp handling for WASM and non-WASM targets

Author: MohamadJaara

crypto-ffi/src/identity/x509.rs

@@ -1,7 +1,3 @@
-#[cfg(target_family = "wasm")]
-use std::time::{Duration, SystemTime};
-
-#[cfg(not(target_family = "wasm"))]
 use crate::Timestamp;
 
 /// Represents the parts of [WireIdentity][crate::WireIdentity] that are specific to a X509 certificate (and not a Basic
@@ -23,40 +19,22 @@ pub struct X509Identity {
     pub serial_number: String,
 
     /// X509 certificate not before
-    #[cfg(not(target_family = "wasm"))]
     pub not_before: Timestamp,
-    /// X509 certificate not before
-    #[cfg(target_family = "wasm")]
-    pub not_before: SystemTime,
 
     /// X509 certificate not after
-    #[cfg(not(target_family = "wasm"))]
     pub not_after: Timestamp,
-    /// X509 certificate not after
-    #[cfg(target_family = "wasm")]
-    pub not_after: SystemTime,
 }
 
 impl From<core_crypto::X509Identity> for X509Identity {
     fn from(i: core_crypto::X509Identity) -> Self {
-        #[cfg(not(target_family = "wasm"))]
-        let not_before = Timestamp::from_epoch_secs(i.not_before);
-        #[cfg(target_family = "wasm")]
-        let not_before = SystemTime::UNIX_EPOCH + Duration::from_secs(i.not_before);
-
-        #[cfg(not(target_family = "wasm"))]
-        let not_after = Timestamp::from_epoch_secs(i.not_after);
-        #[cfg(target_family = "wasm")]
-        let not_after = SystemTime::UNIX_EPOCH + Duration::from_secs(i.not_after);
-
         Self {
             handle: i.handle,
             display_name: i.display_name,
             domain: i.domain,
             certificate: i.certificate,
             serial_number: i.serial_number,
-            not_before,
-            not_after,
+            not_before: Timestamp::from_epoch_secs(i.not_before),
+            not_after: Timestamp::from_epoch_secs(i.not_after),
         }
     }
 }

crypto-ffi/src/lib.rs

@@ -29,7 +29,6 @@ mod key_package;
 mod metadata;
 mod proteus;
 mod signature_scheme;
-#[cfg(not(target_family = "wasm"))]
 mod timestamp;
 
 pub use bundles::{
@@ -76,5 +75,4 @@ pub use identity::{
 pub use key_package::{Keypackage, KeypackageRef};
 pub use metadata::{BuildMetadata, build_metadata, version};
 pub use signature_scheme::SignatureScheme;
-#[cfg(not(target_family = "wasm"))]
 pub use timestamp::Timestamp;

crypto-ffi/src/timestamp.rs

@@ -3,20 +3,18 @@
 //! This wrapper allows custom type mapping per target language:
 //! - Kotlin: maps to `kotlinx.datetime.Instant`
 //! - Swift: maps to `Date`
+//! - WASM/JS: maps to `Date` (via uniffi-bindgen-react-native)
 //!
-//! This unifies timestamp handling across JVM/Android and KMP bindings.
+//! This unifies timestamp handling across JVM/Android, KMP.
 //! This can be removed once we fully migrate to Kotlin Multiplatform and
 //! stop generating JVM/Android bindings.
 
-#[cfg(not(target_family = "wasm"))]
 use std::time::{Duration, SystemTime};
 
 /// A wrapper around `SystemTime` for FFI bindings with custom type mapping per language.
-#[cfg(not(target_family = "wasm"))]
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
 pub struct Timestamp(pub SystemTime);
 
-#[cfg(not(target_family = "wasm"))]
 impl Timestamp {
     /// Creates a new `Timestamp` from a `SystemTime`.
     pub fn new(time: SystemTime) -> Self {
@@ -34,19 +32,16 @@ impl Timestamp {
     }
 }
 
-#[cfg(not(target_family = "wasm"))]
 impl From<SystemTime> for Timestamp {
     fn from(time: SystemTime) -> Self {
         Self(time)
     }
 }
 
-#[cfg(not(target_family = "wasm"))]
 impl From<Timestamp> for SystemTime {
     fn from(timestamp: Timestamp) -> Self {
         timestamp.0
     }
 }
 
-#[cfg(not(target_family = "wasm"))]
 uniffi::custom_type!(Timestamp, SystemTime);