More rust generalization: Executive Reference, Store & Model

.github/workflows/build-docs.yml

@@ -37,7 +37,7 @@ jobs:
 
       - name: Build Rust docs
         run: |
-          cargo doc -p acter -p acter-core -p matrix-sdk-store-file-event-cache
+          cargo doc -p acter -p acter-matrix -p acter-core -p matrix-sdk-store-file-event-cache
           echo --- Moving docs
           mv target/doc/ docs/api/main/rust
 

.github/workflows/check-native.yml

@@ -23,6 +23,9 @@ jobs:
           - name: Core
             package: acter-core
             clippy_extras: --tests
+          - name: Matrix Core
+            package: acter-matrix
+            clippy_extras: --tests
           - name: SDK
             package: acter
             needs_flutter: true
@@ -51,7 +54,8 @@ jobs:
         include:
           - name: Core
             package: acter-core
-            clippy_extras: --tests
+          - name: Matrix Core
+            package: acter-matrix
           # - name: file-event-cache
           #   package: matrix-sdk-store-file-event-cache
     steps:
@@ -81,9 +85,13 @@ jobs:
     strategy:
       matrix:
         include:
-          - name: SDK
+          - name: Matrix SDK
             package: acter
             needs_flutter: true
+          - name: Core on WASM
+            package: acter-core
+            cargo_flags: --target wasm32-unknown-unknown
+            needs_flutter: false
     steps:
       - uses: actions/checkout@v4
       - name: Install rust toolchain
@@ -94,7 +102,7 @@ jobs:
           flutter-version: '3.32'
           channel: 'stable'
       - name: Release Build
-        run: cargo build -p ${{matrix.package}} --release
+        run: cargo build -p ${{matrix.package}} --release ${{matrix.cargo_flags}}
 
 
   ffigen:

Cargo.toml

@@ -9,7 +9,7 @@ members = [
 default-members = ["native/acter"]
 
 [workspace.package]
-rust-version = "1.85"
+rust-version = "1.88"
 
 [workspace.dependencies.ffi-gen]
 git = "https://github.com/acterglobal/ffi-gen"
@@ -101,6 +101,8 @@ env_logger = "0.11.7"
 urlencoding = "2.1.3"
 eyeball-im = "0.7.0"
 
+tracing = { version = "0.1.40", features = ["log"] }
+
 [profile.release]
 panic = "unwind"
 opt-level = 2

native/acter/Cargo.toml

@@ -2,7 +2,7 @@
 name = "acter"
 version = "0.1.0"
 edition = "2021"
-rust-version = "1.81"
+rust-version = "1.88"
 description = "SDK of the acter app"
 homepage = "https://acter.global"
 repository = "https://github.com/acterglobal/a3"
@@ -81,6 +81,10 @@ ruma-common = { workspace = true, features = ["client"] }
 path = "../matrix"
 features = ["templates", "client"]
 
+[dependencies.acter-core]
+path = "../core"
+features = ["strum"]
+
 [dependencies.matrix-sdk]
 workspace = true
 features = [

native/acter/src/api/activities.rs

@@ -43,7 +43,7 @@ impl Activity {
     }
 
     pub fn origin_server_ts(&self) -> u64 {
-        self.inner.event_meta().origin_server_ts.get().into()
+        self.inner.event_meta().timestamp.get().into()
     }
 
     pub fn room_id_str(&self) -> String {

native/acter/src/api/attachments.rs

@@ -87,7 +87,7 @@ impl Attachment {
     }
 
     pub fn origin_server_ts(&self) -> u64 {
-        self.inner.meta.origin_server_ts.get().into()
+        self.inner.meta.timestamp.get().into()
     }
 
     pub fn ref_details(&self) -> Option<RefDetails> {
@@ -141,7 +141,7 @@ impl Attachment {
                                 .and_then(|info| info.mimetype.as_deref())
                                 .and_then(|mimetype| {
                                     mime2ext::mime2ext(mimetype).map(|ext| {
-                                        format!("{}-thumbnail.{}", evt_id, ext)
+                                        format!("{evt_id}-thumbnail.{ext}")
                                     })
                                 });
                             (request, filename)
@@ -161,7 +161,7 @@ impl Attachment {
                                 .and_then(|info| info.mimetype.as_deref())
                                 .and_then(|mimetype| {
                                     mime2ext::mime2ext(mimetype).map(|ext| {
-                                        format!("{}-thumbnail.{}", evt_id, ext)
+                                        format!("{evt_id}-thumbnail.{ext}")
                                     })
                                 });
                             (request, filename)
@@ -181,7 +181,7 @@ impl Attachment {
                                 .and_then(|info| info.mimetype.as_deref())
                                 .and_then(|mimetype| {
                                     mime2ext::mime2ext(mimetype).map(|ext| {
-                                        format!("{}-thumbnail.{}", evt_id, ext)
+                                        format!("{evt_id}-thumbnail.{ext}")
                                     })
                                 });
                             (request, filename)
@@ -202,7 +202,7 @@ impl Attachment {
                                 .and_then(|info| info.mimetype.as_deref())
                                 .and_then(|mimetype| {
                                     mime2ext::mime2ext(mimetype).map(|ext| {
-                                        format!("{}-thumbnail.{}", evt_id, ext)
+                                        format!("{evt_id}-thumbnail.{ext}")
                                     })
                                 });
                             (request, filename)
@@ -221,7 +221,7 @@ impl Attachment {
                                 .and_then(|info| info.mimetype.as_deref())
                                 .and_then(|mimetype| {
                                     mime2ext::mime2ext(mimetype)
-                                        .map(|ext| format!("{}.{}", evt_id, ext))
+                                        .map(|ext| format!("{evt_id}.{ext}"))
                                 });
                             (Some(request), filename)
                         }
@@ -236,7 +236,7 @@ impl Attachment {
                                 .and_then(|info| info.mimetype.as_deref())
                                 .and_then(|mimetype| {
                                     mime2ext::mime2ext(mimetype)
-                                        .map(|ext| format!("{}.{}", evt_id, ext))
+                                        .map(|ext| format!("{evt_id}.{ext}"))
                                 });
                             (Some(request), filename)
                         }
@@ -251,7 +251,7 @@ impl Attachment {
                                 .and_then(|info| info.mimetype.as_deref())
                                 .and_then(|mimetype| {
                                     mime2ext::mime2ext(mimetype)
-                                        .map(|ext| format!("{}.{}",evt_id, ext))
+                                        .map(|ext| format!("{evt_id}.{ext}"))
                                 });
                             (Some(request), filename)
                         }
@@ -266,7 +266,7 @@ impl Attachment {
                                 .and_then(|info| info.mimetype.as_deref())
                                 .and_then(|mimetype| {
                                     mime2ext::mime2ext(mimetype)
-                                        .map(|ext| format!("{}.{}", evt_id, ext))
+                                        .map(|ext| format!("{evt_id}.{ext}"))
                                 });
                             (Some(request), filename)
                         }

native/acter/src/api/client.rs

@@ -3,7 +3,8 @@ use acter_matrix::{
     executor::Executor,
     models::AnyActerModel,
     referencing::{
-        ExecuteReference, IndexKey, ModelParam, ObjectListIndex, RoomParam, SectionIndex,
+        ExecuteReference, IndexKey, IntoExecuteReference, ModelParam, ObjectListIndex, RoomParam,
+        SectionIndex,
     },
     store::Store,
     templates::Engine,
@@ -400,7 +401,7 @@ impl Client {
 
     pub fn subscribe_model_stream(&self, key: String) -> Result<impl Stream<Item = bool>> {
         let model_id = EventId::parse(key)?;
-        Ok(BroadcastStream::new(self.subscribe(model_id)).map(|_| true))
+        Ok(BroadcastStream::new(self.subscribe(model_id.to_owned())).map(|_| true))
     }
 
     pub fn subscribe_model_param_stream(
@@ -433,7 +434,7 @@ impl Client {
 
     pub fn subscribe_room_stream(&self, key: String) -> Result<impl Stream<Item = bool>> {
         let model_id = RoomId::parse(key)?;
-        Ok(BroadcastStream::new(self.subscribe(model_id)).map(|_| true))
+        Ok(BroadcastStream::new(self.subscribe(model_id.to_owned())).map(|_| true))
     }
 
     pub fn subscribe_room_param_stream(
@@ -486,8 +487,8 @@ impl Client {
         )
     }
 
-    pub fn subscribe<K: Into<ExecuteReference>>(&self, key: K) -> Receiver<()> {
-        self.executor().subscribe(key)
+    pub fn subscribe<K: IntoExecuteReference>(&self, key: K) -> Receiver<()> {
+        self.executor().subscribe(key.into())
     }
 
     pub async fn wait_for(&self, key: String, timeout: Option<u8>) -> Result<AnyActerModel> {

native/acter/src/api/client/sync.rs

@@ -1,6 +1,9 @@
 use acter_matrix::{
-    events::AnySyncActerEvent, executor::Executor, models::AnyActerModel,
-    referencing::ExecuteReference, spaces::is_acter_space,
+    events::AnySyncActerEvent,
+    executor::Executor,
+    models::{event_meta_for_redacted_source, AnyActerModel, EventMeta},
+    referencing::ExecuteReference,
+    spaces::is_acter_space,
 };
 use anyhow::Result;
 use core::time::Duration;
@@ -235,7 +238,12 @@ impl Client {
 
                 if let RoomRedactionEvent::Original(t) = ev.into_full_event(room_id.to_owned()) {
                     trace!(?room_id, "received redaction");
-                    if let Err(error) = executor.live_redact(t).await {
+                    let Some(meta) = event_meta_for_redacted_source(&t) else {
+                        warn!(?room_id, "redaction event has no meta");
+                        return;
+                    };
+
+                    if let Err(error) = executor.live_redact(meta, Some(t.into())).await {
                         error!(?room_id, ?error, "redaction failed");
                     }
                 } else {

native/acter/src/api/comments.rs

@@ -107,7 +107,7 @@ impl Comment {
     }
 
     pub fn origin_server_ts(&self) -> u64 {
-        self.inner.meta.origin_server_ts.get().into()
+        self.inner.meta.timestamp.get().into()
     }
 
     pub fn msg_content(&self) -> MsgContent {

native/acter/src/api/invitations/manager.rs

@@ -62,7 +62,7 @@ impl InvitationsManager {
                     // Process each room invitation
                     match RoomInvitation::parse(&core, room).await {
                         Ok(invitation) => invites.push(invitation),
-                        Err(err) => log::error!("Failed to parse room invitation: {}", err),
+                        Err(err) => log::error!("Failed to parse room invitation: {err}"),
                     }
                 }
                 invites

native/acter/src/api/news.rs

@@ -444,7 +444,7 @@ impl NewsEntry {
     }
 
     pub fn origin_server_ts(&self) -> u64 {
-        self.content.meta.origin_server_ts.get().into()
+        self.content.meta.timestamp.get().into()
     }
 
     pub async fn ref_details(&self) -> Result<RefDetails> {

native/acter/src/api/reactions.rs

@@ -55,7 +55,7 @@ impl Reaction {
     }
 
     pub fn origin_server_ts(&self) -> u64 {
-        self.inner.meta.origin_server_ts.get().into()
+        self.inner.meta.timestamp.get().into()
     }
 
     pub fn relates_to(&self) -> String {

native/acter/src/api/rsvp.rs

@@ -195,7 +195,7 @@ impl Rsvp {
     }
 
     pub fn origin_server_ts(&self) -> u64 {
-        self.inner.meta.origin_server_ts.get().into()
+        self.inner.meta.timestamp.get().into()
     }
 
     pub fn status(&self) -> String {

native/acter/src/api/stories.rs

@@ -418,7 +418,7 @@ impl Story {
     }
 
     pub fn origin_server_ts(&self) -> u64 {
-        self.content.meta.origin_server_ts.get().into()
+        self.content.meta.timestamp.get().into()
     }
 
     pub async fn ref_details(&self) -> Result<RefDetails> {

native/acter/src/platform/native.rs

@@ -282,10 +282,10 @@ impl Display for MakeStoreConfigError {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
             MakeStoreConfigError::OpenStoreError(i) => {
-                write!(f, "MakeStoreConfigError::OpenStoreError {}", i)
+                write!(f, "MakeStoreConfigError::OpenStoreError {i}")
             }
             MakeStoreConfigError::EventCacheStoreError(i) => {
-                write!(f, "MakeStoreConfigError::EventCacheStoreError {}", i)
+                write!(f, "MakeStoreConfigError::EventCacheStoreError {i}")
             }
         }
     }

native/core/Cargo.toml

@@ -9,4 +9,26 @@ repository = "https://github.com/acterglobal/a3"
 license-file = "../../LICENSE.txt"
 rust-version.workspace = true
 
+[features]
+testing = [ "tokio/full", "thiserror"]
+strum = ["dep:strum"]
+
 [dependencies]
+strum = { workspace = true, optional = true }
+serde = { version = "1", features = ["derive"] }
+tracing = { workspace = true }
+async-recursion = "1"
+eyeball-im = { workspace = true }
+futures = { version = "0.3.30" }
+scc = "2.3.4"
+tokio = { version = "1" }
+
+# for testing-feature only
+thiserror = { version = "2", optional = true }
+
+[dev-dependencies]
+serde_json = "1"
+tokio = { version = "1", features = ["full"] }
+thiserror = "2"
+env_logger = "0.11"
+anyhow = "1"