🏗️ Split providers into sql and kv.

examples/guest-side/Cargo.toml

@@ -13,10 +13,11 @@ serde = { version = "^1", features = ["derive"] }
 serde_json = "^1"
 anyhow = "^1"
 tokio = { version = "^1", features = ["macros", "rt", "time"] }
+async-trait = "^0.1"
 
 sqlparser = "^0.45"
 sea-orm = { version = "1.0.0-rc.7", features = ["proxy"] }
 yew = { version = "^0.21", features = ["ssr"] }
 yew-router = "^0.18"
 
-wasi = "0.13.0"
+wasi = "0.13.1"

examples/guest-side/src/model/mod.rs

@@ -1,10 +1,7 @@
 pub mod entity;
 
 use serde_json::Value;
-use std::{
-    collections::BTreeMap,
-    sync::{Arc, Mutex},
-};
+use std::{collections::BTreeMap, sync::Arc};
 
 use sea_orm::{
     ActiveValue::Set, Database, DbBackend, DbErr, EntityTrait, ProxyDatabaseTrait, ProxyExecResult,
@@ -17,8 +14,9 @@ use tairitsu_utils::types::proto::backend::Msg;
 #[derive(Debug)]
 struct ProxyDb {}
 
+#[async_trait::async_trait]
 impl ProxyDatabaseTrait for ProxyDb {
-    fn query(&self, statement: Statement) -> Result<Vec<ProxyRow>, DbErr> {
+    async fn query(&self, statement: Statement) -> Result<Vec<ProxyRow>, DbErr> {
         let sql = statement.sql.clone();
         println!(
             "{}",
@@ -65,7 +63,7 @@ impl ProxyDatabaseTrait for ProxyDb {
         Ok(rows)
     }
 
-    fn execute(&self, statement: Statement) -> Result<ProxyExecResult, DbErr> {
+    async fn execute(&self, statement: Statement) -> Result<ProxyExecResult, DbErr> {
         let sql = {
             if let Some(values) = statement.values {
                 // Replace all the '?' with the statement values
@@ -149,12 +147,9 @@ impl ProxyDatabaseTrait for ProxyDb {
 }
 
 pub async fn init() {
-    let db = Database::connect_proxy(
-        DbBackend::Sqlite,
-        Arc::new(Mutex::new(Box::new(ProxyDb {}))),
-    )
-    .await
-    .unwrap();
+    let db = Database::connect_proxy(DbBackend::Sqlite, Arc::new(Box::new(ProxyDb {})))
+        .await
+        .unwrap();
 
     let data = ActiveModel {
         title: Set("Homo".to_owned()),

packages/database/Cargo.toml

@@ -29,20 +29,23 @@ uuid = { version = "^1", features = [
 async-trait = "^0.1"
 oneshot = "^0.1"
 
-[dependencies.sea-orm]
-features = ["with-uuid", "with-chrono", "with-json"]
-version = "1.0.0-rc.7"
+tokio = { version = "^1", optional = true }
+wasi = { version = "0.13.1", optional = true }
+
+sea-orm = "1.0.0-rc.7"
+sqlparser = { version = "^0.48", optional = true }
 
-[target.'cfg(all(target_arch = "wasm32", not(target_os = "wasi")))'.dependencies]
 wasm-bindgen = { version = "0.2.87", optional = true }
 wasm-bindgen-futures = { version = "^0.4", optional = true }
 worker = { version = "0.3.0", features = ["d1"], optional = true }
 
 [features]
-default = ["cloudflare"]
+default = []
 cloudflare = [
   "dep:wasm-bindgen",
   "dep:wasm-bindgen-futures",
   "dep:worker",
   "sea-orm/proxy",
 ]
+native = ["sea-orm/sqlx-sqlite", "sea-orm/runtime-async-std-rustls"]
+wasi = ["dep:sqlparser", "dep:wasi", "sea-orm/proxy"]

packages/database/src/lib.rs

@@ -1 +1,13 @@
 pub mod providers;
+
+#[cfg(any(
+    all(feature = "cloudflare", feature = "native"),
+    all(feature = "cloudflare", feature = "wasi"),
+    all(feature = "native", feature = "wasi")
+))]
+compile_error!(
+    "Only one of the `cloudflare`, `native`, or `wasi` features can be enabled at a time."
+);
+
+#[cfg(not(any(feature = "cloudflare", feature = "native", feature = "wasi")))]
+compile_error!("At least one of the `cloudflare`, `native`, or `wasi` features must be enabled.");

packages/database/src/providers/kv/cloudflare.rs

@@ -0,0 +1,25 @@
+use std::sync::Arc;
+
+use worker::Env;
+
+use super::KVStore;
+
+pub struct ProxyKV {
+    env: Arc<Env>,
+    db_name: String,
+}
+
+#[async_trait::async_trait]
+impl KVStore for ProxyKV {
+    async fn set(&self, key: impl ToString, value: impl ToString) {
+        todo!()
+    }
+
+    async fn get(&self, key: impl ToString) -> Option<String> {
+        todo!()
+    }
+
+    async fn delete(&self, key: impl ToString) {
+        todo!()
+    }
+}

packages/database/src/providers/kv/mod.rs

@@ -0,0 +1,19 @@
+#[cfg(feature = "cloudflare")]
+pub mod cloudflare;
+#[cfg(feature = "native")]
+pub mod sled;
+#[cfg(feature = "wasi")]
+pub mod wasmtime_wasi;
+
+#[cfg(feature = "cloudflare")]
+pub use cloudflare::*;
+#[cfg(feature = "native")]
+pub use sled::*;
+#[cfg(feature = "wasi")]
+pub use wasmtime_wasi::*;
+
+pub trait KVStore {
+    async fn get(&self, key: impl ToString) -> Option<String>;
+    async fn set(&self, key: impl ToString, value: impl ToString);
+    async fn delete(&self, key: impl ToString);
+}

packages/database/src/providers/kv/sled.rs

@@ -0,0 +1,20 @@
+use super::KVStore;
+
+pub struct ProxyKV {
+    path: String,
+}
+
+#[async_trait::async_trait]
+impl KVStore for ProxyKV {
+    async fn set(&self, key: impl ToString, value: impl ToString) {
+        todo!()
+    }
+
+    async fn get(&self, key: impl ToString) -> Option<String> {
+        todo!()
+    }
+
+    async fn delete(&self, key: impl ToString) {
+        todo!()
+    }
+}

packages/database/src/providers/kv/wasmtime_wasi.rs

@@ -0,0 +1,18 @@
+use super::KVStore;
+
+pub struct ProxyKV {}
+
+#[async_trait::async_trait]
+impl KVStore for ProxyKV {
+    async fn set(&self, key: impl ToString, value: impl ToString) {
+        todo!()
+    }
+
+    async fn get(&self, key: impl ToString) -> Option<String> {
+        todo!()
+    }
+
+    async fn delete(&self, key: impl ToString) {
+        todo!()
+    }
+}

packages/database/src/providers/mod.rs

@@ -1,2 +1,2 @@
-#[cfg(feature = "cloudflare")]
-pub mod cloudflare;
+pub mod kv;
+pub mod sql;

packages/database/src/providers/cloudflare.rs → packages/database/src/providers/sql/cloudflare.rs

@@ -216,10 +216,13 @@ impl ProxyDatabaseTrait for ProxyDb {
     }
 }
 
-pub async fn init_db(env: Arc<Env>, db_name: String) -> Result<DatabaseConnection> {
+pub async fn init_db(env: Arc<Env>, db_name: impl ToString) -> Result<DatabaseConnection> {
     let db = Database::connect_proxy(
         DbBackend::Sqlite,
-        Arc::new(Box::new(ProxyDb { env, db_name })),
+        Arc::new(Box::new(ProxyDb {
+            env,
+            db_name: db_name.to_string(),
+        })),
     )
     .await
     .context("Failed to connect to database")?;

packages/database/src/providers/sql/libsqlite.rs

@@ -0,0 +1,13 @@
+use anyhow::{Context, Result};
+
+use sea_orm::{ConnectOptions, Database, DatabaseConnection};
+
+pub async fn init_db(path: impl ToString) -> Result<DatabaseConnection> {
+    let options = ConnectOptions::new(format!("sqlite:{}", path.to_string()));
+
+    let db = Database::connect(options)
+        .await
+        .context("Failed to connect to database")?;
+
+    Ok(db)
+}

packages/database/src/providers/sql/mod.rs

@@ -0,0 +1,13 @@
+#[cfg(feature = "cloudflare")]
+pub mod cloudflare;
+#[cfg(feature = "native")]
+pub mod libsqlite;
+#[cfg(feature = "wasi")]
+pub mod wasmtime_wasi;
+
+#[cfg(feature = "cloudflare")]
+pub use cloudflare::*;
+#[cfg(feature = "native")]
+pub use libsqlite::*;
+#[cfg(feature = "wasi")]
+pub use wasmtime_wasi::*;