chore: wrap transaction with retry (#424)

* chore: wrap transaction with retry

* chore: bump jni

* ci: bump to [email protected]

Author: thorseraq

.github/workflows/jwst-android.yml

@@ -32,7 +32,7 @@ jobs:
                   target: aarch64-linux-android
             - run: cargo install cargo-ndk
             - name: Publish package
-              uses: gradle/gradle-build-action@v2
+              uses: gradle/gradle-build-action@v2.4.2
               with:
                   arguments: :jwst:publishReleasePublicationToGitHubPackagesRepository
                   build-root-directory: apps/android

apps/cloud/src/api/workspace.rs

@@ -475,7 +475,7 @@ pub async fn get_public_doc(
 async fn get_workspace_doc(ctx: Arc<Context>, workspace_id: String) -> Response {
     match ctx.storage.get_workspace(workspace_id).await {
         Ok(workspace) => {
-            if let Ok(update) = workspace.sync_migration(50) {
+            if let Ok(update) = workspace.sync_migration() {
                 update.into_response()
             } else {
                 ErrorStatus::NotFound.into_response()

libs/jwst-binding/jwst-jni/android/build.gradle

@@ -117,7 +117,7 @@ publishing {
         release(MavenPublication) {
             groupId = 'com.toeverything'
             artifactId = 'octobase'
-            version = '0.1.18'
+            version = '0.1.19'
 
             afterEvaluate {
                 from components.release

libs/jwst-storage/src/storage/mod.rs

@@ -146,7 +146,7 @@ impl JwstStorage {
                         };
                         Some(update)
                     } else {
-                        workspace.sync_migration(50).ok()
+                        workspace.sync_migration().ok()
                     };
 
                     let Some(update) = update else {

libs/jwst/src/lib.rs

@@ -22,6 +22,8 @@ pub use workspace::{MapSubscription, Workspace, WorkspaceMetadata, WorkspaceTran
 #[cfg(feature = "workspace-search")]
 pub use workspace::{SearchResult, SearchResults};
 
+const RETRY_NUM: i32 = 200;
+
 #[inline]
 pub fn print_versions(pkg_name: &str, pkg_version: &str) {
     use convert_case::{Case, Casing};

libs/jwst/src/space/convert.rs

@@ -162,6 +162,6 @@ impl Space {
             Ok::<_, JwstError>(())
         })?;
 
-        ws.sync_migration(10)
+        ws.sync_migration()
     }
 }

libs/jwst/src/workspace/sync.rs

@@ -1,4 +1,5 @@
 use super::*;
+use crate::RETRY_NUM;
 use jwst_codec::{write_sync_message, DocMessage, SyncMessage, SyncMessageScanner};
 use std::{
     panic::{catch_unwind, AssertUnwindSafe},
@@ -11,7 +12,8 @@ use yrs::{
 };
 
 impl Workspace {
-    pub fn sync_migration(&self, mut retry: i32) -> JwstResult<Vec<u8>> {
+    pub fn sync_migration(&self) -> JwstResult<Vec<u8>> {
+        let mut retry = RETRY_NUM;
         let trx = loop {
             match self.doc.try_transact() {
                 Ok(trx) => break trx,
@@ -30,7 +32,7 @@ impl Workspace {
 
     pub async fn sync_init_message(&self) -> JwstResult<Vec<u8>> {
         let (sv, awareness_update) = {
-            let mut retry = 50;
+            let mut retry = RETRY_NUM;
             let trx = loop {
                 if let Ok(trx) = self.doc.try_transact() {
                     break trx;
@@ -87,7 +89,7 @@ impl Workspace {
         if !content_msg.is_empty() {
             let doc = self.doc();
             if let Err(e) = catch_unwind(AssertUnwindSafe(|| {
-                let mut retry = 30;
+                let mut retry = RETRY_NUM;
                 let mut trx = loop {
                     if let Ok(trx) = doc.try_transact_mut() {
                         break trx;

libs/jwst/src/workspace/transaction.rs

@@ -1,8 +1,10 @@
 use std::{thread::sleep, time::Duration};
+use std::cmp::max;
 
 use crate::utils::JS_INT_RANGE;
 
 use super::*;
+use crate::RETRY_NUM;
 use lib0::any::Any;
 use yrs::{Map, ReadTxn, Transact, TransactionMut};
 
@@ -99,33 +101,19 @@ impl WorkspaceTransaction<'_> {
 
 impl Workspace {
     pub fn with_trx<T>(&self, f: impl FnOnce(WorkspaceTransaction) -> T) -> T {
-        let doc = self.doc();
-        let trx = WorkspaceTransaction {
-            trx: doc.transact_mut(),
-            ws: self,
-        };
-
-        f(trx)
+        self.retry_with_trx(f, RETRY_NUM).unwrap()
     }
 
     pub fn try_with_trx<T>(&self, f: impl FnOnce(WorkspaceTransaction) -> T) -> Option<T> {
-        match self.doc().try_transact_mut() {
-            Ok(trx) => {
-                let trx = WorkspaceTransaction { trx, ws: self };
-                Some(f(trx))
-            }
-            Err(e) => {
-                info!("try_with_trx error: {}", e);
-                None
-            }
-        }
+        self.retry_with_trx(f, RETRY_NUM).ok()
     }
 
     pub fn retry_with_trx<T>(
         &self,
         f: impl FnOnce(WorkspaceTransaction) -> T,
         mut retry: i32,
     ) -> JwstResult<T> {
+        retry = max(RETRY_NUM, retry);
         let trx = loop {
             match self.doc.try_transact_mut() {
                 Ok(trx) => break trx,