Resolve some review feedback

crates/bitwarden-db-tests/src/lib.rs

@@ -9,15 +9,31 @@ extern "C" {
 }
 */
 
+// Ensure resources are cleaned up after tests run
+#[cfg(not(target_arch = "wasm32"))]
+struct TestResources;
+#[cfg(not(target_arch = "wasm32"))]
+impl Drop for TestResources {
+    fn drop(&mut self) {
+        let _ = std::fs::remove_file("test.sqlite");
+    }
+}
+
 #[wasm_bindgen(js_name = runTests)]
 pub async fn run_tests() {
+    #[cfg(not(target_arch = "wasm32"))]
+    let cleanup = TestResources;
+
     std::panic::set_hook(Box::new(console_error_panic_hook::hook));
     let db = Database::default().await.unwrap();
 
     test_version(&db).await;
     test_create_select(&db).await;
 
     print!("Ran tests");
+
+    #[cfg(not(target_arch = "wasm32"))]
+    core::hint::black_box(cleanup);
 }
 
 pub async fn test_version(db: &Database) {

crates/bitwarden-db/src/wasm/mod.rs

@@ -20,7 +20,7 @@ extern "C" {
     type SqliteDatabase;
 
     #[wasm_bindgen(static_method_of = SqliteDatabase)]
-    async fn factory(name: &str) -> JsValue;
+    async fn create(name: &str) -> JsValue;
 
     #[wasm_bindgen(method)]
     async fn get_version(this: &SqliteDatabase) -> JsValue;

crates/bitwarden-json/Cargo.toml

@@ -25,7 +25,6 @@ log = ">=0.4.18, <0.5"
 schemars = ">=0.8.12, <0.9"
 serde = { version = ">=1.0, <2.0", features = ["derive"] }
 serde_json = ">=1.0.96, <2.0"
-uuid = { version = ">=1.3.3, <2", features = ["serde", "v4"] }
 
 
 [lints]

crates/bitwarden-napi/binding.d.ts

@@ -11,6 +11,9 @@ export const enum LogLevel {
   Error = 4,
 }
 export declare class BitwardenClient {
-  constructor(settingsInput?: string | undefined | null, logLevel?: LogLevel | undefined | null);
+  static create(
+    settingsInput?: string | undefined | null,
+    logLevel?: LogLevel | undefined | null,
+  ): Promise<BitwardenClient>;
   runCommand(commandInput: string): Promise<string>;
 }

crates/bitwarden-napi/src-ts/bitwarden_client/index.ts

@@ -30,11 +30,17 @@ function handleResponse<T>(response: {
 }
 
 export class BitwardenClient {
-  client: rust.BitwardenClient;
+  private client: rust.BitwardenClient;
 
-  constructor(settings?: ClientSettings, loggingLevel?: LogLevel) {
+  static async create(settings?: ClientSettings, loggingLevel?: LogLevel) {
     const settingsJson = settings == null ? null : Convert.clientSettingsToJson(settings);
-    this.client = new rust.BitwardenClient(settingsJson, loggingLevel ?? LogLevel.Info);
+    new BitwardenClient(
+      await rust.BitwardenClient.create(settingsJson, loggingLevel ?? LogLevel.Info),
+    );
+  }
+
+  private constructor(client: rust.BitwardenClient) {
+    this.client = client;
   }
 
   async accessTokenLogin(accessToken: string, stateFile?: string): Promise<void> {

crates/bitwarden-napi/src/client.rs

@@ -27,23 +27,18 @@ pub struct BitwardenClient(JsonClient);
 
 #[napi]
 impl BitwardenClient {
-    #[napi(constructor)]
-    pub fn new(settings_input: Option<String>, log_level: Option<LogLevel>) -> Self {
+    #[napi(factory)]
+    pub async fn create(settings_input: Option<String>, log_level: Option<LogLevel>) -> Self {
         // This will only fail if another logger was already initialized, so we can ignore the
         // result
         let _ = env_logger::Builder::from_default_env()
             .filter_level(convert_level(log_level.unwrap_or(LogLevel::Info)))
             .try_init();
-        Self(new(settings_input))
+        Self(bitwarden_json::client::Client::new(settings_input).await)
     }
 
     #[napi]
     pub async fn run_command(&self, command_input: String) -> String {
         self.0.run_command(&command_input).await
     }
 }
-
-#[tokio::main]
-async fn new(settings_string: Option<String>) -> JsonClient {
-    JsonClient::new(settings_string).await
-}

crates/bitwarden-uniffi/src/lib.rs

@@ -32,7 +32,7 @@ pub struct Client(bitwarden::Client);
 impl Client {
     /// Initialize a new instance of the SDK client
     #[uniffi::constructor]
-    pub async fn factory(settings: Option<ClientSettings>) -> Arc<Self> {
+    pub async fn create(settings: Option<ClientSettings>) -> Arc<Self> {
         init_logger();
 
         #[cfg(target_os = "android")]

crates/bitwarden-wasm/src/client.rs

@@ -35,7 +35,7 @@ pub struct BitwardenClient(Rc<JsonClient>);
 #[wasm_bindgen]
 impl BitwardenClient {
     #[wasm_bindgen]
-    pub async fn factory(settings_input: Option<String>, log_level: Option<LogLevel>) -> Self {
+    pub async fn create(settings_input: Option<String>, log_level: Option<LogLevel>) -> Self {
         console_error_panic_hook::set_once();
         if let Err(e) =
             console_log::init_with_level(convert_level(log_level.unwrap_or(LogLevel::Info)))