aboutsummaryrefslogtreecommitdiffstats
path: root/atuin-common
diff options
context:
space:
mode:
authorEllie Huxtable <e@elm.sh>2021-04-20 21:53:07 +0100
committerGitHub <noreply@github.com>2021-04-20 20:53:07 +0000
commita21737e2b7f8d1e426726bdd7536033f299d476a (patch)
treee940afdff9c145d25d9a2895fd44a77d70719a2e /atuin-common
parentSwitch to Warp + SQLx, use async, switch to Rust stable (#36) (diff)
downloadatuin-a21737e2b7f8d1e426726bdd7536033f299d476a.zip
Use cargo workspaces (#37)
* Switch to Cargo workspaces Breaking things into "client", "server" and "common" makes managing the codebase much easier! client - anything running on a user's machine for adding history server - handles storing/syncing history and running a HTTP server common - request/response API definitions, common utils, etc * Update dockerfile
Diffstat (limited to '')
-rw-r--r--atuin-common/Cargo.toml21
-rw-r--r--atuin-common/src/api.rs (renamed from src/api.rs)0
-rw-r--r--atuin-common/src/lib.rs5
-rw-r--r--atuin-common/src/utils.rs (renamed from src/utils.rs)5
4 files changed, 31 insertions, 0 deletions
diff --git a/atuin-common/Cargo.toml b/atuin-common/Cargo.toml
new file mode 100644
index 00000000..efe7da63
--- /dev/null
+++ b/atuin-common/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+name = "atuin-common"
+version = "0.1.0"
+authors = ["Ellie Huxtable <ellie@elliehuxtable.com>"]
+edition = "2018"
+license = "MIT"
+description = "common library for atuin"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+rust-crypto = "^0.2"
+sodiumoxide = "0.2.6"
+chrono = { version = "0.4", features = ["serde"] }
+eyre = "0.6"
+serde_derive = "1.0.125"
+serde = "1.0.125"
+serde_json = "1.0.64"
+rmp-serde = "0.15.4"
+warp = "0.3"
+uuid = { version = "0.8", features = ["v4"] }
diff --git a/src/api.rs b/atuin-common/src/api.rs
index 82ee6604..82ee6604 100644
--- a/src/api.rs
+++ b/atuin-common/src/api.rs
diff --git a/atuin-common/src/lib.rs b/atuin-common/src/lib.rs
new file mode 100644
index 00000000..0a01e10d
--- /dev/null
+++ b/atuin-common/src/lib.rs
@@ -0,0 +1,5 @@
+#[macro_use]
+extern crate serde_derive;
+
+pub mod api;
+pub mod utils;
diff --git a/src/utils.rs b/atuin-common/src/utils.rs
index b395b148..ac5738b3 100644
--- a/src/utils.rs
+++ b/atuin-common/src/utils.rs
@@ -1,6 +1,7 @@
use crypto::digest::Digest;
use crypto::sha2::Sha256;
use sodiumoxide::crypto::pwhash::argon2id13;
+use uuid::Uuid;
pub fn hash_secret(secret: &str) -> String {
sodiumoxide::init().unwrap();
@@ -22,3 +23,7 @@ pub fn hash_str(string: &str) -> String {
hasher.result_str()
}
+
+pub fn uuid_v4() -> String {
+ Uuid::new_v4().to_simple().to_string()
+}