Add no_std support for sqlite-wasm-rs (#149)

* Move `sahpool` vfs to `sqlite-wasm-vfs` crate

* Added `no_std` support for `sqlite-wasm-rs`

* Add changelog

Author: Spxg

CHANGELOG.md

@@ -8,6 +8,9 @@
 * New crate `sqlite-wasm-vfs`: some experimental VFS implementations.
   [#146](https://github.com/Spxg/sqlite-wasm-rs/pull/146)
 
+* Added `no_std` support for `sqlite-wasm-rs`.
+  [#149](https://github.com/Spxg/sqlite-wasm-rs/pull/149)
+
 ### Fixed
 
 ### Changed
@@ -24,6 +27,9 @@
 * Bump MSRV to 1.82.0.
   [#148](https://github.com/Spxg/sqlite-wasm-rs/pull/148)
 
+* Moved `opfs-sahpool` vfs to `sqlite-wasm-vfs`.
+  [#149](https://github.com/Spxg/sqlite-wasm-rs/pull/149)
+
 --------------------------------------------------------------------------------
 
 ## [0.4.8](https://github.com/Spxg/sqlite-wasm-rs/compare/0.4.7...0.4.8)

Cargo.toml

@@ -28,23 +28,10 @@ include = [
 ]
 
 [dependencies]
-tokio = { version = "1.45.1", features = ["sync"] }
-thiserror = "2.0.12"
-
-wasm-bindgen = "0.2.104"
-wasm-bindgen-futures = "0.4.54"
-js-sys = "0.3.81"
-web-sys = { version = "0.3.81", features = [
-  "StorageManager",
-  "FileSystemSyncAccessHandle",
-  "FileSystemDirectoryHandle",
-  "FileSystemGetDirectoryOptions",
-  "FileSystemReadWriteOptions",
-  "WorkerGlobalScope",
-  "WorkerNavigator",
-  "FileSystemGetFileOptions",
-  "FileSystemFileHandle",
-]}
+wasm-bindgen = { version = "0.2.104", default-features = false }
+js-sys = { version = "0.3.81", default-features = false }
+thiserror = { version = "2.0.12", default-features = false }
+hashbrown = { version = "0.16.1", default-features = false, features = ["default-hasher"] }
 
 [features]
 # SQLite3MultipleCiphers

README.md

@@ -19,10 +19,7 @@ sqlite-wasm-rs = { version = "0.5", features = ["sqlite3mc"] }
 ```
 
 ```rust
-use sqlite_wasm_rs::{
-    self as ffi,
-    sahpool_vfs::{install as install_opfs_sahpool, OpfsSAHPoolCfg},
-};
+use sqlite_wasm_rs as ffi;
 
 async fn open_db() {
     // open with memory vfs
@@ -36,23 +33,6 @@ async fn open_db() {
         )
     };
     assert_eq!(ffi::SQLITE_OK, ret);
-
-    // install opfs-sahpool persistent vfs and set as default vfs
-    install_opfs_sahpool(&OpfsSAHPoolCfg::default(), true)
-        .await
-        .unwrap();
-
-    // open with opfs-sahpool vfs
-    let mut db = std::ptr::null_mut();
-    let ret = unsafe {
-        ffi::sqlite3_open_v2(
-            c"opfs-sahpool.db".as_ptr().cast(),
-            &mut db as *mut _,
-            ffi::SQLITE_OPEN_READWRITE | ffi::SQLITE_OPEN_CREATE,
-            std::ptr::null()
-        )
-    };
-    assert_eq!(ffi::SQLITE_OK, ret);
 }
 ```
 

build.rs

@@ -55,9 +55,9 @@ fn main() {
 
         if update_bindgen {
             #[cfg(not(feature = "sqlite3mc"))]
-            const SQLITE3_BINDGEN: &str = "src/libsqlite3/sqlite3_bindgen.rs";
+            const SQLITE3_BINDGEN: &str = "src/bindings/sqlite3_bindgen.rs";
             #[cfg(feature = "sqlite3mc")]
-            const SQLITE3_BINDGEN: &str = "src/libsqlite3/sqlite3mc_bindgen.rs";
+            const SQLITE3_BINDGEN: &str = "src/bindings/sqlite3mc_bindgen.rs";
             std::fs::copy(&output, SQLITE3_BINDGEN).unwrap();
         }
     }
@@ -102,28 +102,28 @@ fn bindgen(output: &std::path::PathBuf) {
         .raw_line(
             r#"extern "C" {
     pub fn sqlite3_auto_extension(
-        xEntryPoint: ::std::option::Option<
+        xEntryPoint: ::core::option::Option<
             unsafe extern "C" fn(
                 db: *mut sqlite3,
-                pzErrMsg: *mut *mut ::std::os::raw::c_char,
+                pzErrMsg: *mut *mut ::core::ffi::c_char,
                 _: *const sqlite3_api_routines,
-            ) -> ::std::os::raw::c_int,
+            ) -> ::core::ffi::c_int,
         >,
-    ) -> ::std::os::raw::c_int;
+    ) -> ::core::ffi::c_int;
 }"#,
         )
         .blocklist_function("sqlite3_cancel_auto_extension")
         .raw_line(
             r#"extern "C" {
     pub fn sqlite3_cancel_auto_extension(
-        xEntryPoint: ::std::option::Option<
+        xEntryPoint: ::core::option::Option<
             unsafe extern "C" fn(
                 db: *mut sqlite3,
-                pzErrMsg: *mut *mut ::std::os::raw::c_char,
+                pzErrMsg: *mut *mut ::core::ffi::c_char,
                 _: *const sqlite3_api_routines,
-            ) -> ::std::os::raw::c_int,
+            ) -> ::core::ffi::c_int,
         >,
-    ) -> ::std::os::raw::c_int;
+    ) -> ::core::ffi::c_int;
 }"#,
         )
         // Block functions related to dynamic library loading, which is not available.
@@ -160,6 +160,7 @@ fn bindgen(output: &std::path::PathBuf) {
 
     let bindings = bindings
         .layout_tests(false)
+        .use_core()
         .formatter(bindgen::Formatter::Prettyplease)
         .generate()
         .unwrap();

crates/sqlite-wasm-vfs/Cargo.toml

@@ -18,6 +18,18 @@ js-sys = "0.3.81"
 wasm-bindgen-futures = "0.4.54"
 tokio = { version = "1.45.1", features = ["sync"] }
 thiserror = "2.0.12"
+web-sys = { version = "0.3.81", features = [
+  "StorageManager",
+  "FileSystemSyncAccessHandle",
+  "FileSystemDirectoryHandle",
+  "FileSystemGetDirectoryOptions",
+  "FileSystemReadWriteOptions",
+  "WorkerGlobalScope",
+  "WorkerNavigator",
+  "FileSystemGetFileOptions",
+  "FileSystemFileHandle",
+]}
+
 indexed_db_futures = { version = "0.6.4", optional = true }
 
 [dev-dependencies]

crates/sqlite-wasm-vfs/LICENSE

@@ -0,0 +1 @@
+../../LICENSE

crates/sqlite-wasm-vfs/src/lib.rs

@@ -7,5 +7,8 @@
 #[cfg(feature = "relaxed-idb")]
 pub mod relaxed_idb;
 
+/// Origin Private File System (OPFS) VFS implementation using `SyncAccessHandle`.
+pub mod sahpool;
+
 #[cfg(test)]
 wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_dedicated_worker);

src/vfs/sahpool.rs crates/sqlite-wasm-vfs/src/sahpool.rssrc/vfs/sahpool.rs renamed to crates/sqlite-wasm-vfs/src/sahpool.rs

@@ -3,10 +3,8 @@
 //! See [`opfs-sahpool`](https://sqlite.org/wasm/doc/trunk/persistence.md#vfs-opfs-sahpool) for details.
 //!
 //! ```rust
-//! use sqlite_wasm_rs::{
-//!     self as ffi,
-//!     sahpool_vfs::{install as install_opfs_sahpool, OpfsSAHPoolCfg},
-//! };
+//! use sqlite_wasm_rs as ffi;
+//! use sqlite_wasm_vfs::sahpool::{install as install_opfs_sahpool, OpfsSAHPoolCfg};
 //!
 //! async fn open_db() {
 //!     // install opfs-sahpool persistent vfs and set as default vfs
@@ -34,15 +32,19 @@
 //! [`opfs-explorer`](https://chromewebstore.google.com/detail/opfs-explorer/acndjpgkpaclldomagafnognkcgjignd)
 //! plugin to browse files.
 
-use crate::libsqlite3::*;
-use crate::vfs::utils::{
+use sqlite_wasm_rs::utils::{
     check_import_db, random_name, register_vfs, registered_vfs, ImportDbError, RegisterVfsError,
-    SQLiteIoMethods, SQLiteVfs, VfsAppData, VfsError, VfsFile, VfsResult, VfsStore,
+    SQLiteIoMethods, SQLiteVfs, SQLiteVfsFile, VfsAppData, VfsError, VfsFile, VfsResult, VfsStore,
+};
+use sqlite_wasm_rs::{
+    sqlite3_file, sqlite3_filename, sqlite3_vfs, sqlite3_vfs_register, sqlite3_vfs_unregister,
+    SQLITE_CANTOPEN, SQLITE_ERROR, SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN, SQLITE_IOERR,
+    SQLITE_IOERR_DELETE, SQLITE_OK, SQLITE_OPEN_DELETEONCLOSE, SQLITE_OPEN_MAIN_DB,
+    SQLITE_OPEN_MAIN_JOURNAL, SQLITE_OPEN_SUPER_JOURNAL, SQLITE_OPEN_WAL,
 };
 use std::cell::{Cell, RefCell};
 use std::collections::{HashMap, HashSet};
 
-use crate::utils::SQLiteVfsFile;
 use js_sys::{Array, DataView, IteratorNext, Reflect, Uint8Array};
 use wasm_bindgen::{JsCast, JsValue};
 use wasm_bindgen_futures::JsFuture;
@@ -605,7 +607,7 @@ impl VfsStore<SyncAccessFile, SyncAccessHandleAppData> for SyncAccessHandleStore
     }
 
     fn with_file<F: Fn(&SyncAccessFile) -> VfsResult<i32>>(
-        vfs_file: &super::utils::SQLiteVfsFile,
+        vfs_file: &SQLiteVfsFile,
         f: F,
     ) -> VfsResult<i32> {
         let name = unsafe { vfs_file.name() };
@@ -615,7 +617,7 @@ impl VfsStore<SyncAccessFile, SyncAccessHandleAppData> for SyncAccessHandleStore
     }
 
     fn with_file_mut<F: Fn(&mut SyncAccessFile) -> VfsResult<i32>>(
-        vfs_file: &super::utils::SQLiteVfsFile,
+        vfs_file: &SQLiteVfsFile,
         f: F,
     ) -> VfsResult<i32> {
         let name = unsafe { vfs_file.name() };
@@ -951,13 +953,11 @@ pub async fn install(options: &OpfsSAHPoolCfg, default_vfs: bool) -> Result<Opfs
 
 #[cfg(test)]
 mod tests {
-    use crate::{
-        sahpool_vfs::{
-            OpfsSAHPool, OpfsSAHPoolCfgBuilder, SyncAccessFile, SyncAccessHandleAppData,
-            SyncAccessHandleStore,
-        },
-        utils::{test_suite::test_vfs_store, VfsAppData},
+    use super::{
+        OpfsSAHPool, OpfsSAHPoolCfgBuilder, SyncAccessFile, SyncAccessHandleAppData,
+        SyncAccessHandleStore,
     };
+    use sqlite_wasm_rs::utils::{test_suite::test_vfs_store, VfsAppData};
     use wasm_bindgen_test::wasm_bindgen_test;
 
     #[wasm_bindgen_test]

src/libsqlite3/bindgen/mod.rs src/bindings/bindgen/mod.rssrc/libsqlite3/bindgen/mod.rs renamed to src/bindings/bindgen/mod.rs

@@ -1,6 +1,6 @@
-use std::error;
-use std::fmt;
-use std::os::raw::c_int;
+use core::error;
+use core::fmt;
+use core::ffi::c_int;
 
 /// Error Codes
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]