From 7c1b2625cf8f315bced5e560574c0c64eedd368f Mon Sep 17 00:00:00 2001
From: Torsten Flammiger <git@netfg.net>
Date: Fri, 24 Dec 2021 23:06:54 +0100
Subject: [PATCH 01/24] Prepare to add an option to list local user accounts
 from your homeserver

---
 src/database/admin.rs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/database/admin.rs b/src/database/admin.rs
index 1e5c47c9..5ea872e8 100644
--- a/src/database/admin.rs
+++ b/src/database/admin.rs
@@ -13,6 +13,7 @@ use tracing::warn;
 pub enum AdminCommand {
     RegisterAppservice(serde_yaml::Value),
     ListAppservices,
+    CountUsers,
     SendMessage(RoomMessageEventContent),
 }
 
@@ -93,6 +94,16 @@ impl Admin {
                         let state_lock = mutex_state.lock().await;
 
                         match event {
+                            AdminCommand::CountUsers => {
+                                // count() does not return an error on failure...
+                                if let Ok(usercount) = guard.users.count() {
+                                    let message = format!("Found {} total user accounts", usercount);
+                                    send_message(RoomMessageEventContent::text_plain(message), guard, &state_lock);
+                                } else {
+                                    // ... so we simply spit out a generic non-explaining-info in case count() did not return Ok()
+                                    send_message(RoomMessageEventContent::text_plain("Unable to count users"), guard, &state_lock);
+                                }
+                            }
                             AdminCommand::RegisterAppservice(yaml) => {
                                 guard.appservice.register_appservice(yaml).unwrap(); // TODO handle error
                             }

From 567cf6dbe970ee5422cd38439498f7e5a86b89ac Mon Sep 17 00:00:00 2001
From: Torsten Flammiger <git@netfg.net>
Date: Sat, 25 Dec 2021 20:51:22 +0100
Subject: [PATCH 02/24] Add command count_local_users to database/rooms.rs

---
 src/database/rooms.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/database/rooms.rs b/src/database/rooms.rs
index fb9ecbf0..0236c839 100644
--- a/src/database/rooms.rs
+++ b/src/database/rooms.rs
@@ -1531,6 +1531,9 @@ impl Rooms {
                                 "list_appservices" => {
                                     db.admin.send(AdminCommand::ListAppservices);
                                 }
+                                "count_local_users" => {
+                                    db.admin.send(AdminCommand::CountUsers);
+                                }
                                 "get_auth_chain" => {
                                     if args.len() == 1 {
                                         if let Ok(event_id) = EventId::parse_arc(args[0]) {

From d21030566c174509c4030d2f6428ffe1109e6c1d Mon Sep 17 00:00:00 2001
From: Torsten Flammiger <git@netfg.net>
Date: Sat, 25 Dec 2021 21:29:03 +0100
Subject: [PATCH 03/24] Rename/Add count methods to count_local_users

---
 src/database/admin.rs |  2 +-
 src/database/users.rs | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/database/admin.rs b/src/database/admin.rs
index 5ea872e8..b18e50c3 100644
--- a/src/database/admin.rs
+++ b/src/database/admin.rs
@@ -96,7 +96,7 @@ impl Admin {
                         match event {
                             AdminCommand::CountUsers => {
                                 // count() does not return an error on failure...
-                                if let Ok(usercount) = guard.users.count() {
+                                if let Ok(usercount) = guard.users.count_local_users() {
                                     let message = format!("Found {} total user accounts", usercount);
                                     send_message(RoomMessageEventContent::text_plain(message), guard, &state_lock);
                                 } else {
diff --git a/src/database/users.rs b/src/database/users.rs
index d4bf4890..5a32f16a 100644
--- a/src/database/users.rs
+++ b/src/database/users.rs
@@ -77,11 +77,23 @@ impl Users {
     }
 
     /// Returns the number of users registered on this server.
+    /// It really returns all users, not only real ones with a
+    /// password to login but also bridge puppets...
     #[tracing::instrument(skip(self))]
     pub fn count(&self) -> Result<usize> {
         Ok(self.userid_password.iter().count())
     }
 
+    /// This method will only count those local user accounts with
+    /// a password thus returning only real accounts on this instance.
+    #[tracing::instrument(skip(self))]
+    pub fn count_local_users(&self) -> Result<usize> {
+        self.userid_password.iter().map(|(key, value)| {
+
+        });
+        Ok(1)
+    }
+
     /// Find out which user an access token belongs to.
     #[tracing::instrument(skip(self, token))]
     pub fn find_from_token(&self, token: &str) -> Result<Option<(Box<UserId>, String)>> {

From 2281bcefc631e02c83800297a4838e127ded7973 Mon Sep 17 00:00:00 2001
From: Torsten Flammiger <git@netfg.net>
Date: Sun, 26 Dec 2021 11:06:28 +0100
Subject: [PATCH 04/24] Finalize count_local_users function

---
 src/database/users.rs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/database/users.rs b/src/database/users.rs
index 5a32f16a..1e103fa2 100644
--- a/src/database/users.rs
+++ b/src/database/users.rs
@@ -88,10 +88,8 @@ impl Users {
     /// a password thus returning only real accounts on this instance.
     #[tracing::instrument(skip(self))]
     pub fn count_local_users(&self) -> Result<usize> {
-        self.userid_password.iter().map(|(key, value)| {
-
-        });
-        Ok(1)
+        let n = self.userid_password.iter().filter(|(_, bytes)| bytes.len() > 0).count();
+        Ok(n)
     }
 
     /// Find out which user an access token belongs to.

From 39787b41cb341ca3d270cc00c9ac46b8f4bd384d Mon Sep 17 00:00:00 2001
From: Torsten Flammiger <git@netfg.net>
Date: Sun, 26 Dec 2021 12:04:38 +0100
Subject: [PATCH 05/24] Rename admin command CountUsers -> CountLocalUsers;
 Update comments

---
 src/database/admin.rs | 12 ++++++------
 src/database/rooms.rs |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/database/admin.rs b/src/database/admin.rs
index b18e50c3..330fecb1 100644
--- a/src/database/admin.rs
+++ b/src/database/admin.rs
@@ -13,7 +13,7 @@ use tracing::warn;
 pub enum AdminCommand {
     RegisterAppservice(serde_yaml::Value),
     ListAppservices,
-    CountUsers,
+    CountLocalUsers,
     SendMessage(RoomMessageEventContent),
 }
 
@@ -94,14 +94,14 @@ impl Admin {
                         let state_lock = mutex_state.lock().await;
 
                         match event {
-                            AdminCommand::CountUsers => {
-                                // count() does not return an error on failure...
+                            AdminCommand::CountLocalUsers => {
+                                // count_local_users() only returns with OK(x) where x is the number of found accounts
                                 if let Ok(usercount) = guard.users.count_local_users() {
-                                    let message = format!("Found {} total user accounts", usercount);
+                                    let message = format!("Found {} local user account(s)", usercount);
                                     send_message(RoomMessageEventContent::text_plain(message), guard, &state_lock);
                                 } else {
-                                    // ... so we simply spit out a generic non-explaining-info in case count() did not return Ok()
-                                    send_message(RoomMessageEventContent::text_plain("Unable to count users"), guard, &state_lock);
+                                    // if count_local_users() only returns with OK(x), then why is this? ;-)
+                                    send_message(RoomMessageEventContent::text_plain("Unable to count local users"), guard, &state_lock);
                                 }
                             }
                             AdminCommand::RegisterAppservice(yaml) => {
diff --git a/src/database/rooms.rs b/src/database/rooms.rs
index 0236c839..b1dd103c 100644
--- a/src/database/rooms.rs
+++ b/src/database/rooms.rs
@@ -1532,7 +1532,7 @@ impl Rooms {
                                     db.admin.send(AdminCommand::ListAppservices);
                                 }
                                 "count_local_users" => {
-                                    db.admin.send(AdminCommand::CountUsers);
+                                    db.admin.send(AdminCommand::CountLocalUsers);
                                 }
                                 "get_auth_chain" => {
                                     if args.len() == 1 {

From a69eb277d46d074d2bb4fef82f4111f70845f874 Mon Sep 17 00:00:00 2001
From: Torsten Flammiger <git@netfg.net>
Date: Sun, 26 Dec 2021 20:00:31 +0100
Subject: [PATCH 06/24] Update count users: It's now list_local_users and
 contains the number and the usernames

---
 src/database/admin.rs | 22 ++++++++++++----------
 src/database/rooms.rs |  4 ++--
 src/database/users.rs | 14 ++++++++++++++
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/src/database/admin.rs b/src/database/admin.rs
index 330fecb1..58d9e83e 100644
--- a/src/database/admin.rs
+++ b/src/database/admin.rs
@@ -13,7 +13,7 @@ use tracing::warn;
 pub enum AdminCommand {
     RegisterAppservice(serde_yaml::Value),
     ListAppservices,
-    CountLocalUsers,
+    ListLocalUsers,
     SendMessage(RoomMessageEventContent),
 }
 
@@ -94,15 +94,17 @@ impl Admin {
                         let state_lock = mutex_state.lock().await;
 
                         match event {
-                            AdminCommand::CountLocalUsers => {
-                                // count_local_users() only returns with OK(x) where x is the number of found accounts
-                                if let Ok(usercount) = guard.users.count_local_users() {
-                                    let message = format!("Found {} local user account(s)", usercount);
-                                    send_message(RoomMessageEventContent::text_plain(message), guard, &state_lock);
-                                } else {
-                                    // if count_local_users() only returns with OK(x), then why is this? ;-)
-                                    send_message(RoomMessageEventContent::text_plain("Unable to count local users"), guard, &state_lock);
-                                }
+                            AdminCommand::ListLocalUsers => {
+                                // collect all local users
+                                let users = guard.users.iter_locals();
+
+                                let mut msg: String = format!("Found {} local user account(s):\n", users.len());
+                                msg += &users.join("\n");
+                                
+                                // send number of local users as plain text:
+                                // TODO: send as Markdown
+                                send_message(RoomMessageEventContent::text_plain(&msg), guard, &state_lock);
+
                             }
                             AdminCommand::RegisterAppservice(yaml) => {
                                 guard.appservice.register_appservice(yaml).unwrap(); // TODO handle error
diff --git a/src/database/rooms.rs b/src/database/rooms.rs
index b1dd103c..4d839d38 100644
--- a/src/database/rooms.rs
+++ b/src/database/rooms.rs
@@ -1531,8 +1531,8 @@ impl Rooms {
                                 "list_appservices" => {
                                     db.admin.send(AdminCommand::ListAppservices);
                                 }
-                                "count_local_users" => {
-                                    db.admin.send(AdminCommand::CountLocalUsers);
+                                "list_local_users" => {
+                                    db.admin.send(AdminCommand::ListLocalUsers);
                                 }
                                 "get_auth_chain" => {
                                     if args.len() == 1 {
diff --git a/src/database/users.rs b/src/database/users.rs
index 1e103fa2..d3e1fe43 100644
--- a/src/database/users.rs
+++ b/src/database/users.rs
@@ -84,6 +84,8 @@ impl Users {
         Ok(self.userid_password.iter().count())
     }
 
+    /// The method is DEPRECATED and was replaced by iter_locals()
+    /// 
     /// This method will only count those local user accounts with
     /// a password thus returning only real accounts on this instance.
     #[tracing::instrument(skip(self))]
@@ -92,6 +94,7 @@ impl Users {
         Ok(n)
     }
 
+
     /// Find out which user an access token belongs to.
     #[tracing::instrument(skip(self, token))]
     pub fn find_from_token(&self, token: &str) -> Result<Option<(Box<UserId>, String)>> {
@@ -131,6 +134,17 @@ impl Users {
         })
     }
 
+    /// Returns a vector of local usernames
+    #[tracing::instrument(skip(self))]
+    pub fn iter_locals(&self) -> Vec<String> {
+        self.userid_password.iter().filter(|(_, pw)| pw.len() > 0).map(|(username, _)| {
+            match utils::string_from_bytes(&username) {
+                Ok(s) => s,
+                Err(e) => e.to_string()
+            }
+        }).collect::<Vec<String>>()
+    }
+
     /// Returns the password hash for the given user.
     #[tracing::instrument(skip(self, user_id))]
     pub fn password_hash(&self, user_id: &UserId) -> Result<Option<String>> {

From 8d51359668199585175e7e0095de66e96bc1a3e1 Mon Sep 17 00:00:00 2001
From: Torsten Flammiger <git@netfg.net>
Date: Sun, 26 Dec 2021 20:49:19 +0100
Subject: [PATCH 07/24] Fix typo and remove unneeded newline

---
 src/database/admin.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/database/admin.rs b/src/database/admin.rs
index 58d9e83e..5418f53a 100644
--- a/src/database/admin.rs
+++ b/src/database/admin.rs
@@ -95,7 +95,7 @@ impl Admin {
 
                         match event {
                             AdminCommand::ListLocalUsers => {
-                                // collect all local users
+                                // collect local users only
                                 let users = guard.users.iter_locals();
 
                                 let mut msg: String = format!("Found {} local user account(s):\n", users.len());
@@ -104,7 +104,6 @@ impl Admin {
                                 // send number of local users as plain text:
                                 // TODO: send as Markdown
                                 send_message(RoomMessageEventContent::text_plain(&msg), guard, &state_lock);
-
                             }
                             AdminCommand::RegisterAppservice(yaml) => {
                                 guard.appservice.register_appservice(yaml).unwrap(); // TODO handle error

From ab15ec6c32f2e5463369fe7a29f5ea2e6d9c4f2d Mon Sep 17 00:00:00 2001
From: Tglman <tglman@tglman.com>
Date: Fri, 18 Jun 2021 00:38:32 +0100
Subject: [PATCH 08/24] feat: Integration with persy using background ops

---
 Cargo.toml                        |   5 +
 src/database.rs                   |   6 +
 src/database/abstraction.rs       |   5 +-
 src/database/abstraction/persy.rs | 245 ++++++++++++++++++++++++++++++
 src/error.rs                      |  15 ++
 5 files changed, 275 insertions(+), 1 deletion(-)
 create mode 100644 src/database/abstraction/persy.rs

diff --git a/Cargo.toml b/Cargo.toml
index c87d949c..2dbd3fd3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -28,6 +28,10 @@ tokio = "1.11.0"
 # Used for storing data permanently
 sled = { version = "0.34.6", features = ["compression", "no_metrics"], optional = true }
 #sled = { git = "https://github.com/spacejam/sled.git", rev = "e4640e0773595229f398438886f19bca6f7326a2", features = ["compression"] }
+persy = { git = "https://gitlab.com/tglman/persy.git", branch="master" , optional = true, features=["background_ops"] }
+# Used by the persy write cache for background flush
+timer = "0.2"
+chrono = "0.4"
 
 # Used for the http request / response body type for Ruma endpoints used with reqwest
 bytes = "1.1.0"
@@ -87,6 +91,7 @@ sha-1 = "0.9.8"
 [features]
 default = ["conduit_bin", "backend_sqlite", "backend_rocksdb"]
 backend_sled = ["sled"]
+backend_persy = ["persy"]
 backend_sqlite = ["sqlite"]
 backend_heed = ["heed", "crossbeam"]
 backend_rocksdb = ["rocksdb"]
diff --git a/src/database.rs b/src/database.rs
index d688ff9f..c2cd9f29 100644
--- a/src/database.rs
+++ b/src/database.rs
@@ -255,6 +255,12 @@ impl Database {
                 #[cfg(feature = "rocksdb")]
                 Arc::new(Arc::<abstraction::rocksdb::Engine>::open(config)?)
             }
+            "persy" => {
+                #[cfg(not(feature = "persy"))]
+                return Err(Error::BadConfig("Database backend not found."));
+                #[cfg(feature = "persy")]
+                Arc::new(Arc::<abstraction::persy::Engine>::open(config)?)
+            }
             _ => {
                 return Err(Error::BadConfig("Database backend not found."));
             }
diff --git a/src/database/abstraction.rs b/src/database/abstraction.rs
index 17bd971f..9a3771f3 100644
--- a/src/database/abstraction.rs
+++ b/src/database/abstraction.rs
@@ -15,7 +15,10 @@ pub mod heed;
 #[cfg(feature = "rocksdb")]
 pub mod rocksdb;
 
-#[cfg(any(feature = "sqlite", feature = "rocksdb", feature = "heed"))]
+#[cfg(feature = "persy")]
+pub mod persy;
+
+#[cfg(any(feature = "sqlite", feature = "rocksdb", feature = "heed", feature="persy"))]
 pub mod watchers;
 
 pub trait DatabaseEngine: Send + Sync {
diff --git a/src/database/abstraction/persy.rs b/src/database/abstraction/persy.rs
new file mode 100644
index 00000000..5d633ab4
--- /dev/null
+++ b/src/database/abstraction/persy.rs
@@ -0,0 +1,245 @@
+use crate::{
+    database::{
+        abstraction::{DatabaseEngine, Tree},
+        Config,
+    },
+    Result,
+};
+use persy::{ByteVec, OpenOptions, Persy, Transaction, TransactionConfig, ValueMode};
+
+use std::{
+    collections::HashMap,
+    future::Future,
+    pin::Pin,
+    sync::{Arc, RwLock},
+};
+
+use tokio::sync::oneshot::Sender;
+use tracing::warn;
+
+pub struct PersyEngine {
+    persy: Persy,
+}
+
+impl DatabaseEngine for PersyEngine {
+    fn open(config: &Config) -> Result<Arc<Self>> {
+        let mut cfg = persy::Config::new();
+        cfg.change_cache_size((config.db_cache_capacity_mb * 1024.0 * 1024.0) as u64);
+
+        let persy = OpenOptions::new()
+            .create(true)
+            .config(cfg)
+            .open(&format!("{}/db.persy", config.database_path))?;
+        Ok(Arc::new(PersyEngine { persy }))
+    }
+
+    fn open_tree(self: &Arc<Self>, name: &'static str) -> Result<Arc<dyn Tree>> {
+        // Create if it doesn't exist
+        if !self.persy.exists_index(name)? {
+            let mut tx = self.persy.begin()?;
+            tx.create_index::<ByteVec, ByteVec>(name, ValueMode::Replace)?;
+            tx.prepare()?.commit()?;
+        }
+
+        Ok(Arc::new(PersyTree {
+            persy: self.persy.clone(),
+            name: name.to_owned(),
+            watchers: RwLock::new(HashMap::new()),
+        }))
+    }
+
+    fn flush(self: &Arc<Self>) -> Result<()> {
+        Ok(())
+    }
+}
+
+pub struct PersyTree {
+    persy: Persy,
+    name: String,
+    watchers: RwLock<HashMap<Vec<u8>, Vec<Sender<()>>>>,
+}
+
+impl PersyTree {
+    fn begin(&self) -> Result<Transaction> {
+        Ok(self
+            .persy
+            .begin_with(TransactionConfig::new().set_background_sync(true))?)
+    }
+}
+
+impl Tree for PersyTree {
+    #[tracing::instrument(skip(self, key))]
+    fn get(&self, key: &[u8]) -> Result<Option<Vec<u8>>> {
+        let result = self
+            .persy
+            .get::<ByteVec, ByteVec>(&self.name, &ByteVec::from(key))?
+            .next()
+            .map(|v| (*v).to_owned());
+        Ok(result)
+    }
+
+    #[tracing::instrument(skip(self, key, value))]
+    fn insert(&self, key: &[u8], value: &[u8]) -> Result<()> {
+        self.insert_batch(&mut Some((key.to_owned(), value.to_owned())).into_iter())?;
+        let watchers = self.watchers.read().unwrap();
+        let mut triggered = Vec::new();
+
+        for length in 0..=key.len() {
+            if watchers.contains_key(&key[..length]) {
+                triggered.push(&key[..length]);
+            }
+        }
+
+        drop(watchers);
+
+        if !triggered.is_empty() {
+            let mut watchers = self.watchers.write().unwrap();
+            for prefix in triggered {
+                if let Some(txs) = watchers.remove(prefix) {
+                    for tx in txs {
+                        let _ = tx.send(());
+                    }
+                }
+            }
+        }
+        Ok(())
+    }
+
+    #[tracing::instrument(skip(self, iter))]
+    fn insert_batch<'a>(&self, iter: &mut dyn Iterator<Item = (Vec<u8>, Vec<u8>)>) -> Result<()> {
+        let mut tx = self.begin()?;
+        for (key, value) in iter {
+            tx.put::<ByteVec, ByteVec>(
+                &self.name,
+                ByteVec::from(key.clone()),
+                ByteVec::from(value),
+            )?;
+        }
+        tx.prepare()?.commit()?;
+        Ok(())
+    }
+
+    #[tracing::instrument(skip(self, iter))]
+    fn increment_batch<'a>(&self, iter: &mut dyn Iterator<Item = Vec<u8>>) -> Result<()> {
+        let mut tx = self.begin()?;
+        for key in iter {
+            let old = tx
+                .get::<ByteVec, ByteVec>(&self.name, &ByteVec::from(key.clone()))?
+                .next()
+                .map(|v| (*v).to_owned());
+            let new = crate::utils::increment(old.as_deref()).unwrap();
+            tx.put::<ByteVec, ByteVec>(&self.name, ByteVec::from(key), ByteVec::from(new))?;
+        }
+        tx.prepare()?.commit()?;
+        Ok(())
+    }
+
+    #[tracing::instrument(skip(self, key))]
+    fn remove(&self, key: &[u8]) -> Result<()> {
+        let mut tx = self.begin()?;
+        tx.remove::<ByteVec, ByteVec>(&self.name, ByteVec::from(key), None)?;
+        tx.prepare()?.commit()?;
+        Ok(())
+    }
+
+    #[tracing::instrument(skip(self))]
+    fn iter<'a>(&'a self) -> Box<dyn Iterator<Item = (Vec<u8>, Vec<u8>)> + 'a> {
+        let iter = self.persy.range::<ByteVec, ByteVec, _>(&self.name, ..);
+        match iter {
+            Ok(iter) => Box::new(iter.filter_map(|(k, v)| {
+                v.into_iter()
+                    .map(|val| ((*k).to_owned().into(), (*val).to_owned().into()))
+                    .next()
+            })),
+            Err(e) => {
+                warn!("error iterating {:?}", e);
+                Box::new(std::iter::empty())
+            }
+        }
+    }
+
+    #[tracing::instrument(skip(self, from, backwards))]
+    fn iter_from<'a>(
+        &'a self,
+        from: &[u8],
+        backwards: bool,
+    ) -> Box<dyn Iterator<Item = (Vec<u8>, Vec<u8>)> + 'a> {
+        let range = if backwards {
+            self.persy
+                .range::<ByteVec, ByteVec, _>(&self.name, ..=ByteVec::from(from))
+        } else {
+            self.persy
+                .range::<ByteVec, ByteVec, _>(&self.name, ByteVec::from(from)..)
+        };
+        match range {
+            Ok(iter) => {
+                let map = iter.filter_map(|(k, v)| {
+                    v.into_iter()
+                        .map(|val| ((*k).to_owned().into(), (*val).to_owned().into()))
+                        .next()
+                });
+                if backwards {
+                    Box::new(map.rev())
+                } else {
+                    Box::new(map)
+                }
+            }
+            Err(e) => {
+                warn!("error iterating with prefix {:?}", e);
+                Box::new(std::iter::empty())
+            }
+        }
+    }
+
+    #[tracing::instrument(skip(self, key))]
+    fn increment(&self, key: &[u8]) -> Result<Vec<u8>> {
+        self.increment_batch(&mut Some(key.to_owned()).into_iter())?;
+        Ok(self.get(key)?.unwrap())
+    }
+
+    #[tracing::instrument(skip(self, prefix))]
+    fn scan_prefix<'a>(
+        &'a self,
+        prefix: Vec<u8>,
+    ) -> Box<dyn Iterator<Item = (Vec<u8>, Vec<u8>)> + 'a> {
+        let range_prefix = ByteVec::from(prefix.clone());
+        let range = self
+            .persy
+            .range::<ByteVec, ByteVec, _>(&self.name, range_prefix..);
+
+        match range {
+            Ok(iter) => {
+                let owned_prefix = prefix.clone();
+                Box::new(
+                    iter.take_while(move |(k, _)| (*k).starts_with(&owned_prefix))
+                        .filter_map(|(k, v)| {
+                            v.into_iter()
+                                .map(|val| ((*k).to_owned().into(), (*val).to_owned().into()))
+                                .next()
+                        }),
+                )
+            }
+            Err(e) => {
+                warn!("error scanning prefix {:?}", e);
+                Box::new(std::iter::empty())
+            }
+        }
+    }
+
+    #[tracing::instrument(skip(self, prefix))]
+    fn watch_prefix<'a>(&'a self, prefix: &[u8]) -> Pin<Box<dyn Future<Output = ()> + Send + 'a>> {
+        let (tx, rx) = tokio::sync::oneshot::channel();
+
+        self.watchers
+            .write()
+            .unwrap()
+            .entry(prefix.to_vec())
+            .or_default()
+            .push(tx);
+
+        Box::pin(async move {
+            // Tx is never destroyed
+            rx.await.unwrap();
+        })
+    }
+}
diff --git a/src/error.rs b/src/error.rs
index 4d427da4..5ffe48c9 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -8,6 +8,9 @@ use ruma::{
 use thiserror::Error;
 use tracing::warn;
 
+#[cfg(feature = "persy")]
+use persy::PersyError;
+
 #[cfg(feature = "conduit_bin")]
 use {
     crate::RumaResponse,
@@ -36,6 +39,9 @@ pub enum Error {
         #[from]
         source: rusqlite::Error,
     },
+    #[cfg(feature = "persy")]
+    #[error("There was a problem with the connection to the persy database.")]
+    PersyError { source: PersyError },
     #[cfg(feature = "heed")]
     #[error("There was a problem with the connection to the heed database: {error}")]
     HeedError { error: String },
@@ -142,3 +148,12 @@ where
         self.to_response().respond_to(r)
     }
 }
+
+#[cfg(feature = "persy")]
+impl<T: Into<PersyError>> From<persy::PE<T>> for Error {
+    fn from(err: persy::PE<T>) -> Self {
+        Error::PersyError {
+            source: err.error().into(),
+        }
+    }
+}

From 1cc41937bd9ae7679aa48c10074ac1041d3a94b5 Mon Sep 17 00:00:00 2001
From: Tglman <tglman@tglman.com>
Date: Thu, 23 Dec 2021 22:59:17 +0000
Subject: [PATCH 09/24] refactor:use generic watcher in persy implementation

---
 Cargo.lock                        | 46 ++++++++++++++++++++++++++++
 Cargo.toml                        |  5 +---
 src/database/abstraction/persy.rs | 50 ++++---------------------------
 3 files changed, 53 insertions(+), 48 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d297102c..df37fd58 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -293,6 +293,7 @@ dependencies = [
  "opentelemetry",
  "opentelemetry-jaeger",
  "parking_lot",
+ "persy",
  "rand 0.8.4",
  "regex",
  "reqwest",
@@ -374,6 +375,21 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "crc"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49fc9a695bca7f35f5f4c15cddc84415f66a74ea78eef08e90c5024f2b540e23"
+dependencies = [
+ "crc-catalog",
+]
+
+[[package]]
+name = "crc-catalog"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccaeedb56da03b09f598226e25e80088cb4cd25f316e6e4df7d695f0feeb1403"
+
 [[package]]
 name = "crc32fast"
 version = "1.3.0"
@@ -1651,6 +1667,21 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 
+[[package]]
+name = "persy"
+version = "1.2.0"
+source = "git+https://gitlab.com/tglman/persy.git?branch=master#ff102d6edeaf14d30a846c2e2376a814685d09e7"
+dependencies = [
+ "crc",
+ "data-encoding",
+ "fs2",
+ "linked-hash-map",
+ "rand 0.8.4",
+ "thiserror",
+ "unsigned-varint",
+ "zigzag",
+]
+
 [[package]]
 name = "pin-project"
 version = "1.0.10"
@@ -3290,6 +3321,12 @@ version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7"
 
+[[package]]
+name = "unsigned-varint"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d86a8dc7f45e4c1b0d30e43038c38f274e77af056aa5f74b93c2cf9eb3c1c836"
+
 [[package]]
 name = "untrusted"
 version = "0.7.1"
@@ -3532,6 +3569,15 @@ dependencies = [
  "synstructure",
 ]
 
+[[package]]
+name = "zigzag"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70b40401a28d86ce16a330b863b86fd7dbee4d7c940587ab09ab8c019f9e3fdf"
+dependencies = [
+ "num-traits",
+]
+
 [[package]]
 name = "zstd"
 version = "0.9.2+zstd.1.5.1"
diff --git a/Cargo.toml b/Cargo.toml
index 2dbd3fd3..7c94a693 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -29,9 +29,6 @@ tokio = "1.11.0"
 sled = { version = "0.34.6", features = ["compression", "no_metrics"], optional = true }
 #sled = { git = "https://github.com/spacejam/sled.git", rev = "e4640e0773595229f398438886f19bca6f7326a2", features = ["compression"] }
 persy = { git = "https://gitlab.com/tglman/persy.git", branch="master" , optional = true, features=["background_ops"] }
-# Used by the persy write cache for background flush
-timer = "0.2"
-chrono = "0.4"
 
 # Used for the http request / response body type for Ruma endpoints used with reqwest
 bytes = "1.1.0"
@@ -91,7 +88,7 @@ sha-1 = "0.9.8"
 [features]
 default = ["conduit_bin", "backend_sqlite", "backend_rocksdb"]
 backend_sled = ["sled"]
-backend_persy = ["persy"]
+backend_persy = ["persy", "parking_lot"]
 backend_sqlite = ["sqlite"]
 backend_heed = ["heed", "crossbeam"]
 backend_rocksdb = ["rocksdb"]
diff --git a/src/database/abstraction/persy.rs b/src/database/abstraction/persy.rs
index 5d633ab4..71efed3b 100644
--- a/src/database/abstraction/persy.rs
+++ b/src/database/abstraction/persy.rs
@@ -1,20 +1,14 @@
 use crate::{
     database::{
-        abstraction::{DatabaseEngine, Tree},
+        abstraction::{watchers::Watchers, DatabaseEngine, Tree},
         Config,
     },
     Result,
 };
 use persy::{ByteVec, OpenOptions, Persy, Transaction, TransactionConfig, ValueMode};
 
-use std::{
-    collections::HashMap,
-    future::Future,
-    pin::Pin,
-    sync::{Arc, RwLock},
-};
+use std::{future::Future, pin::Pin, sync::Arc};
 
-use tokio::sync::oneshot::Sender;
 use tracing::warn;
 
 pub struct PersyEngine {
@@ -44,7 +38,7 @@ impl DatabaseEngine for PersyEngine {
         Ok(Arc::new(PersyTree {
             persy: self.persy.clone(),
             name: name.to_owned(),
-            watchers: RwLock::new(HashMap::new()),
+            watchers: Watchers::default(),
         }))
     }
 
@@ -56,7 +50,7 @@ impl DatabaseEngine for PersyEngine {
 pub struct PersyTree {
     persy: Persy,
     name: String,
-    watchers: RwLock<HashMap<Vec<u8>, Vec<Sender<()>>>>,
+    watchers: Watchers,
 }
 
 impl PersyTree {
@@ -81,27 +75,7 @@ impl Tree for PersyTree {
     #[tracing::instrument(skip(self, key, value))]
     fn insert(&self, key: &[u8], value: &[u8]) -> Result<()> {
         self.insert_batch(&mut Some((key.to_owned(), value.to_owned())).into_iter())?;
-        let watchers = self.watchers.read().unwrap();
-        let mut triggered = Vec::new();
-
-        for length in 0..=key.len() {
-            if watchers.contains_key(&key[..length]) {
-                triggered.push(&key[..length]);
-            }
-        }
-
-        drop(watchers);
-
-        if !triggered.is_empty() {
-            let mut watchers = self.watchers.write().unwrap();
-            for prefix in triggered {
-                if let Some(txs) = watchers.remove(prefix) {
-                    for tx in txs {
-                        let _ = tx.send(());
-                    }
-                }
-            }
-        }
+        self.watchers.wake(key);
         Ok(())
     }
 
@@ -228,18 +202,6 @@ impl Tree for PersyTree {
 
     #[tracing::instrument(skip(self, prefix))]
     fn watch_prefix<'a>(&'a self, prefix: &[u8]) -> Pin<Box<dyn Future<Output = ()> + Send + 'a>> {
-        let (tx, rx) = tokio::sync::oneshot::channel();
-
-        self.watchers
-            .write()
-            .unwrap()
-            .entry(prefix.to_vec())
-            .or_default()
-            .push(tx);
-
-        Box::pin(async move {
-            // Tx is never destroyed
-            rx.await.unwrap();
-        })
+        self.watchers.watch(prefix)
     }
 }

From f9977ca64f84768c0a71535f6038f4a6487ddc17 Mon Sep 17 00:00:00 2001
From: Tglman <tglman@tglman.com>
Date: Thu, 13 Jan 2022 22:37:19 +0000
Subject: [PATCH 10/24] fix: changes to update to the last database engine
 trait definition

---
 src/database/abstraction.rs       |  7 ++++++-
 src/database/abstraction/persy.rs | 12 ++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/database/abstraction.rs b/src/database/abstraction.rs
index 9a3771f3..09081826 100644
--- a/src/database/abstraction.rs
+++ b/src/database/abstraction.rs
@@ -18,7 +18,12 @@ pub mod rocksdb;
 #[cfg(feature = "persy")]
 pub mod persy;
 
-#[cfg(any(feature = "sqlite", feature = "rocksdb", feature = "heed", feature="persy"))]
+#[cfg(any(
+    feature = "sqlite",
+    feature = "rocksdb",
+    feature = "heed",
+    feature = "persy"
+))]
 pub mod watchers;
 
 pub trait DatabaseEngine: Send + Sync {
diff --git a/src/database/abstraction/persy.rs b/src/database/abstraction/persy.rs
index 71efed3b..628cf32b 100644
--- a/src/database/abstraction/persy.rs
+++ b/src/database/abstraction/persy.rs
@@ -11,12 +11,12 @@ use std::{future::Future, pin::Pin, sync::Arc};
 
 use tracing::warn;
 
-pub struct PersyEngine {
+pub struct Engine {
     persy: Persy,
 }
 
-impl DatabaseEngine for PersyEngine {
-    fn open(config: &Config) -> Result<Arc<Self>> {
+impl DatabaseEngine for Arc<Engine> {
+    fn open(config: &Config) -> Result<Self> {
         let mut cfg = persy::Config::new();
         cfg.change_cache_size((config.db_cache_capacity_mb * 1024.0 * 1024.0) as u64);
 
@@ -24,10 +24,10 @@ impl DatabaseEngine for PersyEngine {
             .create(true)
             .config(cfg)
             .open(&format!("{}/db.persy", config.database_path))?;
-        Ok(Arc::new(PersyEngine { persy }))
+        Ok(Arc::new(Engine { persy }))
     }
 
-    fn open_tree(self: &Arc<Self>, name: &'static str) -> Result<Arc<dyn Tree>> {
+    fn open_tree(&self, name: &'static str) -> Result<Arc<dyn Tree>> {
         // Create if it doesn't exist
         if !self.persy.exists_index(name)? {
             let mut tx = self.persy.begin()?;
@@ -42,7 +42,7 @@ impl DatabaseEngine for PersyEngine {
         }))
     }
 
-    fn flush(self: &Arc<Self>) -> Result<()> {
+    fn flush(&self) -> Result<()> {
         Ok(())
     }
 }

From c1cd4b5e26c68d1c5e91f85df2a65591f774d13c Mon Sep 17 00:00:00 2001
From: Tglman <tglman@tglman.com>
Date: Fri, 14 Jan 2022 21:00:13 +0000
Subject: [PATCH 11/24] chore: set the released version of persy in Cargo.toml

---
 Cargo.lock | 3 ++-
 Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index df37fd58..469c5663 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1670,7 +1670,8 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 [[package]]
 name = "persy"
 version = "1.2.0"
-source = "git+https://gitlab.com/tglman/persy.git?branch=master#ff102d6edeaf14d30a846c2e2376a814685d09e7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29c6aa7d7f093620a28b74fcf5f5da73ba17a9e52fcbbdbb4ecc89e61cb2d673"
 dependencies = [
  "crc",
  "data-encoding",
diff --git a/Cargo.toml b/Cargo.toml
index 7c94a693..df879c36 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -28,7 +28,7 @@ tokio = "1.11.0"
 # Used for storing data permanently
 sled = { version = "0.34.6", features = ["compression", "no_metrics"], optional = true }
 #sled = { git = "https://github.com/spacejam/sled.git", rev = "e4640e0773595229f398438886f19bca6f7326a2", features = ["compression"] }
-persy = { git = "https://gitlab.com/tglman/persy.git", branch="master" , optional = true, features=["background_ops"] }
+persy = { version = "1.2" , optional = true, features=["background_ops"] }
 
 # Used for the http request / response body type for Ruma endpoints used with reqwest
 bytes = "1.1.0"

From fb19114bd9bbfc9bcc50caaab72074247bbe726b Mon Sep 17 00:00:00 2001
From: Torsten Flammiger <git@netfg.net>
Date: Sat, 15 Jan 2022 15:52:47 +0100
Subject: [PATCH 12/24] rename iter_locals to get_local_users; make
 get_local_users skip on parse errors; remove deprecated function
 count_local_users

---
 src/database/admin.rs |  5 +----
 src/database/users.rs | 22 +++++++++-------------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/src/database/admin.rs b/src/database/admin.rs
index 5418f53a..859977e9 100644
--- a/src/database/admin.rs
+++ b/src/database/admin.rs
@@ -95,14 +95,11 @@ impl Admin {
 
                         match event {
                             AdminCommand::ListLocalUsers => {
-                                // collect local users only
-                                let users = guard.users.iter_locals();
+                                let users = guard.users.get_local_users();
 
                                 let mut msg: String = format!("Found {} local user account(s):\n", users.len());
                                 msg += &users.join("\n");
                                 
-                                // send number of local users as plain text:
-                                // TODO: send as Markdown
                                 send_message(RoomMessageEventContent::text_plain(&msg), guard, &state_lock);
                             }
                             AdminCommand::RegisterAppservice(yaml) => {
diff --git a/src/database/users.rs b/src/database/users.rs
index d3e1fe43..021c710b 100644
--- a/src/database/users.rs
+++ b/src/database/users.rs
@@ -84,16 +84,6 @@ impl Users {
         Ok(self.userid_password.iter().count())
     }
 
-    /// The method is DEPRECATED and was replaced by iter_locals()
-    /// 
-    /// This method will only count those local user accounts with
-    /// a password thus returning only real accounts on this instance.
-    #[tracing::instrument(skip(self))]
-    pub fn count_local_users(&self) -> Result<usize> {
-        let n = self.userid_password.iter().filter(|(_, bytes)| bytes.len() > 0).count();
-        Ok(n)
-    }
-
 
     /// Find out which user an access token belongs to.
     #[tracing::instrument(skip(self, token))]
@@ -134,13 +124,19 @@ impl Users {
         })
     }
 
-    /// Returns a vector of local usernames
+    /// Returns a list of local usernames, that is, a parseable username
+    /// with a password of length greater then zero bytes.
+    /// If utils::string_from_bytes returns an error that username will be skipped
+    /// and the function will log the error
     #[tracing::instrument(skip(self))]
-    pub fn iter_locals(&self) -> Vec<String> {
+    pub fn get_local_users(&self) -> Vec<String> {
         self.userid_password.iter().filter(|(_, pw)| pw.len() > 0).map(|(username, _)| {
             match utils::string_from_bytes(&username) {
                 Ok(s) => s,
-                Err(e) => e.to_string()
+                Err(e) => {
+                    Error::bad_database(format!("Failed to parse username: {}", e.to_string()));
+                    None
+                }
             }
         }).collect::<Vec<String>>()
     }

From 91eb6c4d08c5293f8af6436489923871fb2477a9 Mon Sep 17 00:00:00 2001
From: Torsten Flammiger <git@netfg.net>
Date: Sat, 15 Jan 2022 17:10:23 +0100
Subject: [PATCH 13/24] Return a Result instead of a vector

---
 src/database/admin.rs | 16 ++++++++++------
 src/database/users.rs | 18 +++++++++++-------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/database/admin.rs b/src/database/admin.rs
index 859977e9..7799ffa2 100644
--- a/src/database/admin.rs
+++ b/src/database/admin.rs
@@ -95,12 +95,16 @@ impl Admin {
 
                         match event {
                             AdminCommand::ListLocalUsers => {
-                                let users = guard.users.get_local_users();
-
-                                let mut msg: String = format!("Found {} local user account(s):\n", users.len());
-                                msg += &users.join("\n");
-                                
-                                send_message(RoomMessageEventContent::text_plain(&msg), guard, &state_lock);
+                                match guard.users.get_local_users() {
+                                    Ok(users) => {
+                                        let mut msg: String = format!("Found {} local user account(s):\n", users.len());
+                                        msg += &users.join("\n");
+                                        send_message(RoomMessageEventContent::text_plain(&msg), guard, &state_lock);
+                                    }
+                                    Err(e) => {
+                                        send_message(RoomMessageEventContent::text_plain(e.to_string()), guard, &state_lock);
+                                    }
+                                }
                             }
                             AdminCommand::RegisterAppservice(yaml) => {
                                 guard.appservice.register_appservice(yaml).unwrap(); // TODO handle error
diff --git a/src/database/users.rs b/src/database/users.rs
index 021c710b..7d14b3e4 100644
--- a/src/database/users.rs
+++ b/src/database/users.rs
@@ -84,7 +84,6 @@ impl Users {
         Ok(self.userid_password.iter().count())
     }
 
-
     /// Find out which user an access token belongs to.
     #[tracing::instrument(skip(self, token))]
     pub fn find_from_token(&self, token: &str) -> Result<Option<(Box<UserId>, String)>> {
@@ -129,16 +128,21 @@ impl Users {
     /// If utils::string_from_bytes returns an error that username will be skipped
     /// and the function will log the error
     #[tracing::instrument(skip(self))]
-    pub fn get_local_users(&self) -> Vec<String> {
-        self.userid_password.iter().filter(|(_, pw)| pw.len() > 0).map(|(username, _)| {
-            match utils::string_from_bytes(&username) {
+    pub fn get_local_users(&self) -> Result<Vec<String>> {
+        self.userid_password
+            .iter()
+            .filter(|(_, pw)| pw.len() > 0)
+            .map(|(username, _)| match utils::string_from_bytes(&username) {
                 Ok(s) => s,
                 Err(e) => {
-                    Error::bad_database(format!("Failed to parse username: {}", e.to_string()));
+                    Error::bad_database(format!(
+                        "Failed to parse username while calling get_local_users(): {}",
+                        e.to_string()
+                    ));
                     None
                 }
-            }
-        }).collect::<Vec<String>>()
+            })
+            .collect::<Result<Vec<String>>>()
     }
 
     /// Returns the password hash for the given user.

From 217e3789929b7a1b227058b3b88664ee5f74ca75 Mon Sep 17 00:00:00 2001
From: Julius de Bruijn <pimeys@gmail.com>
Date: Sat, 15 Jan 2022 17:34:13 +0000
Subject: [PATCH 14/24] Add mautrix-signal to tested appservices

---
 APPSERVICES.md | 36 +-----------------------------------
 1 file changed, 1 insertion(+), 35 deletions(-)

diff --git a/APPSERVICES.md b/APPSERVICES.md
index 894bc6f4..f23918b4 100644
--- a/APPSERVICES.md
+++ b/APPSERVICES.md
@@ -57,38 +57,4 @@ These appservices have been tested and work with Conduit without any extra steps
 - [matrix-appservice-discord](https://github.com/Half-Shot/matrix-appservice-discord)
 - [mautrix-hangouts](https://github.com/mautrix/hangouts/)
 - [mautrix-telegram](https://github.com/mautrix/telegram/)
-
-### [mautrix-signal](https://github.com/mautrix/signal)
-
-There are a few things you need to do, in order for the Signal bridge (at least
-up to version `0.2.0`) to work. How you do this depends on whether you use
-Docker or `virtualenv` to run it. In either case you need to modify
-[portal.py](https://github.com/mautrix/signal/blob/master/mautrix_signal/portal.py).
-Do this **before** following the bridge installation guide.
-
-1. **Create a copy of `portal.py`**. Go to
-   [portal.py](https://github.com/mautrix/signal/blob/master/mautrix_signal/portal.py)
-at [mautrix-signal](https://github.com/mautrix/signal) (make sure you change to
-the correct commit/version of mautrix-signal you're using) and copy its
-content. Create a new `portal.py` on your system and paste the content in.
-2. **Patch the copy**. Exact line numbers may be slightly different, look nearby if they don't match: 
-  - [Line 1020](https://github.com/mautrix/signal/blob/4ea831536f154aba6419d13292479eb383ea3308/mautrix_signal/portal.py#L1020)
-    ```diff
-    --- levels.users[self.main_intent.mxid] = 9001 if is_initial else 100
-    +++ levels.users[self.main_intent.mxid] = 100 if is_initial else 100
-    ```
-  - [Between lines 1041 and 1042](https://github.com/mautrix/signal/blob/4ea831536f154aba6419d13292479eb383ea3308/mautrix_signal/portal.py#L1041-L1042) add a new line:
-    ```diff
-        "type": str(EventType.ROOM_POWER_LEVELS),
-    +++ "state_key": "",
-        "content": power_levels.serialize(),
-    ```
-3. **Deploy the patch**. This is different depending on how you have `mautrix-signal` deployed:
-  - [*If using virtualenv*] Copy your patched `portal.py` to `./lib/python3.7/site-packages/mautrix_signal/portal.py` (the exact version of Python may be different on your system).
-  -  [*If using Docker*] Map the patched `portal.py` into the `mautrix-signal` container:
-    
-    ```yaml
-    volumes:
-      - ./your/path/on/host/portal.py:/usr/lib/python3.9/site-packages/mautrix_signal/portal.py
-    ```
-4. Now continue with the [bridge installation instructions ](https://docs.mau.fi/bridges/index.html) and the general bridge notes above.
+- [mautrix-signal](https://github.com/mautrix/signal/) from version `0.2.2` forward.

From c03bf6ef11bd88459d6dc1eed75d23879ae2fa1a Mon Sep 17 00:00:00 2001
From: Torsten Flammiger <git@netfg.net>
Date: Sat, 15 Jan 2022 22:20:51 +0100
Subject: [PATCH 15/24] name the function after its purpose: iter_locals ->
 get_local_users

---
 src/database/users.rs | 37 ++++++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/database/users.rs b/src/database/users.rs
index 7d14b3e4..6f51e1f9 100644
--- a/src/database/users.rs
+++ b/src/database/users.rs
@@ -129,20 +129,35 @@ impl Users {
     /// and the function will log the error
     #[tracing::instrument(skip(self))]
     pub fn get_local_users(&self) -> Result<Vec<String>> {
-        self.userid_password
+        let users: Vec<String> = self
+            .userid_password
             .iter()
-            .filter(|(_, pw)| pw.len() > 0)
-            .map(|(username, _)| match utils::string_from_bytes(&username) {
-                Ok(s) => s,
-                Err(e) => {
-                    Error::bad_database(format!(
-                        "Failed to parse username while calling get_local_users(): {}",
-                        e.to_string()
-                    ));
+            .filter_map(|(username, pw)| self.get_username_on_valid_password(&username, &pw))
+            .collect();
+        Ok(users)
+    }
+
+    /// A private helper to avoid double filtering the iterator
+    fn get_username_on_valid_password(&self, username: &[u8], password: &[u8]) -> Option<String> {
+        // A valid password is not empty
+        if password.len() > 0 {
+            match utils::string_from_bytes(username) {
+                Ok(u) => Some(u),
+                Err(_) => {
+                    // TODO: add error cause!
+                    // let msg: String = format!(
+                    //     "Failed to parse username while calling get_local_users(): {}",
+                    //     e.to_string()
+                    // );
+                    Error::bad_database(
+                        "Failed to parse username while calling get_username_on_valid_password",
+                    );
                     None
                 }
-            })
-            .collect::<Result<Vec<String>>>()
+            }
+        } else {
+            None
+        }
     }
 
     /// Returns the password hash for the given user.

From 9205c070485a234463119182bd976a0d45c1ace0 Mon Sep 17 00:00:00 2001
From: Torsten Flammiger <git@netfg.net>
Date: Sat, 15 Jan 2022 22:37:39 +0100
Subject: [PATCH 16/24] Update get_local_users description

---
 src/database/users.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/database/users.rs b/src/database/users.rs
index 6f51e1f9..e510140d 100644
--- a/src/database/users.rs
+++ b/src/database/users.rs
@@ -123,10 +123,11 @@ impl Users {
         })
     }
 
-    /// Returns a list of local usernames, that is, a parseable username
-    /// with a password of length greater then zero bytes.
+    /// Returns a list of local users as list of usernames.
+    ///
+    /// A user account is considered `local` if the length of it's password
+    /// is greater then zero.
     /// If utils::string_from_bytes returns an error that username will be skipped
-    /// and the function will log the error
     #[tracing::instrument(skip(self))]
     pub fn get_local_users(&self) -> Result<Vec<String>> {
         let users: Vec<String> = self
@@ -138,6 +139,7 @@ impl Users {
     }
 
     /// A private helper to avoid double filtering the iterator
+    #[tracing::instrument(skip(self))]
     fn get_username_on_valid_password(&self, username: &[u8], password: &[u8]) -> Option<String> {
         // A valid password is not empty
         if password.len() > 0 {

From 3e79d154957211b98343f18077282b6ab5e6d36e Mon Sep 17 00:00:00 2001
From: Torsten Flammiger <git@netfg.net>
Date: Sun, 16 Jan 2022 20:15:53 +0100
Subject: [PATCH 17/24] Updated function documentation

---
 src/database/users.rs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/database/users.rs b/src/database/users.rs
index e510140d..9fe4a4ee 100644
--- a/src/database/users.rs
+++ b/src/database/users.rs
@@ -125,28 +125,27 @@ impl Users {
 
     /// Returns a list of local users as list of usernames.
     ///
-    /// A user account is considered `local` if the length of it's password
-    /// is greater then zero.
-    /// If utils::string_from_bytes returns an error that username will be skipped
+    /// A user account is considered `local` if the length of it's password is greater then zero.
     #[tracing::instrument(skip(self))]
     pub fn get_local_users(&self) -> Result<Vec<String>> {
         let users: Vec<String> = self
             .userid_password
             .iter()
-            .filter_map(|(username, pw)| self.get_username_on_valid_password(&username, &pw))
+            .filter_map(|(username, pw)| self.get_username_with_valid_password(&username, &pw))
             .collect();
         Ok(users)
     }
 
-    /// A private helper to avoid double filtering the iterator
+    /// A private helper to avoid double filtering the iterator in get_local_users().
+    /// If utils::string_from_bytes(...) returns an error that username will be skipped
+    /// and the error will be logged. TODO: add error cause.
     #[tracing::instrument(skip(self))]
-    fn get_username_on_valid_password(&self, username: &[u8], password: &[u8]) -> Option<String> {
+    fn get_username_with_valid_password(&self, username: &[u8], password: &[u8]) -> Option<String> {
         // A valid password is not empty
         if password.len() > 0 {
             match utils::string_from_bytes(username) {
                 Ok(u) => Some(u),
                 Err(_) => {
-                    // TODO: add error cause!
                     // let msg: String = format!(
                     //     "Failed to parse username while calling get_local_users(): {}",
                     //     e.to_string()

From 52284ef9e2de88798408913b73d6b783768e13f3 Mon Sep 17 00:00:00 2001
From: Torsten Flammiger <git@netfg.net>
Date: Sun, 16 Jan 2022 20:25:16 +0100
Subject: [PATCH 18/24] Add some debug/info if user was found

---
 src/database/users.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/database/users.rs b/src/database/users.rs
index 9fe4a4ee..f73c1c8b 100644
--- a/src/database/users.rs
+++ b/src/database/users.rs
@@ -10,6 +10,7 @@ use ruma::{
 };
 use std::{collections::BTreeMap, convert::TryInto, mem, sync::Arc};
 use tracing::warn;
+use tracing::info;
 
 use super::abstraction::Tree;
 
@@ -144,7 +145,10 @@ impl Users {
         // A valid password is not empty
         if password.len() > 0 {
             match utils::string_from_bytes(username) {
-                Ok(u) => Some(u),
+                Ok(u) => {
+                    info!("list_local_users_test: found user {}", u);
+                    Some(u)
+                },
                 Err(_) => {
                     // let msg: String = format!(
                     //     "Failed to parse username while calling get_local_users(): {}",

From 50430cf4ab8c742b3942b2735f0d264b17be936e Mon Sep 17 00:00:00 2001
From: Torsten Flammiger <git@netfg.net>
Date: Sun, 16 Jan 2022 21:22:57 +0100
Subject: [PATCH 19/24] Name function after command: list_local_users

---
 src/database/admin.rs | 2 +-
 src/database/users.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/database/admin.rs b/src/database/admin.rs
index 7799ffa2..3b347b10 100644
--- a/src/database/admin.rs
+++ b/src/database/admin.rs
@@ -95,7 +95,7 @@ impl Admin {
 
                         match event {
                             AdminCommand::ListLocalUsers => {
-                                match guard.users.get_local_users() {
+                                match guard.users.list_local_users() {
                                     Ok(users) => {
                                         let mut msg: String = format!("Found {} local user account(s):\n", users.len());
                                         msg += &users.join("\n");
diff --git a/src/database/users.rs b/src/database/users.rs
index 9fe4a4ee..645e54c0 100644
--- a/src/database/users.rs
+++ b/src/database/users.rs
@@ -127,7 +127,7 @@ impl Users {
     ///
     /// A user account is considered `local` if the length of it's password is greater then zero.
     #[tracing::instrument(skip(self))]
-    pub fn get_local_users(&self) -> Result<Vec<String>> {
+    pub fn list_local_users(&self) -> Result<Vec<String>> {
         let users: Vec<String> = self
             .userid_password
             .iter()

From fc39b3447c5add8b8c8d2b188751969d752d1ee1 Mon Sep 17 00:00:00 2001
From: Torsten Flammiger <git@netfg.net>
Date: Mon, 17 Jan 2022 19:43:45 +0100
Subject: [PATCH 20/24] Little bit of refactoring

---
 src/database/users.rs | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/src/database/users.rs b/src/database/users.rs
index 83c1520e..e608673a 100644
--- a/src/database/users.rs
+++ b/src/database/users.rs
@@ -10,7 +10,6 @@ use ruma::{
 };
 use std::{collections::BTreeMap, convert::TryInto, mem, sync::Arc};
 use tracing::warn;
-use tracing::info;
 
 use super::abstraction::Tree;
 
@@ -137,31 +136,23 @@ impl Users {
         Ok(users)
     }
 
-    /// A private helper to avoid double filtering the iterator in get_local_users().
+    /// Will only return with Some(username) if the password was not empty and the
+    /// username could be successfully parsed.
     /// If utils::string_from_bytes(...) returns an error that username will be skipped
-    /// and the error will be logged. TODO: add error cause.
+    /// and the error will be logged.
     #[tracing::instrument(skip(self))]
     fn get_username_with_valid_password(&self, username: &[u8], password: &[u8]) -> Option<String> {
         // A valid password is not empty
-        if password.len() > 0 {
+        if password.is_empty() {
+            None
+        } else {
             match utils::string_from_bytes(username) {
-                Ok(u) => {
-                    info!("list_local_users_test: found user {}", u);
-                    Some(u)
-                },
-                Err(_) => {
-                    // let msg: String = format!(
-                    //     "Failed to parse username while calling get_local_users(): {}",
-                    //     e.to_string()
-                    // );
-                    Error::bad_database(
-                        "Failed to parse username while calling get_username_on_valid_password",
-                    );
+                Ok(u) => Some(u),
+                Err(e) => {
+                    warn!("Failed to parse username while calling get_local_users(): {}", e.to_string());
                     None
                 }
             }
-        } else {
-            None
         }
     }
 

From fd6427a83fef08b7f8f6f74d3a4c88af3171aa77 Mon Sep 17 00:00:00 2001
From: Torsten Flammiger <git@netfg.net>
Date: Mon, 17 Jan 2022 22:34:34 +0100
Subject: [PATCH 21/24] Update/Revert code comment

---
 src/database/users.rs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/database/users.rs b/src/database/users.rs
index e608673a..9b986d4e 100644
--- a/src/database/users.rs
+++ b/src/database/users.rs
@@ -77,8 +77,6 @@ impl Users {
     }
 
     /// Returns the number of users registered on this server.
-    /// It really returns all users, not only real ones with a
-    /// password to login but also bridge puppets...
     #[tracing::instrument(skip(self))]
     pub fn count(&self) -> Result<usize> {
         Ok(self.userid_password.iter().count())

From ba6d72f3f93aeb96c9ca98daab3c34e969c76008 Mon Sep 17 00:00:00 2001
From: Torsten Flammiger <git@netfg.net>
Date: Fri, 21 Jan 2022 14:28:07 +0100
Subject: [PATCH 22/24] Reformatted

---
 src/database/users.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/database/users.rs b/src/database/users.rs
index 9b986d4e..a6b6fabb 100644
--- a/src/database/users.rs
+++ b/src/database/users.rs
@@ -147,7 +147,10 @@ impl Users {
             match utils::string_from_bytes(username) {
                 Ok(u) => Some(u),
                 Err(e) => {
-                    warn!("Failed to parse username while calling get_local_users(): {}", e.to_string());
+                    warn!(
+                        "Failed to parse username while calling get_local_users(): {}",
+                        e.to_string()
+                    );
                     None
                 }
             }

From 97d56af5bd48474efc9aa1ac94ed4295e282d8ca Mon Sep 17 00:00:00 2001
From: Reiner Herrmann <reiner@reiner-h.de>
Date: Sat, 15 Jan 2022 17:23:14 +0000
Subject: [PATCH 23/24] Add heisenbridge to tested appservices

---
 APPSERVICES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/APPSERVICES.md b/APPSERVICES.md
index f23918b4..5ff223ed 100644
--- a/APPSERVICES.md
+++ b/APPSERVICES.md
@@ -58,3 +58,4 @@ These appservices have been tested and work with Conduit without any extra steps
 - [mautrix-hangouts](https://github.com/mautrix/hangouts/)
 - [mautrix-telegram](https://github.com/mautrix/telegram/)
 - [mautrix-signal](https://github.com/mautrix/signal/) from version `0.2.2` forward.
+- [heisenbridge](https://github.com/hifi/heisenbridge/)

From f88523988e23a09ffc5e1b9ab19e435863be3a9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20K=C3=B6sters?= <timo@koesters.xyz>
Date: Fri, 21 Jan 2022 09:19:19 +0100
Subject: [PATCH 24/24] improvement: use jemalloc for lower memory usage

---
 Cargo.lock  | 258 ++++++++++++++++++++++++----------------------------
 Cargo.toml  |  10 +-
 src/main.rs |   7 ++
 3 files changed, 132 insertions(+), 143 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8fe767e1..493ac082 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -14,7 +14,7 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
 dependencies = [
- "getrandom 0.2.3",
+ "getrandom 0.2.4",
  "once_cell",
  "version_check",
 ]
@@ -303,8 +303,6 @@ dependencies = [
  "ruma",
  "rusqlite",
  "rust-argon2",
- "rustls 0.19.1",
- "rustls-native-certs 0.5.0",
  "serde",
  "serde_json",
  "serde_yaml",
@@ -313,12 +311,13 @@ dependencies = [
  "thiserror",
  "thread_local",
  "threadpool",
+ "tikv-jemalloc-ctl",
+ "tikv-jemallocator",
  "tokio",
  "tracing",
  "tracing-flame",
  "tracing-subscriber 0.2.25",
  "trust-dns-resolver",
- "webpki 0.22.0",
 ]
 
 [[package]]
@@ -350,22 +349,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "core-foundation"
-version = "0.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6888e10551bb93e424d8df1d07f1a8b4fceb0001a3a4b048bfc47554946f47b3"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
-
 [[package]]
 name = "cpufeatures"
 version = "0.2.1"
@@ -392,9 +375,9 @@ checksum = "ccaeedb56da03b09f598226e25e80088cb4cd25f316e6e4df7d695f0feeb1403"
 
 [[package]]
 name = "crc32fast"
-version = "1.3.0"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "738c290dfaea84fc1ca15ad9c168d083b05a714e1efddd8edaab678dc28d2836"
+checksum = "a2209c310e29876f7f0b2721e7e26b84aff178aa3da5d091f9bfbf47669e60e3"
 dependencies = [
  "cfg-if 1.0.0",
 ]
@@ -713,6 +696,12 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "fs_extra"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394"
+
 [[package]]
 name = "futures"
 version = "0.3.19"
@@ -847,9 +836,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
+checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
@@ -1035,7 +1024,7 @@ dependencies = [
  "httpdate",
  "itoa 0.4.8",
  "pin-project-lite",
- "socket2 0.4.2",
+ "socket2 0.4.3",
  "tokio",
  "tower-service",
  "tracing",
@@ -1180,9 +1169,9 @@ checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2"
 
 [[package]]
 name = "js-sys"
-version = "0.3.55"
+version = "0.3.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84"
+checksum = "a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -1224,15 +1213,15 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.112"
+version = "0.2.113"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125"
+checksum = "eef78b64d87775463c549fbd80e19249ef436ea3bf1de2a1eb7e717ec7fab1e9"
 
 [[package]]
 name = "libloading"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afe203d669ec979b7128619bae5a63b7b42e9203c1b29146079ee05e2f604b52"
+checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd"
 dependencies = [
  "cfg-if 1.0.0",
  "winapi",
@@ -1308,7 +1297,7 @@ dependencies = [
  "serde",
  "serde_json",
  "tracing",
- "tracing-subscriber 0.3.5",
+ "tracing-subscriber 0.3.6",
 ]
 
 [[package]]
@@ -1528,12 +1517,6 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
-[[package]]
-name = "openssl-probe"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
-
 [[package]]
 name = "opentelemetry"
 version = "0.16.0"
@@ -1621,6 +1604,12 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "paste"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0744126afe1a6dd7f394cb50a716dbe086cb06e255e53d8d0185d82828358fb5"
+
 [[package]]
 name = "pear"
 version = "0.2.3"
@@ -1669,9 +1658,9 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 
 [[package]]
 name = "persy"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c6aa7d7f093620a28b74fcf5f5da73ba17a9e52fcbbdbb4ecc89e61cb2d673"
+checksum = "b71907e1dfa6844b657f5ca59e9a076e7d6281efb4885526ba9e235a18e7e3b3"
 dependencies = [
  "crc",
  "data-encoding",
@@ -1863,7 +1852,7 @@ version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
 dependencies = [
- "getrandom 0.2.3",
+ "getrandom 0.2.4",
 ]
 
 [[package]]
@@ -1899,7 +1888,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64"
 dependencies = [
- "getrandom 0.2.3",
+ "getrandom 0.2.4",
  "redox_syscall",
 ]
 
@@ -1982,7 +1971,6 @@ dependencies = [
  "percent-encoding",
  "pin-project-lite",
  "rustls 0.20.2",
- "rustls-native-certs 0.6.1",
  "rustls-pemfile",
  "serde",
  "serde_json",
@@ -1994,6 +1982,7 @@ dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
+ "webpki-roots",
  "winreg 0.7.0",
 ]
 
@@ -2443,30 +2432,6 @@ dependencies = [
  "webpki 0.22.0",
 ]
 
-[[package]]
-name = "rustls-native-certs"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092"
-dependencies = [
- "openssl-probe",
- "rustls 0.19.1",
- "schannel",
- "security-framework",
-]
-
-[[package]]
-name = "rustls-native-certs"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ca9ebdfa27d3fc180e42879037b5338ab1c040c06affd00d8338598e7800943"
-dependencies = [
- "openssl-probe",
- "rustls-pemfile",
- "schannel",
- "security-framework",
-]
-
 [[package]]
 name = "rustls-pemfile"
 version = "0.2.1"
@@ -2488,16 +2453,6 @@ version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f"
 
-[[package]]
-name = "schannel"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75"
-dependencies = [
- "lazy_static",
- "winapi",
-]
-
 [[package]]
 name = "scoped-tls"
 version = "1.0.0"
@@ -2530,29 +2485,6 @@ dependencies = [
  "untrusted",
 ]
 
-[[package]]
-name = "security-framework"
-version = "2.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "525bc1abfda2e1998d152c45cf13e696f76d0a4972310b22fac1658b05df7c87"
-dependencies = [
- "bitflags",
- "core-foundation",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "2.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9dd14d83160b528b7bfd66439110573efcfbe281b17fc2ca9f39f550d619c7e"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
 [[package]]
 name = "semver"
 version = "0.9.0"
@@ -2570,18 +2502,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "serde"
-version = "1.0.133"
+version = "1.0.134"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97565067517b60e2d1ea8b268e59ce036de907ac523ad83a0475da04e818989a"
+checksum = "96b3c34c1690edf8174f5b289a336ab03f568a4460d8c6df75f2f3a692b3bc6a"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.133"
+version = "1.0.134"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed201699328568d8d08208fdd080e3ff594e6c422e438b6705905da01005d537"
+checksum = "784ed1fbfa13fe191077537b0d70ec8ad1e903cfe04831da608aa36457cb653d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2590,9 +2522,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.74"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee2bb9cd061c5865d345bb02ca49fcef1391741b672b54a0bf7b679badec3142"
+checksum = "c059c05b48c5c0067d4b4b2b4f0732dd65feb52daf7e0ea09cd87e7dadc1af79"
 dependencies = [
  "itoa 1.0.1",
  "ryu",
@@ -2601,12 +2533,12 @@ dependencies = [
 
 [[package]]
 name = "serde_urlencoded"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9"
+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
 dependencies = [
  "form_urlencoded",
- "itoa 0.4.8",
+ "itoa 1.0.1",
  "ryu",
  "serde",
 ]
@@ -2638,9 +2570,18 @@ dependencies = [
 
 [[package]]
 name = "sha1"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
+checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770"
+dependencies = [
+ "sha1_smol",
+]
+
+[[package]]
+name = "sha1_smol"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
 
 [[package]]
 name = "sha2"
@@ -2721,9 +2662,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309"
+checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83"
 
 [[package]]
 name = "socket2"
@@ -2738,9 +2679,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516"
+checksum = "0f82496b90c36d70af5fcd482edaa2e0bd16fade569de1330405fecbbdac736b"
 dependencies = [
  "libc",
  "winapi",
@@ -2851,9 +2792,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
 
 [[package]]
 name = "syn"
-version = "1.0.85"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a684ac3dcd8913827e18cd09a68384ee66c1de24157e3c556c9ab16d85695fb7"
+checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2946,6 +2887,38 @@ dependencies = [
  "threadpool",
 ]
 
+[[package]]
+name = "tikv-jemalloc-ctl"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb833c46ecbf8b6daeccb347cefcabf9c1beb5c9b0f853e1cec45632d9963e69"
+dependencies = [
+ "libc",
+ "paste",
+ "tikv-jemalloc-sys",
+]
+
+[[package]]
+name = "tikv-jemalloc-sys"
+version = "0.4.2+5.2.1-patched.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5844e429d797c62945a566f8da4e24c7fe3fbd5d6617fd8bf7a0b7dc1ee0f22e"
+dependencies = [
+ "cc",
+ "fs_extra",
+ "libc",
+]
+
+[[package]]
+name = "tikv-jemallocator"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c14a5a604eb8715bc5785018a37d00739b180bcf609916ddf4393d33d49ccdf"
+dependencies = [
+ "libc",
+ "tikv-jemalloc-sys",
+]
+
 [[package]]
 name = "time"
 version = "0.1.43"
@@ -3200,9 +3173,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d81bfa81424cc98cb034b837c985b7a290f592e5b4322f353f94a0ab0f9f594"
+checksum = "77be66445c4eeebb934a7340f227bfe7b338173d3f8c00a60a5a58005c9faecf"
 dependencies = [
  "ansi_term",
  "lazy_static",
@@ -3355,7 +3328,7 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
 dependencies = [
- "getrandom 0.2.3",
+ "getrandom 0.2.4",
 ]
 
 [[package]]
@@ -3394,9 +3367,9 @@ checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.78"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce"
+checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06"
 dependencies = [
  "cfg-if 1.0.0",
  "wasm-bindgen-macro",
@@ -3404,9 +3377,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.78"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b"
+checksum = "8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca"
 dependencies = [
  "bumpalo",
  "lazy_static",
@@ -3419,9 +3392,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.28"
+version = "0.4.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e8d7523cb1f2a4c96c1317ca690031b714a51cc14e05f712446691f413f5d39"
+checksum = "2eb6ec270a31b1d3c7e266b999739109abce8b6c87e4b31fcfcd788b65267395"
 dependencies = [
  "cfg-if 1.0.0",
  "js-sys",
@@ -3431,9 +3404,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.78"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9"
+checksum = "2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -3441,9 +3414,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.78"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab"
+checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3454,15 +3427,15 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.78"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc"
+checksum = "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2"
 
 [[package]]
 name = "web-sys"
-version = "0.3.55"
+version = "0.3.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb"
+checksum = "c060b319f29dd25724f09a2ba1418f142f539b2be99fbf4d2d5a8f7330afb8eb"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -3488,6 +3461,15 @@ dependencies = [
  "untrusted",
 ]
 
+[[package]]
+name = "webpki-roots"
+version = "0.22.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "552ceb903e957524388c4d3475725ff2c8b7960922063af6ce53c9a43da07449"
+dependencies = [
+ "webpki 0.22.0",
+]
+
 [[package]]
 name = "weezl"
 version = "0.1.5"
@@ -3563,18 +3545,18 @@ checksum = "9fc79f4a1e39857fc00c3f662cbf2651c771f00e9c15fe2abc341806bd46bd71"
 
 [[package]]
 name = "zeroize"
-version = "1.4.3"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d68d9dcec5f9b43a30d38c49f91dfedfaac384cb8f085faca366c26207dd1619"
+checksum = "cc222aec311c323c717f56060324f32b82da1ce1dd81d9a09aa6a9030bfe08db"
 dependencies = [
  "zeroize_derive",
 ]
 
 [[package]]
 name = "zeroize_derive"
-version = "1.2.2"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65f1a51723ec88c66d5d1fe80c841f17f63587d6691901d66be9bec6c3b51f73"
+checksum = "81e8f13fef10b63c06356d65d416b070798ddabcadc10d3ece0c5be9b3c7eddb"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/Cargo.toml b/Cargo.toml
index e3614ec4..78a4c8ff 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -48,11 +48,7 @@ rand = "0.8.4"
 # Used to hash passwords
 rust-argon2 = "0.8.3"
 # Used to send requests
-reqwest = { version = "0.11.4", default-features = false, features = ["rustls-tls-native-roots", "socks"] }
-# Custom TLS verifier
-rustls = { version = "0.19.1", features = ["dangerous_configuration"] }
-rustls-native-certs = "0.5.0"
-webpki = "0.22.0"
+reqwest = { version = "0.11.4", default-features = false, features = ["rustls-tls", "socks"] }
 # Used for conduit::Error type
 thiserror = "1.0.28"
 # Used to generate thumbnails for images
@@ -87,6 +83,10 @@ thread_local = "1.1.3"
 hmac = "0.11.0"
 sha-1 = "0.9.8"
 
+[target.'cfg(not(target_env = "msvc"))'.dependencies]
+tikv-jemalloc-ctl = { version = "0.4.2", features = ['use_std'] }
+tikv-jemallocator = { version = "0.4.1", features = ['unprefixed_malloc_on_supported_platforms'] }
+
 [features]
 default = ["conduit_bin", "backend_sqlite", "backend_rocksdb"]
 backend_sled = ["sled"]
diff --git a/src/main.rs b/src/main.rs
index d9bbc240..b18ca803 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -25,6 +25,13 @@ use tracing_subscriber::{prelude::*, EnvFilter};
 pub use conduit::*; // Re-export everything from the library crate
 pub use rocket::State;
 
+#[cfg(not(target_env = "msvc"))]
+use tikv_jemallocator::Jemalloc;
+
+#[cfg(not(target_env = "msvc"))]
+#[global_allocator]
+static GLOBAL: Jemalloc = Jemalloc;
+
 fn setup_rocket(config: Figment, data: Arc<RwLock<Database>>) -> rocket::Rocket<rocket::Build> {
     rocket::custom(config)
         .manage(data)