diff --git a/Cargo.lock b/Cargo.lock index 3f42fa1..e2767d5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3276,7 +3276,7 @@ checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" [[package]] name = "nextgraph" -version = "0.1.0-preview.6" +version = "0.1.0-preview.7" dependencies = [ "async-once-cell", "async-std", @@ -3304,7 +3304,7 @@ dependencies = [ [[package]] name = "ng-app" -version = "0.1.0-preview.1" +version = "0.1.0-preview.7" dependencies = [ "async-std", "nextgraph", @@ -3342,7 +3342,7 @@ dependencies = [ [[package]] name = "ng-broker" -version = "0.1.0-preview.6" +version = "0.1.0-preview.7" dependencies = [ "async-std", "async-trait", @@ -3367,7 +3367,7 @@ dependencies = [ [[package]] name = "ng-client-ws" -version = "0.1.0-preview.1" +version = "0.1.0-preview.7" dependencies = [ "async-std", "async-trait", @@ -3386,7 +3386,7 @@ dependencies = [ [[package]] name = "ng-net" -version = "0.1.0-preview.1" +version = "0.1.0-preview.7" dependencies = [ "async-recursion", "async-std", @@ -3416,7 +3416,7 @@ dependencies = [ [[package]] name = "ng-oxigraph" -version = "0.4.0-alpha.7-ngpreview6" +version = "0.4.0-alpha.7-ngpreview7" dependencies = [ "base64-url", "codspeed-criterion-compat", @@ -3440,14 +3440,14 @@ dependencies = [ "serde", "sha1", "sha2 0.10.8", - "siphasher 1.0.1", + "siphasher 0.3.10", "thiserror", "zstd", ] [[package]] name = "ng-repo" -version = "0.1.0-preview.1" +version = "0.1.0-preview.7" dependencies = [ "base64-url", "blake3", @@ -3496,7 +3496,7 @@ dependencies = [ [[package]] name = "ng-sdk-js" -version = "0.1.0-preview.1" +version = "0.1.0-preview.7" dependencies = [ "async-std", "futures", @@ -3523,7 +3523,7 @@ dependencies = [ [[package]] name = "ng-storage-rocksdb" -version = "0.1.0-preview.6" +version = "0.1.0-preview.7" dependencies = [ "ng-repo", "ng-rocksdb", @@ -3551,7 +3551,7 @@ dependencies = [ [[package]] name = "ng-verifier" -version = "0.1.0-preview.6" +version = "0.1.0-preview.7" dependencies = [ "async-std", "async-trait", @@ -3575,7 +3575,7 @@ dependencies = [ [[package]] name = "ng-wallet" -version = "0.1.0-preview.6" +version = "0.1.0-preview.7" dependencies = [ "aes-gcm-siv", "argon2", @@ -3602,7 +3602,7 @@ dependencies = [ [[package]] name = "ngaccount" -version = "0.1.0-preview.1" +version = "0.1.0-preview.7" dependencies = [ "anyhow", "duration-str", @@ -3620,7 +3620,7 @@ dependencies = [ [[package]] name = "ngcli" -version = "0.1.0-preview.1" +version = "0.1.0-preview.7" dependencies = [ "async-std", "blake3", @@ -3639,7 +3639,7 @@ dependencies = [ [[package]] name = "ngd" -version = "0.1.0-preview.1" +version = "0.1.0-preview.7" dependencies = [ "addr", "async-std", @@ -3658,7 +3658,7 @@ dependencies = [ [[package]] name = "ngone" -version = "0.1.0-preview.1" +version = "0.1.0-preview.7" dependencies = [ "base64-url", "bytes", diff --git a/Cargo.toml b/Cargo.toml index aaca5cf..08eea1f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ members = [ default-members = [ "nextgraph", "ngcli", "ngd" ] [workspace.package] -version = "0.1.0-preview.1" +version = "0.1.0-preview.7" edition = "2021" rust-version = "1.74.0" license = "MIT/Apache-2.0" diff --git a/nextgraph/Cargo.toml b/nextgraph/Cargo.toml index 3fe4aec..1d3954f 100644 --- a/nextgraph/Cargo.toml +++ b/nextgraph/Cargo.toml @@ -2,7 +2,7 @@ name = "nextgraph" description = "NextGraph client library. Nextgraph is a decentralized, secure and local-first web 3.0 ecosystem based on Semantic Web and CRDTs" categories = ["asynchronous","text-editors","web-programming","development-tools","database-implementations"] -version = "0.1.0-preview.6" +version = "0.1.0-preview.7" edition.workspace = true license.workspace = true authors.workspace = true @@ -32,14 +32,14 @@ whoami = "1.5.1" qrcode = { version = "0.14.1", default-features = false, features = ["svg"] } svg2pdf = { version = "0.11.0", default-features = false } pdf-writer = "0.10.0" -ng-repo = { path = "../ng-repo", version = "0.1.0-preview.1" } -ng-net = { path = "../ng-net", version = "0.1.0-preview.1" } -ng-wallet = { path = "../ng-wallet", version = "0.1.0-preview.5" } -ng-client-ws = { path = "../ng-client-ws", version = "0.1.0-preview.1" } -ng-verifier = { path = "../ng-verifier", version = "0.1.0-preview.5" } +ng-repo = { path = "../ng-repo", version = "0.1.0-preview.7" } +ng-net = { path = "../ng-net", version = "0.1.0-preview.7" } +ng-wallet = { path = "../ng-wallet", version = "0.1.0-preview.7" } +ng-client-ws = { path = "../ng-client-ws", version = "0.1.0-preview.7" } +ng-verifier = { path = "../ng-verifier", version = "0.1.0-preview.7" } [target.'cfg(all(not(target_family = "wasm"),not(docsrs)))'.dependencies] -ng-storage-rocksdb = { path = "../ng-storage-rocksdb", version = "0.1.0-preview.6" } +ng-storage-rocksdb = { path = "../ng-storage-rocksdb", version = "0.1.0-preview.7" } [[example]] name = "in_memory" diff --git a/nextgraph/README.md b/nextgraph/README.md index 0512a6c..4b938de 100644 --- a/nextgraph/README.md +++ b/nextgraph/README.md @@ -43,7 +43,7 @@ A tokio-based version (as a feature) might be available in the future. ```toml [dependencies] -nextgraph = "0.1.0-preview.6" +nextgraph = "0.1.0-preview.7" async-std = "1.12.0" ``` @@ -51,16 +51,16 @@ async-std = "1.12.0" You can find some examples on how to use the library: -- [in_memory](https://git.nextgraph.org/NextGraph/nextgraph-rs/src/branch/master/nextgraph/examples) -- [persistent](https://git.nextgraph.org/NextGraph/nextgraph-rs/src/branch/master/nextgraph/examples) +- [in_memory](https://git.nextgraph.org/NextGraph/nextgraph-rs/src/branch/master/nextgraph/examples) +- [persistent](https://git.nextgraph.org/NextGraph/nextgraph-rs/src/branch/master/nextgraph/examples) ## License Licensed under either of -- Apache License, Version 2.0 ([LICENSE-APACHE2](LICENSE-APACHE2) or http://www.apache.org/licenses/LICENSE-2.0) -- MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT) - at your option. +- Apache License, Version 2.0 ([LICENSE-APACHE2](LICENSE-APACHE2) or http://www.apache.org/licenses/LICENSE-2.0) +- MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT) + at your option. `SPDX-License-Identifier: Apache-2.0 OR MIT` diff --git a/ng-app/package.json b/ng-app/package.json index 10f30f1..0b50a99 100644 --- a/ng-app/package.json +++ b/ng-app/package.json @@ -1,7 +1,7 @@ { "name": "ng-app", "private": true, - "version": "0.1.0", + "version": "0.1.0-preview.7", "type": "module", "scripts": { "dev": "shx cp index-native.html index.html && vite", @@ -68,7 +68,7 @@ "immutable-json-patch": "^6.0.1", "katex": "^0.16.11", "lodash.debounce": "4.0.8", - "ng-sdk-js": "workspace:^0.1.0-preview.1", + "ng-sdk-js": "workspace:^0.1.0-preview.7", "prism-themes": "^1.9.0", "prosemirror-model": "^1.7.1", "prosemirror-state": "^1.2.3", diff --git a/ng-broker/Cargo.toml b/ng-broker/Cargo.toml index 8682cbb..a885a35 100644 --- a/ng-broker/Cargo.toml +++ b/ng-broker/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ng-broker" -version = "0.1.0-preview.6" +version = "0.1.0-preview.7" description = "Broker library of NextGraph, a decentralized, secure and local-first web 3.0 ecosystem based on Semantic Web and CRDTs" edition.workspace = true license.workspace = true @@ -26,11 +26,11 @@ async-trait = "0.1.64" rust-embed= { version = "6.7.0", features=["include-exclude"] } ng-async-tungstenite = { version = "0.22.2", git = "https://git.nextgraph.org/NextGraph/async-tungstenite.git", branch = "nextgraph", features = ["async-std-runtime"] } blake3 = "1.3.1" -ng-repo = { path = "../ng-repo", version = "0.1.0-preview.1" } -ng-net = { path = "../ng-net", version = "0.1.0-preview.1" } -ng-client-ws = { path = "../ng-client-ws", version = "0.1.0-preview.1" } -ng-verifier = { path = "../ng-verifier", version = "0.1.0-preview.6" } -ng-storage-rocksdb = { path = "../ng-storage-rocksdb", version = "0.1.0-preview.6" } +ng-repo = { path = "../ng-repo", version = "0.1.0-preview.7" } +ng-net = { path = "../ng-net", version = "0.1.0-preview.7" } +ng-client-ws = { path = "../ng-client-ws", version = "0.1.0-preview.7" } +ng-verifier = { path = "../ng-verifier", version = "0.1.0-preview.7" } +ng-storage-rocksdb = { path = "../ng-storage-rocksdb", version = "0.1.0-preview.7" } [target.'cfg(target_arch = "wasm32")'.dependencies.getrandom] version = "0.2.7" diff --git a/ng-app/public/favicon.ico b/ng-broker/src/public/favicon.ico similarity index 100% rename from ng-app/public/favicon.ico rename to ng-broker/src/public/favicon.ico diff --git a/ng-broker/src/server_ws.rs b/ng-broker/src/server_ws.rs index 41af34f..782d1c7 100644 --- a/ng-broker/src/server_ws.rs +++ b/ng-broker/src/server_ws.rs @@ -197,7 +197,7 @@ fn prepare_urls_from_private_addrs(addrs: &Vec, port: u16) -> Vec", "Niko PLP "] license = "MIT OR Apache-2.0" readme = "README.md" @@ -46,7 +46,7 @@ quick-xml = ">=0.29, <0.32" memchr = "2.5" peg = "0.8" base64-url = "2.0.0" -ng-repo = { path = "../ng-repo", version = "0.1.0-preview.1" } +ng-repo = { path = "../ng-repo", version = "0.1.0-preview.7" } [target.'cfg(all(not(target_family = "wasm"),not(docsrs)))'.dependencies] libc = "0.2" diff --git a/ng-storage-rocksdb/Cargo.toml b/ng-storage-rocksdb/Cargo.toml index eb32b25..e34c35a 100644 --- a/ng-storage-rocksdb/Cargo.toml +++ b/ng-storage-rocksdb/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ng-storage-rocksdb" -version = "0.1.0-preview.6" +version = "0.1.0-preview.7" description = "Stores based on RocksDB for NextGraph" edition.workspace = true license.workspace = true @@ -14,7 +14,7 @@ build = "build.rs" [dependencies] serde_bare = "0.5.0" -ng-repo = { path = "../ng-repo", version = "0.1.0-preview.1" } +ng-repo = { path = "../ng-repo", version = "0.1.0-preview.7" } [target.'cfg(all(not(target_arch = "wasm32"),not(docsrs)))'.dependencies.ng-rocksdb] git = "https://git.nextgraph.org/NextGraph/rust-rocksdb.git" diff --git a/ng-verifier/Cargo.toml b/ng-verifier/Cargo.toml index fb2901e..d65b37b 100644 --- a/ng-verifier/Cargo.toml +++ b/ng-verifier/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ng-verifier" -version = "0.1.0-preview.6" +version = "0.1.0-preview.7" description = "Verifier library of NextGraph" edition.workspace = true license.workspace = true @@ -32,16 +32,16 @@ async-std = { version = "1.12.0", features = [ "attributes", "unstable" ] } automerge = "0.5.11" yrs = "0.19.2" sbbf-rs-safe = "0.3.2" -ng-repo = { path = "../ng-repo", version = "0.1.0-preview.1" } -ng-net = { path = "../ng-net", version = "0.1.0-preview.1" } -ng-oxigraph = { path = "../ng-oxigraph", version = "0.4.0-alpha.7-ngpreview6" } +ng-repo = { path = "../ng-repo", version = "0.1.0-preview.7" } +ng-net = { path = "../ng-net", version = "0.1.0-preview.7" } +ng-oxigraph = { path = "../ng-oxigraph", version = "0.4.0-alpha.7-ngpreview7" } [target.'cfg(target_family = "wasm")'.dependencies] -ng-oxigraph = { path = "../ng-oxigraph", version = "0.4.0-alpha.7-ngpreview6", features = ["js"] } +ng-oxigraph = { path = "../ng-oxigraph", version = "0.4.0-alpha.7-ngpreview7", features = ["js"] } [target.'cfg(all(not(target_family = "wasm"),not(docsrs)))'.dependencies] -ng-storage-rocksdb = { path = "../ng-storage-rocksdb", version = "0.1.0-preview.6" } +ng-storage-rocksdb = { path = "../ng-storage-rocksdb", version = "0.1.0-preview.7" } getrandom = "0.2.7" [dev-dependencies] -ng-repo = { path = "../ng-repo", version = "0.1.0-preview.1", features = ["testing"] } \ No newline at end of file +ng-repo = { path = "../ng-repo", version = "0.1.0-preview.7", features = ["testing"] } \ No newline at end of file diff --git a/ng-wallet/Cargo.toml b/ng-wallet/Cargo.toml index 706d747..6bc1786 100644 --- a/ng-wallet/Cargo.toml +++ b/ng-wallet/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ng-wallet" -version = "0.1.0-preview.6" +version = "0.1.0-preview.7" description = "Wallet library of NextGraph. keeps the secret keys of all identities of the user in a safe wallet. NextGraph is a decentralized, secure and local-first web 3.0 ecosystem based on Semantic Web and CRDTs" categories = ["authentication"] edition.workspace = true @@ -32,10 +32,10 @@ chacha20poly1305 = "0.10.1" #{version = "0.10.1", features = ["heapless","getrandom"] } image = "0.24.6" web-time = "0.2.0" -ng-repo = { path = "../ng-repo", version = "0.1.0-preview.1" } -ng-net = { path = "../ng-net", version = "0.1.0-preview.1" } -ng-verifier = { path = "../ng-verifier", version = "0.1.0-preview.6" } +ng-repo = { path = "../ng-repo", version = "0.1.0-preview.7" } +ng-net = { path = "../ng-net", version = "0.1.0-preview.7" } +ng-verifier = { path = "../ng-verifier", version = "0.1.0-preview.7" } [dev-dependencies] -ng-repo = { path = "../ng-repo", version = "0.1.0-preview.1", features = ["testing"] } -ng-verifier = { path = "../ng-verifier", version = "0.1.0-preview.6", features = ["testing"] } \ No newline at end of file +ng-repo = { path = "../ng-repo", version = "0.1.0-preview.7", features = ["testing"] } +ng-verifier = { path = "../ng-verifier", version = "0.1.0-preview.7", features = ["testing"] } \ No newline at end of file diff --git a/ngaccount/Cargo.toml b/ngaccount/Cargo.toml index e18f248..93a518f 100644 --- a/ngaccount/Cargo.toml +++ b/ngaccount/Cargo.toml @@ -23,6 +23,6 @@ log = "0.4" env_logger = "0.10" anyhow = "1.0.71" duration-str = "0.7.1" -ng-repo = { path = "../ng-repo", version = "0.1.0-preview.1", features = ["server_log_output"] } -ng-net = { path = "../ng-net", version = "0.1.0-preview.1" } -ng-client-ws = { path = "../ng-client-ws", version = "0.1.0-preview.1" } \ No newline at end of file +ng-repo = { path = "../ng-repo", version = "0.1.0-preview.7", features = ["server_log_output"] } +ng-net = { path = "../ng-net", version = "0.1.0-preview.7" } +ng-client-ws = { path = "../ng-client-ws", version = "0.1.0-preview.7" } \ No newline at end of file diff --git a/ngcli/Cargo.toml b/ngcli/Cargo.toml index 62dc2e3..5cdbc15 100644 --- a/ngcli/Cargo.toml +++ b/ngcli/Cargo.toml @@ -26,6 +26,6 @@ duration-str = "0.7.1" clap = { version = "4.3.5", features = ["env","string","cargo"] } log = "0.4" env_logger = "0.10" -ng-repo = { path = "../ng-repo", version = "0.1.0-preview.1", features = ["server_log_output"] } -ng-net = { path = "../ng-net", version = "0.1.0-preview.1" } -ng-client-ws = { path = "../ng-client-ws", version = "0.1.0-preview.1" } \ No newline at end of file +ng-repo = { path = "../ng-repo", version = "0.1.0-preview.7", features = ["server_log_output"] } +ng-net = { path = "../ng-net", version = "0.1.0-preview.7" } +ng-client-ws = { path = "../ng-client-ws", version = "0.1.0-preview.7" } \ No newline at end of file diff --git a/ngd/Cargo.toml b/ngd/Cargo.toml index defbcc4..5b08b37 100644 --- a/ngd/Cargo.toml +++ b/ngd/Cargo.toml @@ -27,9 +27,9 @@ lazy_static = "1.4.0" log = "0.4" env_logger = "0.10" clap = { version = "4.3.21", features = ["derive","env","string"] } -ng-repo = { path = "../ng-repo", version = "0.1.0-preview.1", features = ["server_log_output"] } -ng-net = { path = "../ng-net", version = "0.1.0-preview.1" } -ng-broker = { path = "../ng-broker", version = "0.1.0-preview.3" } +ng-repo = { path = "../ng-repo", version = "0.1.0-preview.7", features = ["server_log_output"] } +ng-net = { path = "../ng-net", version = "0.1.0-preview.7" } +ng-broker = { path = "../ng-broker", version = "0.1.0-preview.7" }