Fix Surreal Memory Leak (#516)

Author: zupzup

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.3.12
+
+* impl Default for BillParticipant and BillAnonParticipant
+* Expose Receiver type for the PushApi trait
+* Fix SurrealDB Memory leak for WASM
+
 # 0.3.11
 
 * Add LICENSE to crates

Cargo.toml

@@ -13,6 +13,9 @@ opt-level = "s"   # Optimize for size ("z" can be used for even more aggressive
 lto = true        # Enable Link-Time Optimization
 codegen-units = 1 # Reduces binary size at the cost of compile time
 
+[profile.dev]
+opt-level = 1     # Avoid surrealdb index out of bounds issue in dev build
+
 [workspace.dependencies]
 sha2 = { version = "0.10", default-features = false }
 borsh = "1.5"
@@ -23,8 +26,8 @@ chrono = { version = "0.4", default-features = false, features = [
   "serde",
   "clock",
 ] }
-tokio = { version = "1.43", default-features = false, features = ["rt"] }
-tokio_with_wasm = { version = "0.8.2", features = ["rt"] }
+tokio = { version = "1.43", default-features = false, features = ["rt", "sync"] }
+tokio_with_wasm = { version = "0.8", features = ["rt", "sync"] }
 async-trait = "0.1"
 serde_json = "1"
 serde = { version = "1", default-features = false, features = ["derive"] }
@@ -38,7 +41,6 @@ bip39 = { version = "2.1", features = ["rand"] }
 ecies = { version = "0.2", default-features = false, features = ["pure"] }
 nostr = { version = "0.41" }
 nostr-sdk = { version = "0.41", features = ["nip04", "nip59"] }
-getrandom = { version = "0.3.1", features = ["wasm_js"] }
 async-broadcast = "0.7.2"
 rstest = "0.25.0"
 secp256k1 = { version = "0.29" }

crates/bcr-ebill-api/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bcr-ebill-api"
-version = "0.3.11"
+version = "0.3.12"
 edition = "2024"
 license = "MIT"
 

crates/bcr-ebill-api/src/persistence/mod.rs

@@ -1,4 +1,6 @@
 use crate::Config;
+#[cfg(not(target_arch = "wasm32"))]
+use bcr_ebill_persistence::get_surreal_db;
 use bcr_ebill_persistence::{
     BackupStoreApi, ContactStoreApi, NostrEventOffsetStoreApi, NotificationStoreApi,
     SurrealBackupStore, SurrealBillChainStore, SurrealBillStore, SurrealCompanyChainStore,
@@ -8,10 +10,9 @@ use bcr_ebill_persistence::{
     company::{CompanyChainStoreApi, CompanyStoreApi},
     db::{
         nostr_contact_store::SurrealNostrContactStore,
-        nostr_send_queue::SurrealNostrEventQueueStore,
+        nostr_send_queue::SurrealNostrEventQueueStore, surreal::SurrealWrapper,
     },
     file_upload::FileUploadStoreApi,
-    get_surreal_db,
     identity::{IdentityChainStoreApi, IdentityStoreApi},
     nostr::{NostrContactStoreApi, NostrQueuedMessageStoreApi},
 };
@@ -49,13 +50,27 @@ pub struct DbContext {
 }
 
 /// Creates a new instance of the DbContext with the given SurrealDB configuration.
-pub async fn get_db_context(conf: &Config) -> bcr_ebill_persistence::Result<DbContext> {
+pub async fn get_db_context(
+    #[allow(unused)] conf: &Config,
+) -> bcr_ebill_persistence::Result<DbContext> {
+    #[cfg(not(target_arch = "wasm32"))]
     let db = get_surreal_db(&conf.db_config).await?;
+    #[cfg(not(target_arch = "wasm32"))]
+    let surreal_wrapper = SurrealWrapper {
+        db: db.clone(),
+        files: false,
+    };
 
-    let company_store = Arc::new(SurrealCompanyStore::new(db.clone()));
     #[cfg(target_arch = "wasm32")]
-    let file_upload_store =
-        Arc::new(bcr_ebill_persistence::db::file_upload::FileUploadStore::new(db.clone()));
+    let surreal_wrapper = SurrealWrapper { files: false };
+
+    let company_store = Arc::new(SurrealCompanyStore::new(surreal_wrapper.clone()));
+    #[cfg(target_arch = "wasm32")]
+    let file_upload_store = Arc::new(
+        bcr_ebill_persistence::db::file_upload::FileUploadStore::new(SurrealWrapper {
+            files: true,
+        }),
+    );
 
     #[cfg(not(target_arch = "wasm32"))]
     let file_upload_store = Arc::new(
@@ -71,20 +86,26 @@ pub async fn get_db_context(conf: &Config) -> bcr_ebill_persistence::Result<DbCo
         error!("Error cleaning up temp uploads: {e}");
     }
 
-    let contact_store = Arc::new(SurrealContactStore::new(db.clone()));
+    let contact_store = Arc::new(SurrealContactStore::new(surreal_wrapper.clone()));
+
+    let bill_store = Arc::new(SurrealBillStore::new(surreal_wrapper.clone()));
+    let bill_blockchain_store = Arc::new(SurrealBillChainStore::new(surreal_wrapper.clone()));
 
-    let bill_store = Arc::new(SurrealBillStore::new(db.clone()));
-    let bill_blockchain_store = Arc::new(SurrealBillChainStore::new(db.clone()));
+    let identity_store = Arc::new(SurrealIdentityStore::new(surreal_wrapper.clone()));
+    let identity_chain_store = Arc::new(SurrealIdentityChainStore::new(surreal_wrapper.clone()));
+    let company_chain_store = Arc::new(SurrealCompanyChainStore::new(surreal_wrapper.clone()));
 
-    let identity_store = Arc::new(SurrealIdentityStore::new(db.clone()));
-    let identity_chain_store = Arc::new(SurrealIdentityChainStore::new(db.clone()));
-    let company_chain_store = Arc::new(SurrealCompanyChainStore::new(db.clone()));
+    let nostr_event_offset_store =
+        Arc::new(SurrealNostrEventOffsetStore::new(surreal_wrapper.clone()));
+    let notification_store = Arc::new(SurrealNotificationStore::new(surreal_wrapper.clone()));
 
-    let nostr_event_offset_store = Arc::new(SurrealNostrEventOffsetStore::new(db.clone()));
-    let notification_store = Arc::new(SurrealNotificationStore::new(db.clone()));
+    #[cfg(target_arch = "wasm32")]
+    let backup_store = Arc::new(SurrealBackupStore {});
+
+    #[cfg(not(target_arch = "wasm32"))]
     let backup_store = Arc::new(SurrealBackupStore::new(db.clone()));
-    let queued_message_store = Arc::new(SurrealNostrEventQueueStore::new(db.clone()));
-    let nostr_contact_store = Arc::new(SurrealNostrContactStore::new(db.clone()));
+    let queued_message_store = Arc::new(SurrealNostrEventQueueStore::new(surreal_wrapper.clone()));
+    let nostr_contact_store = Arc::new(SurrealNostrContactStore::new(surreal_wrapper.clone()));
 
     Ok(DbContext {
         contact_store,

crates/bcr-ebill-api/src/service/bill_service/data_fetching.rs

@@ -740,9 +740,12 @@ impl BillService {
         current_timestamp: u64,
     ) -> Result<BitcreditBillResult> {
         // if there is no such bill, we return an error
-        if !self.store.exists(bill_id).await {
-            return Err(Error::NotFound);
-        }
+        match self.store.exists(bill_id).await {
+            Ok(true) => (),
+            _ => {
+                return Err(Error::NotFound);
+            }
+        };
 
         // fetch contacts to get current contact data for participants
         let contacts = self.contact_store.get_map().await?;