Make Database.sync() async in the promise API

Author: penberg

Cargo.lock

@@ -11,7 +11,7 @@ exclude = ["index.node"]
 crate-type = ["cdylib"]
 
 [dependencies]
-libsql = { git = "https://github.com/libsql/libsql/", rev = "c95b60fcdf93c428634500c5cf18677e3b28e59a" }
+libsql = { git = "https://github.com/libsql/libsql/", rev = "0e524b476cd1bba16d62c935dd2a7cf66bce4418" }
 once_cell = "1.18.0"
 tokio = { version = "1.29.1", features = [ "rt-multi-thread" ] }
 

Cargo.toml

@@ -12,7 +12,7 @@ const {
   databaseOpenWithRpcSync,
   databaseInTransaction,
   databaseClose,
-  databaseSync,
+  databaseSyncSync,
   databaseExecSync,
   databasePrepareSync,
   databaseDefaultSafeIntegers,
@@ -68,7 +68,7 @@ class Database {
   }
 
   sync() {
-    databaseSync.call(this.db);
+    databaseSyncSync.call(this.db);
   }
 
   /**

index.js

@@ -14,7 +14,7 @@ const {
   databaseOpenWithRpcSync,
   databaseInTransaction,
   databaseClose,
-  databaseSync,
+  databaseSyncAsync,
   databaseExecAsync,
   databasePrepareAsync,
   databaseDefaultSafeIntegers,
@@ -68,7 +68,7 @@ class Database {
   }
 
   sync() {
-    databaseSync.call(this.db);
+    databaseSyncAsync.call(this.db);
   }
 
   /**

promise.js

@@ -15,7 +15,7 @@ fn runtime<'a, C: Context<'a>>(cx: &mut C) -> NeonResult<&'static Runtime> {
 }
 
 struct Database {
-    db: libsql::Database,
+    db: Arc<Mutex<libsql::Database>>,
     conn: RefCell<Option<Arc<libsql::Connection>>>,
     stmts: Arc<Mutex<Vec<Arc<Mutex<libsql::Statement>>>>>,
     default_safe_integers: RefCell<bool>,
@@ -29,7 +29,7 @@ impl Finalize for Database {}
 impl Database {
     fn new(db: libsql::Database, conn: libsql::Connection) -> Self {
         Database {
-            db,
+            db: Arc::new(Mutex::new(db)),
             conn: RefCell::new(Some(Arc::new(conn))),
             stmts: Arc::new(Mutex::new(vec![])),
             default_safe_integers: RefCell::new(false),
@@ -87,14 +87,40 @@ impl Database {
         Ok(cx.undefined())
     }
 
-    fn js_sync(mut cx: FunctionContext) -> JsResult<JsUndefined> {
+    fn js_sync_sync(mut cx: FunctionContext) -> JsResult<JsUndefined> {
         let db: Handle<'_, JsBox<Database>> = cx.this()?;
+        let db = db.db.clone();
         let rt = runtime(&mut cx)?;
-        rt.block_on(db.db.sync())
-            .or_else(|err| cx.throw_error(from_libsql_error(err)))?;
+        rt.block_on(async move {
+            let db = db.lock().await;
+            db.sync().await
+        }).or_else(|err| cx.throw_error(from_libsql_error(err)))?;
         Ok(cx.undefined())
     }
 
+    fn js_sync_async(mut cx: FunctionContext) -> JsResult<JsPromise> {
+        let db: Handle<'_, JsBox<Database>> = cx.this()?;
+        let (deferred, promise) = cx.promise();
+        let channel = cx.channel();
+        let db = db.db.clone();
+        let rt = runtime(&mut cx)?;
+        rt.spawn(async move {
+            let result = db.lock().await.sync().await;
+            match result {
+                Ok(_) => {
+                    deferred.settle_with(&channel, |mut cx| Ok(cx.undefined()));
+                }
+                Err(err) => {
+                    deferred.settle_with(&channel, |mut cx| {
+                        cx.throw_error(from_libsql_error(err))?;
+                        Ok(cx.undefined())
+                    });
+                }
+            }
+        });
+        Ok(promise)
+    }
+
     fn js_exec_sync(mut cx: FunctionContext) -> JsResult<JsUndefined> {
         let db: Handle<'_, JsBox<Database>> = cx.this()?;
         let sql = cx.argument::<JsString>(0)?.value(&mut cx);
@@ -592,7 +618,8 @@ fn main(mut cx: ModuleContext) -> NeonResult<()> {
     cx.export_function("databaseOpenWithRpcSync", Database::js_open_with_rpc_sync)?;
     cx.export_function("databaseInTransaction", Database::js_in_transaction)?;
     cx.export_function("databaseClose", Database::js_close)?;
-    cx.export_function("databaseSync", Database::js_sync)?;
+    cx.export_function("databaseSyncSync", Database::js_sync_sync)?;
+    cx.export_function("databaseSyncAsync", Database::js_sync_async)?;
     cx.export_function("databaseExecSync", Database::js_exec_sync)?;
     cx.export_function("databaseExecAsync", Database::js_exec_async)?;
     cx.export_function("databasePrepareSync", Database::js_prepare_sync)?;