feat(libsql-server): send correct sse response

.github/workflows/nemesis.yml

@@ -18,7 +18,7 @@ jobs:
     if: github.repository == 'tursodatabase/libsql'
     name: Run Nemesis Tests
     env:
-      RUSTFLAGS: -D warnings
+      RUSTFLAGS: -D warnings --cfg tokio_unstable
     steps:
       - uses: hecrj/setup-rust-action@v2
 

.github/workflows/publish-server.yml

@@ -118,23 +118,9 @@ jobs:
           context: .
           platforms: ${{ env.platform }}
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,name=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }},push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,name=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-debug,push-by-digest=true,name-canonical=true,push=true
           build-args: |
             BUILD_DEBUG=true
-      -
-        name: Export digest
-        run: |
-          mkdir -p /tmp/digests
-          digest="${{ steps.build.outputs.digest }}"
-          touch "/tmp/digests/${digest#sha256:}"          
-      -
-        name: Upload digest
-        uses: actions/upload-artifact@v4
-        with:
-          name: digests-debug-${{ env.PLATFORM_PAIR }}
-          path: /tmp/digests/*
-          if-no-files-found: error
-          retention-days: 1
 
   build-arm64:
     permissions: write-all

.github/workflows/rust.yml

@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     name: Run Checks
     env:
-      RUSTFLAGS: -D warnings
+      RUSTFLAGS: -D warnings --cfg tokio_unstable
     steps:
       - uses: hecrj/setup-rust-action@v2
 
@@ -80,15 +80,15 @@ jobs:
       - uses: taiki-e/install-action@cargo-udeps
       - uses: Swatinem/rust-cache@v2
       - run: cargo +nightly hack udeps -p libsql --each-feature
-      - run: RUSTFLAGS="-D warnings" cargo check -p libsql --no-default-features --features core 
-      - run: RUSTFLAGS="-D warnings" cargo check -p libsql --no-default-features --features replication 
-      - run: RUSTFLAGS="-D warnings" cargo check -p libsql --no-default-features --features remote
+      - run: RUSTFLAGS="-D warnings --cfg tokio_unstable" cargo check -p libsql --no-default-features --features core 
+      - run: RUSTFLAGS="-D warnings --cfg tokio_unstable" cargo check -p libsql --no-default-features --features replication 
+      - run: RUSTFLAGS="-D warnings --cfg tokio_unstable" cargo check -p libsql --no-default-features --features remote
 
   test:
     runs-on: ubuntu-latest
     name: Run Tests
     env:
-      RUSTFLAGS: -D warnings
+      RUSTFLAGS: -D warnings --cfg tokio_unstable
     steps:
     - uses: hecrj/setup-rust-action@v2
 
@@ -159,8 +159,8 @@ jobs:
             target/
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: ${{ runner.os }}-cargo-
-      - name: check libsql remote
-        run: cargo check -p libsql --no-default-features -F remote
+      - name: build libsql all features
+        run: cargo build -p libsql --all-features 
 
   # test-rust-wasm:
   #   runs-on: ubuntu-latest

Cargo.toml

@@ -34,7 +34,7 @@ codegen-units = 1
 panic = "unwind"
 
 [workspace.dependencies]
-rusqlite = { package = "libsql-rusqlite", path = "vendored/rusqlite", version = "0.31", default-features = false, features = [
+rusqlite = { package = "libsql-rusqlite", path = "vendored/rusqlite", version = "0.32", default-features = false, features = [
     "libsql-experimental",
     "column_decltype",
     "load_extension",
@@ -45,6 +45,7 @@ rusqlite = { package = "libsql-rusqlite", path = "vendored/rusqlite", version =
 ] }
 hyper = { version = "0.14" }
 tower = { version = "0.4.13" }
+zerocopy = { version = "0.7.32", features = ["derive", "alloc"] }
 
 # Config for 'cargo dist'
 [workspace.metadata.dist]

bindings/c/include/libsql.h

@@ -27,6 +27,11 @@ typedef struct libsql_stmt libsql_stmt;
 
 typedef const libsql_database *libsql_database_t;
 
+typedef struct {
+  int frame_no;
+  int frames_synced;
+} replicated;
+
 typedef struct {
   const char *db_path;
   const char *primary_url;
@@ -58,6 +63,8 @@ extern "C" {
 
 int libsql_sync(libsql_database_t db, const char **out_err_msg);
 
+int libsql_sync2(libsql_database_t db, replicated *out_replicated, const char **out_err_msg);
+
 int libsql_open_sync(const char *db_path,
                      const char *primary_url,
                      const char *auth_token,

bindings/c/src/lib.rs

@@ -11,7 +11,7 @@ use tokio::runtime::Runtime;
 use types::{
     blob, libsql_connection, libsql_connection_t, libsql_database, libsql_database_t, libsql_row,
     libsql_row_t, libsql_rows, libsql_rows_future_t, libsql_rows_t, libsql_stmt, libsql_stmt_t,
-    stmt,
+    replicated, stmt,
 };
 
 lazy_static! {
@@ -46,6 +46,29 @@ pub unsafe extern "C" fn libsql_sync(
     }
 }
 
+#[no_mangle]
+pub unsafe extern "C" fn libsql_sync2(
+    db: libsql_database_t,
+    out_replicated: *mut replicated,
+    out_err_msg: *mut *const std::ffi::c_char,
+) -> std::ffi::c_int {
+    let db = db.get_ref();
+    match RT.block_on(db.sync()) {
+        Ok(replicated) => {
+            if !out_replicated.is_null() {
+                (*out_replicated).frame_no = replicated.frame_no().unwrap_or(0) as i32;
+                (*out_replicated).frames_synced = replicated.frames_synced() as i32;
+            }
+
+            0
+        }
+        Err(e) => {
+            set_err_msg(format!("Error syncing database: {e}"), out_err_msg);
+            1
+        }
+    }
+}
+
 #[no_mangle]
 pub unsafe extern "C" fn libsql_open_sync(
     db_path: *const std::ffi::c_char,

bindings/c/src/types.rs

@@ -115,6 +115,12 @@ impl From<&mut libsql_connection> for libsql_connection_t {
     }
 }
 
+#[repr(C)]
+pub struct replicated {
+    pub frame_no: std::ffi::c_int,
+    pub frames_synced: std::ffi::c_int,
+}
+
 pub struct stmt {
     pub stmt: libsql::Statement,
     pub params: Vec<libsql::Value>,

bottomless/src/replicator.rs

@@ -17,6 +17,8 @@ use aws_sdk_s3::primitives::ByteStream;
 use aws_sdk_s3::{Client, Config};
 use bytes::{Buf, Bytes};
 use chrono::{DateTime, NaiveDateTime, TimeZone, Utc};
+use libsql_replication::injector::Injector as _;
+use libsql_replication::rpc::replication::Frame as RpcFrame;
 use libsql_sys::{Cipher, EncryptionConfig};
 use std::ops::Deref;
 use std::path::{Path, PathBuf};
@@ -1449,12 +1451,13 @@ impl Replicator {
         db_path: &Path,
     ) -> Result<bool> {
         let encryption_config = self.encryption_config.clone();
-        let mut injector = libsql_replication::injector::Injector::new(
-            db_path,
+        let mut injector = libsql_replication::injector::SqliteInjector::new(
+            db_path.to_path_buf(),
             4096,
             libsql_sys::connection::NO_AUTOCHECKPOINT,
             encryption_config,
-        )?;
+        )
+        .await?;
         let prefix = format!("{}-{}/", self.db_name, generation);
         let mut page_buf = {
             let mut v = Vec::with_capacity(page_size);
@@ -1552,7 +1555,11 @@ impl Replicator {
                         },
                         page_buf.as_slice(),
                     );
-                    injector.inject_frame(frame_to_inject)?;
+                    let frame = RpcFrame {
+                        data: frame_to_inject.bytes(),
+                        timestamp: None,
+                    };
+                    injector.inject_frame(frame).await?;
                     applied_wal_frame = true;
                 }
             }

docs/USER_GUIDE.md

@@ -237,6 +237,12 @@ For example, if you have the following entries in your `/etc/hosts` file:
 You can access `db1` with the `http://db1.local:8080`URL and `db2` with `http://db2.local:8080`.
 The database files for the databases are stored in `<data dir>/dbs/db1` and `<data dir/dbs/db2`, respectively.
 
+### Path based routing
+
+For local development and testing, you can also connect to your databases by specifying the database namespace in the URL path.
+
+You can access namespace `db1` with the `http://local:8080/dev/db1` URL and `db2` with `http://local:8080/dev/db2`, respectively.
+
 ### Wildcard domain for development
 
 If you don't feel like editing `/etc/hosts` each time you want to test a new namespace, you can use any domain

libsql-ffi/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "libsql-ffi"
-version = "0.3.0"
+version = "0.4.0"
 edition = "2021"
 build = "build.rs"
 license = "MIT"