diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index da813ab..fa13805 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -23,11 +23,5 @@ "streetsidesoftware.code-spell-checker" ] } - }, - "features": { - "ghcr.io/guiyomh/features/just:0": { - "version": "latest" - }, - "ghcr.io/lee-orr/rusty-dev-containers/cargo-binstall:0": {} } } diff --git a/Cargo.lock b/Cargo.lock index 8890a37..2556cba 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -655,11 +655,10 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "config" -version = "0.13.4" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23738e11972c7643e4ec947840fc463b6a571afcd3e735bdfce7d03c7a784aca" +checksum = "7328b20597b53c2454f0b1919720c25c7339051c02b72b7e05409e00b14132be" dependencies = [ - "async-trait", "lazy_static", "nom", "pathdiff", @@ -1085,17 +1084,27 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "env_filter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +dependencies = [ + "log", + "regex", +] + [[package]] name = "env_logger" -version = "0.10.2" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" +checksum = "05e7cf40684ae96ade6232ed84582f40ce0a66efcd43a5117aef610534f8e0b8" dependencies = [ + "anstream", + "anstyle", + "env_filter", "humantime", - "is-terminal", "log", - "regex", - "termcolor", ] [[package]] @@ -1402,9 +1411,9 @@ dependencies = [ [[package]] name = "handlebars" -version = "4.5.0" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faa67bab9ff362228eb3d00bd024a4965d8231bbb7921167f0cfa66c6626b225" +checksum = "ab283476b99e66691dee3f1640fea91487a8d81f50fb5ecc75538f8f8879a1e4" dependencies = [ "log", "pest", @@ -1834,17 +1843,6 @@ dependencies = [ "serde", ] -[[package]] -name = "is-terminal" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" -dependencies = [ - "hermit-abi", - "rustix", - "windows-sys 0.52.0", -] - [[package]] name = "itertools" version = "0.11.0" @@ -2911,11 +2909,11 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "opendal" -version = "0.42.0" -source = "git+https://github.com/apache/incubator-opendal/?tag=v0.42.0-rc.3#9b423aef2d48afb17a48a464fe6e7e83f0a1ae35" +version = "0.44.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4af824652d4d2ffabf606d337a071677ae621b05622adf35df9562f69d9b4498" dependencies = [ "anyhow", - "async-compat", "async-trait", "backon", "base64", @@ -2923,13 +2921,12 @@ dependencies = [ "chrono", "flagset", "futures", + "getrandom", "http", "log", "md-5", "once_cell", - "parking_lot", "percent-encoding", - "pin-project", "quick-xml 0.30.0", "reqsign", "reqwest", @@ -4186,6 +4183,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_spanned" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +dependencies = [ + "serde", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -4633,15 +4639,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - [[package]] name = "text-block-macros" version = "0.1.1" @@ -4808,11 +4805,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.11" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +checksum = "c6a4b9e8023eb94392d3dca65d717c53abc5dad49c07cb65bb8fcd87115fa325" dependencies = [ "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", ] [[package]] @@ -4820,6 +4820,9 @@ name = "toml_datetime" version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] [[package]] name = "toml_edit" @@ -4828,6 +4831,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ "indexmap 2.2.2", + "serde", + "serde_spanned", "toml_datetime", "winnow", ] diff --git a/crates/manas_access_control/Cargo.toml b/crates/manas_access_control/Cargo.toml index 4499d11..0561562 100644 --- a/crates/manas_access_control/Cargo.toml +++ b/crates/manas_access_control/Cargo.toml @@ -13,8 +13,8 @@ dyn_problem = { version = "0.1.1", path = "../../fcrates/dyn_problem", features "alias-future", "ext-typed-record" ] } -futures = "0.3.28" -ghost = "0.1.13" +futures = "0.3.30" +ghost = "0.1.17" http_uri = { version = "1.0.1", path = "../../fcrates/http_uri", features = [ "invariants", "sophia" @@ -22,23 +22,23 @@ http_uri = { version = "1.0.1", path = "../../fcrates/http_uri", features = [ manas_authentication = { version = "0.1.0", path = "../manas_authentication", features = ["creds-context"]} http_typed_headers = { version = "0.1.0", path = "../../fcrates/http_typed_headers", default-features = false, features = ["wac-allow"] } manas_space = { version = "0.1.0", path = "../manas_space" } -async-recursion = "1.0.4" +async-recursion = "1.0.5" itertools = "0.11.0" paste = "1.0.14" rdf_utils = { version = "0.3.1", path = "../../fcrates/rdf_utils" } rdf_vocabularies = { version = "0.2.0", features = ["ns-acp", "ns-acl", "ns-foaf","ns-rdf"] } sophia_api = "0.8.0" -thiserror = "1.0.43" +thiserror = "1.0.56" tower = "0.4.13" -tracing = { version = "0.1.37", features = ["attributes"] } +tracing = { version = "0.1.40", features = ["attributes"] } unwrap-infallible = "0.1.5" -once_cell = "1.18.0" +once_cell = "1.19.0" vec1 = {version = "1.10.1", features = ["serde"]} # feature: layered-repo-impl manas_repo = { version = "0.1.0", path = "../manas_repo", optional = true } typed_record = { version = "0.1.1", path = "../../fcrates/typed_record", features = ["ext-anymap", "ext-http"]} -serde = { version = "1.0.185", features = ["derive"] } +serde = { version = "1.0.196", features = ["derive"] } [features] diff --git a/crates/manas_authentication/Cargo.toml b/crates/manas_authentication/Cargo.toml index 6e522e6..4c66b4f 100644 --- a/crates/manas_authentication/Cargo.toml +++ b/crates/manas_authentication/Cargo.toml @@ -13,26 +13,26 @@ http_uri = { version = "1.0.1", path = "../../fcrates/http_uri", features = [ "serde", ] } webid = { version = "0.1.0", path = "../../fcrates/webid", features = ["serde"] } -http = { version = "0.2.9" } -serde = { version = "1.0.169", features = ["derive"] } +http = { version = "0.2.11" } +serde = { version = "1.0.196", features = ["derive"] } # feature cr-framework -thiserror = { version = "1.0.43", optional = true } -tracing = { version = "0.1.37", optional = true } +thiserror = { version = "1.0.56", optional = true } +tracing = { version = "0.1.40", optional = true } mime = { version = "0.3.17", optional = true } http_typed_headers = { version = "0.1.0", path = "../../fcrates/http_typed_headers", default-features = false, features = ["www-authenticate"], optional = true} manas_http = { version = "0.1.1", path = "../manas_http", features = [ "service", ], optional = true } dyn_problem = { version = "0.1.1", path = "../../fcrates/dyn_problem", optional = true } -either = { version = "1.8.1", optional = true } +either = { version = "1.9.0", optional = true } itertools = { version = "0.11.0", optional = true } -headers = { version = "0.3.8", optional = true } -futures = { version = "0.3.28", optional = true } +headers = { version = "0.3.9", optional = true } +futures = { version = "0.3.30", optional = true } tower = { version = "0.4.13", optional = true } # feature: solid-oidc -moka = { version = "0.12.0", optional = true, default-features = false, features = [ +moka = { version = "0.12.5", optional = true, default-features = false, features = [ "future", ] } rdf_vocabularies = { version = "0.2.0", features = [ @@ -41,16 +41,16 @@ rdf_vocabularies = { version = "0.2.0", features = [ ], optional = true } sophia_api = { version = "0.8.0", optional = true } unwrap-infallible = "0.1.5" -reqwest = { version = "0.11.18", features = ["json"], optional = true, default-features = false} +reqwest = { version = "0.11.24", features = ["json"], optional = true, default-features = false} picky = { version = "7.0.0-rc.8", optional = true, default-features = false } dpop = { version = "0.1.1", path = "../../fcrates/dpop", optional = true, features = [ "http-header", ] } gdp_rs = { version = "0.1.1", path = "../../fcrates/gdp_rs", features = ["serde"] } -serde_json = { version = "1.0.100", optional = true } +serde_json = { version = "1.0.113", optional = true } solid_oidc_types = { version = "0.1.0", path = "../../fcrates/solid_oidc_types", optional = true } -once_cell = { version = "1.18.0", optional = true } -unicase = "2.6.0" +once_cell = { version = "1.19.0", optional = true } +unicase = "2.7.0" # feature: creds-context acp = { version = "0.1.0", path = "../../fcrates/acp", optional = true } diff --git a/crates/manas_http/Cargo.toml b/crates/manas_http/Cargo.toml index b283bbc..f605549 100644 --- a/crates/manas_http/Cargo.toml +++ b/crates/manas_http/Cargo.toml @@ -11,54 +11,54 @@ http_uri = { version = "1.0.1", path = "../../fcrates/http_uri" } frunk_core = "0.4.2" iri-string = { version = "0.7.0", features = ["serde"] } gdp_rs = { version = "0.1.1", path = "../../fcrates/gdp_rs" } -once_cell = "1.18.0" -percent-encoding = "2.3.0" -regex = "1.10.2" +once_cell = "1.19.0" +percent-encoding = "2.3.1" +regex = "1.10.3" uriparse = "0.6.4" -thiserror = "1.0.43" -tracing = { version = "0.1.37", features = ["attributes"] } +thiserror = "1.0.56" +tracing = { version = "0.1.40", features = ["attributes"] } ecow = "0.2.0" # feature: typed-headers http_typed_headers = { version = "0.1.0", path = "../../fcrates/http_typed_headers", optional = true} -headers = { version = "0.3.8", optional = true } -http = { version = "0.2.9", optional = true } -smallvec = { version = "1.11.0", optional = true } -chrono = { version = "0.4.26", optional = true, default-features = false, features = [ +headers = { version = "0.3.9", optional = true } +http = { version = "0.2.11", optional = true } +smallvec = { version = "1.13.1", optional = true } +chrono = { version = "0.4.33", optional = true, default-features = false, features = [ "std", ] } async-convert = "1.0.0" # feature: serde -serde = { version = "1.0.169", features = ["derive"], optional = true } +serde = { version = "1.0.196", features = ["derive"], optional = true } # feature: representation typed_record = { version = "0.1.1", path = "../../fcrates/typed_record", features = [ "ext-anymap", ], optional = true} -hyper = { version = "0.14.27", features = ["stream"], optional = true } +hyper = { version = "0.14.28", features = ["stream"], optional = true } mime = { version = "0.3.17", optional = true } -either = { version = "1.8.1", optional = true } +either = { version = "1.9.0", optional = true } # feature: impl-representation -bytes = { version = "1.4.0", optional = true } -futures = { version = "0.3.28", optional = true } -anyhow = { version = "1.0.71", optional = true } +bytes = { version = "1.5.0", optional = true } +futures = { version = "0.3.30", optional = true } +anyhow = { version = "1.0.79", optional = true } rdf_utils = { version = "0.3.1", path = "../../fcrates/rdf_utils", optional = true, features = ["compat-ecow"]} dyn_problem = { version = "0.1.1", path = "../../fcrates/dyn_problem", optional = true } async-stream = { version = "0.3.5", optional = true } rdf_dynsyn = { version = "0.4.0", path = "../../fcrates/rdf_dynsyn", optional = true, features = [ "async", ] } -tokio = { version = "1.29.1", features = ["rt", "io-util"], optional = true } -tokio-util = { version = "0.7.8", optional = true, features = ["io-util"] } +tokio = { version = "1.36.0", features = ["rt", "io-util"], optional = true } +tokio-util = { version = "0.7.10", optional = true, features = ["io-util"] } sophia_api = { version = "0.8.0", optional = true } async-once-cell = { version = "0.5.3", optional = true } capped_stream = { version = "0.1.1", path = "../../fcrates/capped_stream", optional = true } # feature: service tower = { version = "0.4.13", optional = true, features = ["util"] } -dyn-clone = { version = "1.0.14", optional = true } +dyn-clone = { version = "1.0.16", optional = true } http-api-problem = { version = "0.57.0", features = [ "api-error", "hyper", @@ -69,7 +69,7 @@ if_chain = { version = "1.0.2", optional = true } # feature: test-utils claims = { version = "0.7.1", optional = true } -rstest = { version = "0.18.1", optional = true } +rstest = { version = "0.18.2", optional = true } [features] serde = ["dep:serde", "iri-string/serde"] @@ -83,7 +83,7 @@ test-utils = ["dep:rstest", "dep:claims"] [dev-dependencies] claims = "0.7.1" -rstest = "0.18.1" +rstest = "0.18.2" [package.metadata.docs.rs] all-features = true diff --git a/crates/manas_podverse/Cargo.toml b/crates/manas_podverse/Cargo.toml index a4aab88..b7e876b 100644 --- a/crates/manas_podverse/Cargo.toml +++ b/crates/manas_podverse/Cargo.toml @@ -8,10 +8,10 @@ license = "MIT OR Apache-2.0" [dependencies] dyn_problem = { version = "0.1.1", path = "../../fcrates/dyn_problem", features = ["alias-future"] } -futures = "0.3.28" -ghost = "0.1.13" +futures = "0.3.30" +ghost = "0.1.17" http-api-problem = { version = "0.57.0", features = ["api-error", "hyper"] } -hyper = "0.14.27" +hyper = "0.14.28" manas_http = { version = "0.1.1", path = "../manas_http", features = [ "service", ] } @@ -23,14 +23,14 @@ rdf_dynsyn = { version = "0.4.0", path = "../../fcrates/rdf_dynsyn", features = ] } rdf_utils = { version = "0.3.1", path = "../../fcrates/rdf_utils" } rdf_vocabularies = { version = "0.2.0", features = ["ns-rdf", "ns-pim"] } -regex = "1.10.2" +regex = "1.10.3" sophia_api = "0.8.0" tower = "0.4.13" -tracing = { version = "0.1.37", features = ["attributes"] } +tracing = { version = "0.1.40", features = ["attributes"] } # feature: impl-podset-templated dashmap = { version = "5.5.3", optional = true } -moka = { version = "0.12.0", features = ["future"], optional = true } +moka = { version = "0.12.5", features = ["future"], optional = true } [features] diff --git a/crates/manas_repo/Cargo.toml b/crates/manas_repo/Cargo.toml index 7fda26a..2bf5387 100644 --- a/crates/manas_repo/Cargo.toml +++ b/crates/manas_repo/Cargo.toml @@ -15,32 +15,32 @@ manas_http = { version = "0.1.1", path = "../manas_http", features = [ ] } manas_space = { version = "0.1.0", path = "../manas_space" } dyn_problem = { version = "0.1.1", path = "../../fcrates/dyn_problem", features = ["alias-future"]} -futures = "0.3.28" -hyper = "0.14.27" +futures = "0.3.30" +hyper = "0.14.28" tower = {version = "0.4.13", features=["util"]} -dyn-clone = "1.0.14" +dyn-clone = "1.0.16" if_chain = "1.0.2" -smallvec = "1.11.0" +smallvec = "1.13.1" gdp_rs = { version = "0.1.1", path = "../../fcrates/gdp_rs" } vec1 = "1.10.1" iri-string = "0.7.0" -thiserror = "1.0.43" -once_cell = "1.18.0" -headers = "0.3.8" -http = "0.2.9" +thiserror = "1.0.56" +once_cell = "1.19.0" +headers = "0.3.9" +http = "0.2.11" mime = "0.3.17" rdf_dynsyn = { version = "0.4.0", path = "../../fcrates/rdf_dynsyn", features = [ "async", ] } -tracing = { version = "0.1.37", features = ["attributes"] } -bytes = "1.4.0" -async-compat = "0.2.1" -either = "1.8.1" +tracing = { version = "0.1.40", features = ["attributes"] } +bytes = "1.5.0" +async-compat = "0.2.3" +either = "1.9.0" rdf_utils = { version = "0.3.1", path = "../../fcrates/rdf_utils"} -anyhow = "1.0.71" -regex = "1.10.2" -tokio = { version = "1.29.1", features = ["rt"] } -tokio-util = { version = "0.7.8", features = ["io", "io-util"] } +anyhow = "1.0.79" +regex = "1.10.3" +tokio = { version = "1.36.0", features = ["rt"] } +tokio-util = { version = "0.7.10", features = ["io", "io-util"] } typed_record = { version = "0.1.1", path = "../../fcrates/typed_record", features = [ "ext-anymap", "ext-http", @@ -52,14 +52,14 @@ manas_authentication = { version = "0.1.0", path = "../manas_authentication" } # feature: test-utils claims = { version = "0.7.1", optional = true } -rstest = { version = "0.18.1", optional = true } +rstest = { version = "0.18.2", optional = true } [features] test-utils = ["dep:rstest", "dep:claims", "manas_space/test-utils"] [dev-dependencies] claims = "0.7.1" -rstest = "0.18.1" +rstest = "0.18.2" [package.metadata.docs.rs] all-features = true diff --git a/crates/manas_repo_layers/Cargo.toml b/crates/manas_repo_layers/Cargo.toml index 0410da9..0d0b08a 100644 --- a/crates/manas_repo_layers/Cargo.toml +++ b/crates/manas_repo_layers/Cargo.toml @@ -16,18 +16,18 @@ manas_http = { version = "0.1.1", path = "../manas_http", features = [ ] } manas_space = { version = "0.1.0", path = "../manas_space" } dyn_problem = { version = "0.1.1", path = "../../fcrates/dyn_problem", features = ["alias-future"]} -futures = "0.3.28" -hyper = "0.14.27" +futures = "0.3.30" +hyper = "0.14.28" tower = {version = "0.4.13", features=["util"]} -thiserror = "1.0.43" -once_cell = "1.18.0" -headers = "0.3.8" -http = "0.2.9" +thiserror = "1.0.56" +once_cell = "1.19.0" +headers = "0.3.9" +http = "0.2.11" mime = "0.3.17" rdf_dynsyn = { version = "0.4.0", path = "../../fcrates/rdf_dynsyn", features = [ "async", ] } -tracing = { version = "0.1.37", features = ["attributes"] } +tracing = { version = "0.1.40", features = ["attributes"] } async-convert = "1.0.0" capped_stream = { version = "0.1.1", path = "../../fcrates/capped_stream" } frunk_core = "0.4.2" @@ -37,9 +37,9 @@ typed_record = { version = "0.1.1", path = "../../fcrates/typed_record", feature rdf_utils = { version = "0.3.1", path = "../../fcrates/rdf_utils"} manas_repo = { version = "0.1.0", path = "../manas_repo" } if_chain = "1.0.2" -tokio = { version = "1.29.1", features = ["rt"] } +tokio = { version = "1.36.0", features = ["rt"] } sophia_api = "0.8.0" -anyhow = "1.0.71" +anyhow = "1.0.79" rdf_vocabularies = { version = "0.2.0", features = [ "ns-rdf", diff --git a/crates/manas_repo_opendal/Cargo.toml b/crates/manas_repo_opendal/Cargo.toml index b934dfe..0d9a813 100644 --- a/crates/manas_repo_opendal/Cargo.toml +++ b/crates/manas_repo_opendal/Cargo.toml @@ -8,18 +8,18 @@ license = "MIT OR Apache-2.0" [dependencies] manas_repo = { version = "0.1.0", path = "../manas_repo" } -futures = "0.3.28" +futures = "0.3.30" manas_http = { version = "0.1.1", path = "../manas_http", features = [ "representation", ] } -once_cell = "1.18.0" +once_cell = "1.19.0" rdf_dynsyn = { version = "0.4.0", path = "../../fcrates/rdf_dynsyn", features = [ "async", ] } -tokio = { version = "1.29.1", features = ["rt", "macros", "io-util"] } +tokio = { version = "1.36.0", features = ["rt", "macros", "io-util"] } tower = { version = "0.4.13", features = ["util"] } -tracing = { version = "0.1.37", features = ["attributes"] } -uuid = { version = "1.2.2", features = ["v4"] } +tracing = { version = "0.1.40", features = ["attributes"] } +uuid = { version = "1.7.0", features = ["v4"] } dyn_problem = { version = "0.1.1", path = "../../fcrates/dyn_problem", features = [ "ext-typed-record", ] } @@ -31,23 +31,23 @@ rand = "0.8.5" rand_seeder = "0.2.3" if_chain = "1.0.2" bimap = "0.6.3" -thiserror = "1.0.43" -flagset = "0.4.3" +thiserror = "1.0.56" +flagset = "0.4.4" # Opendal is pinned, as it breaks frequently. -opendal = { version = "^0.42.0", git = "https://github.com/apache/incubator-opendal/", tag = "v0.42.0-rc.3", features = ["rustls"]} +opendal = { version = "^0.44.2", features = ["rustls"]} gdp_rs = { version = "0.1.1", path = "../../fcrates/gdp_rs" } -regex = "1.10.2" -percent-encoding = "2.3.0" +regex = "1.10.3" +percent-encoding = "2.3.1" async-stream = "0.3.5" -smallvec = "1.10.0" -serde = { version = "1.0.169", features = ["derive"] } -serde_with = { version = "3.0.0", features = ["time_0_3"] } -headers = "0.3.8" -serde_json = "1.0.100" -anyhow = "1.0.71" -either = "1.8.1" -bytes = "1.4.0" -async-trait = "0.1.71" +smallvec = "1.13.1" +serde = { version = "1.0.196", features = ["derive"] } +serde_with = { version = "3.6.0", features = ["time_0_3"] } +headers = "0.3.9" +serde_json = "1.0.113" +anyhow = "1.0.79" +either = "1.9.0" +bytes = "1.5.0" +async-trait = "0.1.77" rdf_vocabularies = { version = "0.2.0", features = [ "ns-solid", "ns-ldp", @@ -63,16 +63,16 @@ rdf_vocabularies = { version = "0.2.0", features = [ "ns-dcterms", ] } sophia_api = "0.8.0" -dashmap = "5.4.0" +dashmap = "5.5.3" typed_record = { version = "0.1.1", path = "../../fcrates/typed_record", features = [ "ext-anymap", ] } async-once-cell = "0.5.3" -http-body = "0.4.5" -hyper = { version = "0.14.27", features = ["stream"] } +http-body = "0.4.6" +hyper = { version = "0.14.28", features = ["stream"] } manas_space = { version = "0.1.0", path = "../manas_space"} vec1 = "1.10.1" -chrono = { version = "0.4.26", default-features = false, features = ["serde"] } +chrono = { version = "0.4.33", default-features = false, features = ["serde"] } mime = "0.3.17" itertools = "0.11.0" sophia_turtle = "0.8.0" @@ -80,13 +80,13 @@ manas_semslot = { version = "0.1.0", path = "../manas_semslot"} mime_guess = { version = "2.0.4"} # feature; service-embedded -rust-embed = { version = "8.0.0", optional = true } +rust-embed = { version = "8.2.0", optional = true } # feature: test-utils claims = { version = "0.7.1", optional = true } -rstest = { version = "0.18.1", optional = true } +rstest = { version = "0.18.2", optional = true } build-fs-tree = { version = "0.6.0", optional = false } -async-recursion = { version = "1.0.4", optional = false } +async-recursion = { version = "1.0.5", optional = false } hex = "0.4.3" webid = { version = "0.1.0", path = "../../fcrates/webid", features = ["sophia"] } @@ -110,7 +110,7 @@ access-prp = ["dep:manas_access_control", "dep:acp"] [dev-dependencies] claims = "0.7.1" -rstest = "0.18.1" +rstest = "0.18.2" tracing-test = "0.2.4" manas_semslot = { version = "0.1.0", path = "../manas_semslot", features = ["test-utils"] } diff --git a/crates/manas_repo_opendal/src/object_store/backend/impl_/common/stat_fix_layer.rs b/crates/manas_repo_opendal/src/object_store/backend/impl_/common/stat_fix_layer.rs index 2dccd8f..c788857 100644 --- a/crates/manas_repo_opendal/src/object_store/backend/impl_/common/stat_fix_layer.rs +++ b/crates/manas_repo_opendal/src/object_store/backend/impl_/common/stat_fix_layer.rs @@ -34,8 +34,8 @@ impl LayeredAccessor for StatFixAccessor { type BlockingReader = A::BlockingReader; type Writer = A::Writer; type BlockingWriter = A::BlockingWriter; - type Pager = A::Pager; - type BlockingPager = A::BlockingPager; + type Lister = A::Lister; + type BlockingLister = A::BlockingLister; fn inner(&self) -> &Self::Inner { &self.inner @@ -57,11 +57,11 @@ impl LayeredAccessor for StatFixAccessor { self.inner.blocking_write(path, args) } - async fn list(&self, path: &str, args: OpList) -> Result<(RpList, Self::Pager)> { + async fn list(&self, path: &str, args: OpList) -> Result<(RpList, Self::Lister)> { self.inner.list(path, args).await } - fn blocking_list(&self, path: &str, args: OpList) -> Result<(RpList, Self::BlockingPager)> { + fn blocking_list(&self, path: &str, args: OpList) -> Result<(RpList, Self::BlockingLister)> { self.inner.blocking_list(path, args) } diff --git a/crates/manas_repo_opendal/src/object_store/backend/impl_/embedded/mod.rs b/crates/manas_repo_opendal/src/object_store/backend/impl_/embedded/mod.rs index 189059c..7abc4af 100644 --- a/crates/manas_repo_opendal/src/object_store/backend/impl_/embedded/mod.rs +++ b/crates/manas_repo_opendal/src/object_store/backend/impl_/embedded/mod.rs @@ -37,7 +37,7 @@ impl ODRObjectStoreBackend for EmbeddedBackend { } } -impl TryFrom> for EmbeddedBackend { +impl TryFrom> for EmbeddedBackend { type Error = opendal::Error; #[inline] @@ -48,7 +48,7 @@ impl TryFrom> for EmbeddedBackend } } -impl BuildableODRObjectStoreBackend> +impl BuildableODRObjectStoreBackend> for EmbeddedBackend { } diff --git a/crates/manas_repo_opendal/src/object_store/backend/impl_/embedded/service.rs b/crates/manas_repo_opendal/src/object_store/backend/impl_/embedded/service.rs index af839a2..16d547c 100644 --- a/crates/manas_repo_opendal/src/object_store/backend/impl_/embedded/service.rs +++ b/crates/manas_repo_opendal/src/object_store/backend/impl_/embedded/service.rs @@ -5,7 +5,12 @@ // NOTE: rust-embed returns root-less paths of assets. // It doesn't include any dir paths in assets. -use std::{borrow::Cow, collections::HashMap, marker::PhantomData}; +use std::{ + borrow::Cow, + collections::HashMap, + marker::PhantomData, + task::{Context, Poll}, +}; use async_trait::async_trait; use bytes::Bytes; @@ -14,7 +19,7 @@ use either::Either; use manas_http::header::common::media_type::MediaType; use opendal::{ raw::{ - oio::{self, Entry, Page}, + oio::{self, Entry, List}, Accessor, AccessorInfo, BytesRange, OpList, OpRead, OpStat, RpList, RpRead, RpStat, }, Builder, Capability, EntryMode, Error, ErrorKind, Metadata, Result, Scheme, @@ -56,7 +61,7 @@ impl Embedded { } } -impl Builder for Embedded { +impl Builder for Embedded { const SCHEME: Scheme = Scheme::Custom("Embedded"); type Accessor = EmbeddedAccessor; @@ -152,13 +157,13 @@ impl EmbeddedAccessor { } #[async_trait] -impl Accessor for EmbeddedAccessor { +impl Accessor for EmbeddedAccessor { type Reader = oio::Cursor; type BlockingReader = (); type Writer = (); type BlockingWriter = (); - type Pager = NsPage; - type BlockingPager = (); + type Lister = NsList; + type BlockingLister = (); fn info(&self) -> AccessorInfo { let mut info = AccessorInfo::default(); @@ -169,7 +174,6 @@ impl Accessor for EmbeddedAccessor { read: true, read_with_range: true, list: true, - list_with_delimiter_slash: true, ..Default::default() }) @@ -206,11 +210,11 @@ impl Accessor for EmbeddedAccessor { )) } - async fn list(&self, path: &str, args: OpList) -> Result<(RpList, Self::Pager)> { - if args.delimiter() != "/" { + async fn list(&self, path: &str, args: OpList) -> Result<(RpList, Self::Lister)> { + if args.recursive() { return Err(Error::new( ErrorKind::Unsupported, - "Non slash delimiter is not yet supported.", + "Recursive listing is not yet supported.", )); } @@ -220,53 +224,47 @@ impl Accessor for EmbeddedAccessor { Ok(( Default::default(), - NsPage:: { + NsList:: { ns_path, - is_exhausted: false, + iterator: Assets::iter().collect::>().into_iter(), _phantom: PhantomData, }, )) } } -/// Pager for [`Embedded`] service. -pub struct NsPage { +/// Lister for [`Embedded`] service. +pub struct NsList { ns_path: NsPath<'static>, - is_exhausted: bool, + iterator: std::vec::IntoIter>, _phantom: PhantomData Assets>, } -#[async_trait] -impl Page for NsPage { - async fn next(&mut self) -> Result>> { - Ok((!self.is_exhausted).then(|| { - Assets::iter() - .filter_map(|path| { - let is_child = path - .rsplit_once('/') - .map(|(prefix, name)| { - prefix == self.ns_path.trim_end_matches('/') && !name.is_empty() - }) - .unwrap_or_default(); - - if !is_child { - return None; - } - - let path = ClassifiedPath::new(NormalPath::try_new(path.as_ref()).ok()?); - - let metadata = match &path.0 { - Either::Left(ns_path) => EmbeddedAccessor::::ns_info(ns_path), - Either::Right(file_path) => { - EmbeddedAccessor::::file_info(file_path) - .map(|(metadata, _)| metadata) - } - }?; - - Some(Entry::new(path.as_str(), metadata)) +impl List for NsList { + fn poll_next(&mut self, _cx: &mut Context<'_>) -> Poll>> { + Poll::Ready(Ok(self.iterator.find_map(|path| { + let is_child = path + .rsplit_once('/') + .map(|(prefix, name)| { + prefix == self.ns_path.trim_end_matches('/') && !name.is_empty() }) - .collect() - })) + .unwrap_or_default(); + + if !is_child { + return None; + } + + let path = ClassifiedPath::new(NormalPath::try_new(path.as_ref()).ok()?); + + let metadata = match &path.0 { + Either::Left(ns_path) => EmbeddedAccessor::::ns_info(ns_path), + Either::Right(file_path) => { + EmbeddedAccessor::::file_info(file_path).map(|(metadata, _)| metadata) + } + }?; + + Some(Entry::new(path.as_str(), metadata)) + }))) } } diff --git a/crates/manas_repo_opendal/src/object_store/backend/impl_/gcs.rs b/crates/manas_repo_opendal/src/object_store/backend/impl_/gcs.rs index 1d75b80..62f5368 100644 --- a/crates/manas_repo_opendal/src/object_store/backend/impl_/gcs.rs +++ b/crates/manas_repo_opendal/src/object_store/backend/impl_/gcs.rs @@ -10,7 +10,7 @@ use crate::object_store::backend::{ BuildableODRObjectStoreBackend, ODRObjectStoreBackend, }; -use super::common::stat_fix_layer::StatFixLayer; +// use super::common::stat_fix_layer::StatFixLayer; /// An implementation of [`ODRObjectStoreBackend`] /// with gcs backend. @@ -41,7 +41,9 @@ impl TryFrom for GcsBackend { #[inline] fn try_from(builder: Gcs) -> Result { Ok(Self { - operator: Operator::new(builder)?.layer(StatFixLayer).finish(), + operator: Operator::new(builder)? + // .layer(StatFixLayer) + .finish(), }) } } diff --git a/crates/manas_repo_opendal/src/object_store/backend/impl_/s3.rs b/crates/manas_repo_opendal/src/object_store/backend/impl_/s3.rs index 3e24d8d..9079433 100644 --- a/crates/manas_repo_opendal/src/object_store/backend/impl_/s3.rs +++ b/crates/manas_repo_opendal/src/object_store/backend/impl_/s3.rs @@ -10,7 +10,7 @@ use crate::object_store::backend::{ BuildableODRObjectStoreBackend, ODRObjectStoreBackend, }; -use super::common::stat_fix_layer::StatFixLayer; +// use super::common::stat_fix_layer::StatFixLayer; /// An implementation of [`ODRObjectStoreBackend`] /// with s3 backend. @@ -41,7 +41,9 @@ impl TryFrom for S3Backend { #[inline] fn try_from(builder: S3) -> Result { Ok(Self { - operator: Operator::new(builder)?.layer(StatFixLayer).finish(), + operator: Operator::new(builder)? + // .layer(StatFixLayer) + .finish(), }) } } diff --git a/crates/manas_semslot/Cargo.toml b/crates/manas_semslot/Cargo.toml index c35c775..223c4db 100644 --- a/crates/manas_semslot/Cargo.toml +++ b/crates/manas_semslot/Cargo.toml @@ -11,18 +11,18 @@ bimap = "0.6.3" if_chain = "1.0.2" manas_http = { version = "0.1.1", path = "../manas_http" } manas_space = { version = "0.1.0", path = "../manas_space" } -once_cell = "1.18.0" -smallvec = "1.11.0" -thiserror = "1.0.47" +once_cell = "1.19.0" +smallvec = "1.13.1" +thiserror = "1.0.56" # feature: test-utils claims = { version = "0.7.1", optional = true } -rstest = { version = "0.18.1", optional = true } +rstest = { version = "0.18.2", optional = true } [dev-dependencies] claims = "0.7.1" -rstest = "0.18.1" +rstest = "0.18.2" manas_http = { version = "0.1.1", path = "../manas_http", features = [ "test-utils", ] } diff --git a/crates/manas_server/Cargo.toml b/crates/manas_server/Cargo.toml index 3d1e263..58ab67e 100644 --- a/crates/manas_server/Cargo.toml +++ b/crates/manas_server/Cargo.toml @@ -7,7 +7,7 @@ repository = "https://github.com/manomayam/manas" license = "MIT OR Apache-2.0" [dependencies] -http = "0.2.9" +http = "0.2.11" manas_podverse = { version = "0.1.0", path = "../manas_podverse" } manas_repo = { version = "0.1.0", path = "../manas_repo" } manas_repo_opendal = { version = "0.1.0", path = "../manas_repo_opendal", features = ["access-prp", "backend-embedded"]} @@ -15,23 +15,23 @@ manas_storage = { version = "0.1.0", path = "../manas_storage" } name_locker = { version = "0.1.1", path = "../../fcrates/name_locker", features = [ "inmem", ] } -tracing = { version = "0.1.37", features = ["attributes"] } -tracing-subscriber = { version = "0.3.17", features = ["env-filter", "fmt", "ansi"] } -tracing-log = "0.1.3" +tracing = { version = "0.1.40", features = ["attributes"] } +tracing-subscriber = { version = "0.3.18", features = ["env-filter", "fmt", "ansi"] } +tracing-log = "0.1.4" manas_http = { version = "0.1.1", path = "../manas_http" } -flagset = "0.4.3" -hyper = { version = "0.14.27", features = ["server", "stream"] } -tower-http = { version = "0.4.1", features = ["cors", "catch-panic"] } +flagset = "0.4.4" +hyper = { version = "0.14.28", features = ["server", "stream"] } +tower-http = { version = "0.4.4", features = ["cors", "catch-panic"] } manas_space = { version = "0.1.0", path = "../manas_space" } -once_cell = "1.18.0" -serde = { version = "1.0.171", features = ["derive"] } -bytes = { version = "1.4.0" } +once_cell = "1.19.0" +serde = { version = "1.0.196", features = ["derive"] } +bytes = { version = "1.5.0" } mime = { version = "0.3.17" } tower = { version = "0.4.13", features = ["make", "util"] } webid = { version = "0.1.0", path = "../../fcrates/webid" } -rust-embed = { version = "8.0.0" } +rust-embed = { version = "8.2.0" } # Opendal is pinned, as it breaks frequently. -opendal = {version = "^0.42.0", git = "https://github.com/apache/incubator-opendal/", tag = "v0.42.0-rc.3", features = ["rustls"]} +opendal = {version = "^0.44.2", features = ["rustls"]} typed_record = { version = "0.1.1", path = "../../fcrates/typed_record", features = [ "ext-http", ] } @@ -42,21 +42,21 @@ manas_access_control = { version = "0.1.0", path = "../manas_access_control", fe rdf_utils = { version = "0.3.1", path = "../../fcrates/rdf_utils" } manas_semslot = { version = "0.1.0", path = "../manas_semslot" } upon = { version = "0.7.1", default-features = false, features = ["serde"] } -futures = "0.3.28" +futures = "0.3.30" axum-server = { version = "0.5.1", features = ["tls-rustls"] } dyn_problem = { version = "0.1.1", path = "../../fcrates/dyn_problem", features = ["alias-future"] } -anyhow = "1.0.75" -clap = { version = "4.3.11", features = [ +anyhow = "1.0.79" +clap = { version = "4.4.18", features = [ "derive", "string" ] } -config = { version = "0.13.3", default-features = false, features = ["toml"] } -tokio = { version = "1.32.0", features = ["fs"] } +config = { version = "0.14.0", default-features = false, features = ["toml"] } +tokio = { version = "1.36.0", features = ["fs"] } dpop = { version = "0.1.1", path = "../../fcrates/dpop", features = ["unsafe-optional-ath-claim"] } paste = "1.0.14" manas_authentication = { version = "0.1.0", path = "../manas_authentication" } manas_repo_layers = { version = "0.1.0", path = "../manas_repo_layers", features = ["dconneging", "patching", "validating"] } frunk_core = "0.4.2" -serde_with = "3.4.0" +serde_with = "3.6.0" http-cache-reqwest = { version = "0.12.0", default-features = false, features = ["manager-moka"] } rdf_dynsyn = { version = "0.4.0", path = "../../fcrates/rdf_dynsyn", features = ["jsonld-http-loader"] } sophia_turtle = "0.8.0" diff --git a/crates/manas_server/recipes/single_fs_wac/Cargo.toml b/crates/manas_server/recipes/single_fs_wac/Cargo.toml index 6e5a4f5..7fe0e01 100644 --- a/crates/manas_server/recipes/single_fs_wac/Cargo.toml +++ b/crates/manas_server/recipes/single_fs_wac/Cargo.toml @@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0" [dependencies] manas_server = { version = "0.1.0", path = "../..", features = ["backend-fs", "pdp-wac"] } -tokio = { version = "1.32.0", features = ["rt", "rt-multi-thread"] } +tokio = { version = "1.36.0", features = ["rt", "rt-multi-thread"] } [package.metadata.docs.rs] diff --git a/crates/manas_server/recipes/single_s3_wac/Cargo.toml b/crates/manas_server/recipes/single_s3_wac/Cargo.toml index 9faddb2..8065f5a 100644 --- a/crates/manas_server/recipes/single_s3_wac/Cargo.toml +++ b/crates/manas_server/recipes/single_s3_wac/Cargo.toml @@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0" [dependencies] manas_server = { version = "0.1.0", path = "../..", features = ["backend-s3", "pdp-wac"] } -tokio = { version = "1.32.0", features = ["rt", "rt-multi-thread"] } +tokio = { version = "1.36.0", features = ["rt", "rt-multi-thread"] } [package.metadata.docs.rs] diff --git a/crates/manas_server/src/podverse.rs b/crates/manas_server/src/podverse.rs index 7d0c51c..4160422 100644 --- a/crates/manas_server/src/podverse.rs +++ b/crates/manas_server/src/podverse.rs @@ -150,7 +150,7 @@ pub mod assets_overriden_static { /// Get a new assets overriden pod set service serving /// single pod. - pub fn new_for( + pub fn new_for( pod: Arc>, assets_space: Arc, assets_label: String, diff --git a/crates/manas_space/Cargo.toml b/crates/manas_space/Cargo.toml index 13cd01a..d112b0d 100644 --- a/crates/manas_space/Cargo.toml +++ b/crates/manas_space/Cargo.toml @@ -12,27 +12,27 @@ manas_http = { version = "0.1.1", path = "../manas_http", features = [ "representation", "typed-headers", ] } -thiserror = "1.0.43" -once_cell = "1.18.0" +thiserror = "1.0.56" +once_cell = "1.19.0" iri-string = "0.7.0" -smallvec = "1.11.0" -dyn-clone = "1.0.14" +smallvec = "1.13.1" +dyn-clone = "1.0.16" if_chain = "1.0.2" gdp_rs = { version = "0.1.1", path = "../../fcrates/gdp_rs" } -headers = "0.3.8" -http = "0.2.9" +headers = "0.3.9" +http = "0.2.11" mime = "0.3.17" vec1 = "1.10.1" # feature: test-utils claims = { version = "0.7.1", optional = true } -rstest = { version = "0.18.1", optional = true } +rstest = { version = "0.18.2", optional = true } webid = { version = "0.1.0", path = "../../fcrates/webid" } [dev-dependencies] claims = "0.7.1" -rstest = "0.18.1" +rstest = "0.18.2" manas_http = { version = "0.1.1", path = "../manas_http", features = [ "representation", "typed-headers", diff --git a/crates/manas_specs/Cargo.toml b/crates/manas_specs/Cargo.toml index 9cac4d9..2a1b8d4 100644 --- a/crates/manas_specs/Cargo.toml +++ b/crates/manas_specs/Cargo.toml @@ -8,15 +8,15 @@ license = "MIT OR Apache-2.0" [dependencies] dyn_problem = { version = "0.1.1", path = "../../fcrates/dyn_problem", features = ["ext-typed-record"] } -http = "0.2.9" +http = "0.2.11" http-api-problem = { version = "0.57.0", features = ["api-error"] } iri-string = "0.7.0" manas_http = { version = "0.1.1", path = "../manas_http" } -once_cell = "1.18.0" -percent-encoding = "2.3.0" -serde = "1.0.169" -serde_with = "3.0.0" -thiserror = "1.0.43" +once_cell = "1.19.0" +percent-encoding = "2.3.1" +serde = "1.0.196" +serde_with = "3.6.0" +thiserror = "1.0.56" typed_record = { version = "0.1.1", path = "../../fcrates/typed_record" } [package.metadata.docs.rs] diff --git a/crates/manas_specs/codegen/Cargo.toml b/crates/manas_specs/codegen/Cargo.toml index d6aff6d..fa9ce7b 100644 --- a/crates/manas_specs/codegen/Cargo.toml +++ b/crates/manas_specs/codegen/Cargo.toml @@ -4,15 +4,15 @@ version = "0.1.0" edition = "2021" [dependencies] -anyhow = "1.0.71" -serde_json = "1.0.100" +anyhow = "1.0.79" +serde_json = "1.0.113" iri-string = "0.7.0" -syn = "2.0.24" -regex = "1.10.2" -once_cell = "1.18.0" +syn = "2.0.48" +regex = "1.10.3" +once_cell = "1.19.0" rdf_vocabularies = { version = "0.2.0", features = ["ns-spec", "ns-dcterms"] } -handlebars = "4.3.7" -serde = { version = "1.0.169", features = ["derive"] } +handlebars = "5.1.0" +serde = { version = "1.0.196", features = ["derive"] } sophia_api = "0.8.0" rdf_utils = { version = "0.3.1", path = "../../../fcrates/rdf_utils" } sophia_turtle = "0.8.0" diff --git a/crates/manas_storage/Cargo.toml b/crates/manas_storage/Cargo.toml index 01e4b4a..eb46624 100644 --- a/crates/manas_storage/Cargo.toml +++ b/crates/manas_storage/Cargo.toml @@ -8,19 +8,19 @@ license = "MIT OR Apache-2.0" [dependencies] -anyhow = "1.0.71" -dyn-clone = "1.0.14" +anyhow = "1.0.79" +dyn-clone = "1.0.16" dyn_problem = { version = "0.1.1", path = "../../fcrates/dyn_problem", features = [ "ext-typed-record", ] } -either = "1.8.1" -futures = "0.3.28" +either = "1.9.0" +futures = "0.3.30" gdp_rs = { version = "0.1.1", path = "../../fcrates/gdp_rs" } -ghost = "0.1.13" -headers = "0.3.8" -http = "0.2.9" +ghost = "0.1.17" +headers = "0.3.9" +http = "0.2.11" http-api-problem = { version = "0.57.0", features = ["api-error", "hyper"] } -hyper = "0.14.27" +hyper = "0.14.28" if_chain = "1.0.2" iri-string = "0.7.0" manas_access_control = { version = "0.1.0", path = "../manas_access_control" } @@ -34,7 +34,7 @@ manas_space = { version = "0.1.0", path = "../manas_space" } manas_specs = { version = "0.1.0", path = "../manas_specs" } mime = "0.3.17" name_locker = { version = "0.1.1", path = "../../fcrates/name_locker" } -once_cell = "1.18.0" +once_cell = "1.19.0" rand = "0.8.5" rdf_dynsyn = { version = "0.4.0", path = "../../fcrates/rdf_dynsyn" } rdf_utils = { version = "0.3.1", path = "../../fcrates/rdf_utils", features = ["compat-iri-string"] } @@ -44,10 +44,10 @@ rdf_vocabularies = { version = "0.2.0", features = [ "ns-solid", ] } sophia_api = "0.8.0" -thiserror = "1.0.43" +thiserror = "1.0.56" tower = "0.4.13" -tower-http = { version = "0.4.1", features = ["cors"] } -tracing = { version = "0.1.37", features = ["attributes"] } +tower-http = { version = "0.4.4", features = ["cors"] } +tracing = { version = "0.1.40", features = ["attributes"] } typed_record = { version = "0.1.1", path = "../../fcrates/typed_record", features = [ "ext-http", ] } diff --git a/fcrates/acp/Cargo.toml b/fcrates/acp/Cargo.toml index ada668f..007871e 100644 --- a/fcrates/acp/Cargo.toml +++ b/fcrates/acp/Cargo.toml @@ -9,17 +9,17 @@ license = "MIT OR Apache-2.0" [dependencies] rdf_utils = { version = "0.3.1", path = "../rdf_utils" } rdf_vocabularies = { version = "0.2.0", features = ["ns-acp", "ns-acl"] } -paste = { version = "1.0.13" } +paste = { version = "1.0.14" } sophia_api = { version = "0.8.0" } # feature: engine -dyn-clone = { version = "1.0.14", optional = true } +dyn-clone = { version = "1.0.16", optional = true } dyn_problem = { version = "0.1.1", path = "../dyn_problem", optional = true, features = ["alias-future"]} -futures = { version = "0.3.28", optional = true } -ghost = { version = "0.1.13", optional = true } +futures = { version = "0.3.30", optional = true } +ghost = { version = "0.1.17", optional = true } rand = { version = "0.8.5", optional = true } tower = { version = "0.4.13", optional = true, features = ["util"]} -tracing = { version = "0.1.37", optional = true } +tracing = { version = "0.1.40", optional = true } unwrap-infallible = { version = "0.1.5", optional = true } diff --git a/fcrates/capped_stream/Cargo.toml b/fcrates/capped_stream/Cargo.toml index cc1be30..31cfcc9 100644 --- a/fcrates/capped_stream/Cargo.toml +++ b/fcrates/capped_stream/Cargo.toml @@ -8,9 +8,9 @@ license = "MIT OR Apache-2.0" [dependencies] -futures = "0.3.28" +futures = "0.3.30" pin-project-lite = "0.2.13" -thiserror = "1.0.48" +thiserror = "1.0.56" [package.metadata.docs.rs] all-features = true diff --git a/fcrates/dpop/Cargo.toml b/fcrates/dpop/Cargo.toml index 56108bb..3eff3cc 100644 --- a/fcrates/dpop/Cargo.toml +++ b/fcrates/dpop/Cargo.toml @@ -8,27 +8,27 @@ license = "MIT OR Apache-2.0" [dependencies] -base64 = "0.21.2" +base64 = "0.21.7" canonical_json = "0.5.0" frunk_core = "0.4.2" gdp_rs = { version = "0.1.1", path = "../gdp_rs", features = ["serde"] } -http = "0.2.9" -http-serde = "1.1.2" +http = "0.2.11" +http-serde = "1.1.3" http_uri = { version = "1.0.1", path = "../http_uri", features = ["serde"] } -once_cell = { version = "1.18.0" } +once_cell = { version = "1.19.0" } picky = { version = "7.0.0-rc.8", default-features = false, features = [ "jose", ] } -regex = { version = "1.10.2" } -serde = { version = "1.0.166", features = ["derive"] } -serde_json = "1.0.100" -thiserror = "1.0.41" -uuid = { version = "1.4.0", features = ["v4"] } +regex = { version = "1.10.3" } +serde = { version = "1.0.196", features = ["derive"] } +serde_json = "1.0.113" +thiserror = "1.0.56" +uuid = { version = "1.7.0", features = ["v4"] } # feature: http-header -bytes = { version = "1.4.0", optional = true } +bytes = { version = "1.5.0", optional = true } itertools = { version = "0.11.0", optional = true } -headers = { version = "0.3.8", optional = true } +headers = { version = "0.3.9", optional = true } [features] http-header = ["dep:headers", "dep:bytes", "dep:itertools"] @@ -37,7 +37,7 @@ unsafe-optional-ath-claim = [] [dev-dependencies] claims = "0.7.1" -rstest = "0.18.1" +rstest = "0.18.2" [package.metadata.docs.rs] all-features = true diff --git a/fcrates/dyn_problem/Cargo.toml b/fcrates/dyn_problem/Cargo.toml index 51c8d0f..7f4867e 100644 --- a/fcrates/dyn_problem/Cargo.toml +++ b/fcrates/dyn_problem/Cargo.toml @@ -8,19 +8,19 @@ license = "MIT OR Apache-2.0" [dependencies] -http = "0.2.9" +http = "0.2.11" http-api-problem = {version = "0.57.0", features = ["api-error"]} iri-string = "0.7.0" -once_cell = "1.18.0" +once_cell = "1.19.0" # feature: ext-typed-record typed_record = { version = "0.1.1", path = "../typed_record", features = ["ext-http"], optional = true} # feature: anon-problem-type -uuid = { version = "1.4.0", features = ["v4"], optional = true } +uuid = { version = "1.7.0", features = ["v4"], optional = true } # feature: alias-future -futures = { version = "0.3.28", optional = true } +futures = { version = "0.3.30", optional = true } [features] diff --git a/fcrates/gdp_rs/Cargo.toml b/fcrates/gdp_rs/Cargo.toml index d75fb26..31838de 100644 --- a/fcrates/gdp_rs/Cargo.toml +++ b/fcrates/gdp_rs/Cargo.toml @@ -8,12 +8,12 @@ license = "MIT OR Apache-2.0" [dependencies] -either = "1.8.1" +either = "1.9.0" frunk_core = "0.4.2" -thiserror = "1.0.41" +thiserror = "1.0.56" # feature: serde -serde = { version = "1.0.166", optional = true } +serde = { version = "1.0.196", optional = true } [features] serde = ["dep:serde"] diff --git a/fcrates/http_typed_headers/Cargo.toml b/fcrates/http_typed_headers/Cargo.toml index 5a87809..3067f64 100644 --- a/fcrates/http_typed_headers/Cargo.toml +++ b/fcrates/http_typed_headers/Cargo.toml @@ -7,15 +7,15 @@ repository = "https://github.com/manomayam/manas" license = "MIT OR Apache-2.0" [dependencies] -once_cell = "1.18.0" -regex = "1.10.2" -thiserror = "1.0.43" -tracing = { version = "0.1.37", features = ["attributes"] } -unicase = { version = "2.6.0" } +once_cell = "1.19.0" +regex = "1.10.3" +thiserror = "1.0.56" +tracing = { version = "0.1.40", features = ["attributes"] } +unicase = { version = "2.7.0" } ecow = "0.2.0" -headers = { version = "0.3.8" } -http = { version = "0.2.9" } -smallvec = { version = "1.11.0" } +headers = { version = "0.3.9" } +http = { version = "0.2.11" } +smallvec = { version = "1.13.1" } vec1 = { version = "1.10.1", features = [ "smallvec-v1", "smallvec-v1-write", @@ -25,22 +25,22 @@ vec1 = { version = "1.10.1", features = [ itertools = { version = "0.11.0", optional = true } # feature: www-authenticate -either = { version = "1.8.1", optional = true } +either = { version = "1.9.0", optional = true } # feature: media-type, accept-x mime = { version = "0.3.17", optional = true } # feature: qvalue, accept -rust_decimal = { version = "1.30.0", optional = true } +rust_decimal = { version = "1.34.2", optional = true } # feature: link, location iri-string = { version = "0.7.0", features = ["serde"], optional = true } # feature: slug -percent-encoding = { version = "2.3.0", optional = true } +percent-encoding = { version = "2.3.1", optional = true } # feature: docsrs -document-features = { version = "0.2.7", optional = true } +document-features = { version = "0.2.8", optional = true } [features] @@ -79,7 +79,7 @@ default = [ [dev-dependencies] claims = "0.7.1" -rstest = "0.18.1" +rstest = "0.18.2" [package.metadata.docs.rs] all-features = true diff --git a/fcrates/http_uri/Cargo.toml b/fcrates/http_uri/Cargo.toml index d412c7d..b5a194f 100644 --- a/fcrates/http_uri/Cargo.toml +++ b/fcrates/http_uri/Cargo.toml @@ -8,11 +8,11 @@ license = "MIT OR Apache-2.0" [dependencies] iri-string = "0.7.0" -unicase = "2.6.0" -thiserror = "1.0.41" +unicase = "2.7.0" +thiserror = "1.0.56" # feature: serde -serde = { version = "1.0.166", optional = true } +serde = { version = "1.0.196", optional = true } # feature: invariants gdp_rs = { version = "0.1.1", path = "../gdp_rs", optional = true } @@ -30,7 +30,7 @@ default = ["invariants"] [dev-dependencies] claims = "0.7.1" -rstest = "0.18.1" +rstest = "0.18.2" [package.metadata.docs.rs] all-features = true diff --git a/fcrates/name_locker/Cargo.toml b/fcrates/name_locker/Cargo.toml index 672f84f..244d514 100644 --- a/fcrates/name_locker/Cargo.toml +++ b/fcrates/name_locker/Cargo.toml @@ -8,12 +8,12 @@ license = "MIT OR Apache-2.0" [dependencies] -futures = "0.3.28" +futures = "0.3.30" # feature: inmem async-stream = { version = "0.3.5", optional = true } -dashmap = { version = "5.4.0", optional = true } -tokio = { version = "1.29.1", optional = true, features = ["sync"] } +dashmap = { version = "5.5.3", optional = true } +tokio = { version = "1.36.0", optional = true, features = ["sync"] } [features] inmem = ["dep:dashmap", "dep:tokio", "dep:async-stream"] diff --git a/fcrates/rdf_dynsyn/Cargo.toml b/fcrates/rdf_dynsyn/Cargo.toml index 9ace81c..e262f1c 100644 --- a/fcrates/rdf_dynsyn/Cargo.toml +++ b/fcrates/rdf_dynsyn/Cargo.toml @@ -15,10 +15,10 @@ sophia_turtle = "0.8.0" sophia_rio = "0.8.0" rio_turtle = "0.8.4" rio_api = "0.8.4" -once_cell = "1.18.0" +once_cell = "1.19.0" mime = "0.3.17" -thiserror = "1.0.41" -tracing = "0.1.37" +thiserror = "1.0.56" +tracing = "0.1.40" anymap2 = "0.13.0" gdp_rs = { version = "0.1.1", path = "../gdp_rs" } frunk_core = "0.4.2" @@ -32,32 +32,32 @@ rio_xml = { version = "0.8.4", optional = true } # feature: async -futures = { version = "0.3.28", optional = true } -bytes = { version = "1.4.0", optional = true } -tokio = { version = "1.29.1", optional = true, features = [ +futures = { version = "0.3.30", optional = true } +bytes = { version = "1.5.0", optional = true } +tokio = { version = "1.36.0", optional = true, features = [ "io-util", "sync", "rt", ] } -async-compat = { version = "0.2.1", optional = true } -tokio-util = { version = "0.7.8", optional = true, features = [ +async-compat = { version = "0.2.3", optional = true } +tokio-util = { version = "0.7.10", optional = true, features = [ "io-util", "io", ] } tokio-stream = { version = "0.1.14", optional = true } # feature: jsonld -json-ld = { version = "^0.15.0", optional = true} +json-ld = { version = "^0.15.1", optional = true} sophia_jsonld = { version = "0.8.0", optional = true} locspan = { version = "^0.7.16", optional = true } -json-syntax = { version = "^0.9.0", optional = true } +json-syntax = { version = "^0.9.6", optional = true } rdf-types = { version = "^0.15.4", optional = true } # feature: docsrs -document-features = { version = "0.2.7", optional = true } +document-features = { version = "0.2.8", optional = true } # feature: jsonld-http-loader -reqwest = { version = "0.11.22", optional = true, default-features = false } +reqwest = { version = "0.11.24", optional = true, default-features = false } reqwest-middleware = { version = "0.2.4", optional = true } http_typed_headers = { version = "0.1.0", path = "../http_typed_headers", default-features = false, features = ["accept", "location", "link"], optional = true } headers = { version = "0.3.9", optional = true } @@ -79,10 +79,10 @@ native-tls =["reqwest?/native-tls"] default = ["rdf-xml", "rustls-tls"] [dev-dependencies] -env_logger = "0.10.0" -tracing = { version = "0.1.37", features = ["log"] } +env_logger = "0.11.1" +tracing = { version = "0.1.40", features = ["log"] } sophia_isomorphism = "0.8.0" -rstest = "0.18.1" +rstest = "0.18.2" [package.metadata.docs.rs] all-features = true diff --git a/fcrates/rdf_utils/Cargo.toml b/fcrates/rdf_utils/Cargo.toml index 6c7a003..3ece6d5 100644 --- a/fcrates/rdf_utils/Cargo.toml +++ b/fcrates/rdf_utils/Cargo.toml @@ -7,12 +7,12 @@ repository = "https://github.com/manomayam/manas" license = "MIT OR Apache-2.0" [dependencies] -once_cell = "1.18.0" +once_cell = "1.19.0" sophia_api = "0.8.0" -tracing = { version = "0.1.37", features = ["attributes"] } -thiserror = "1.0.43" +tracing = { version = "0.1.40", features = ["attributes"] } +thiserror = "1.0.56" unwrap-infallible = "0.1.5" -paste = "1.0.13" +paste = "1.0.14" # feature: query resiter = { version = "0.5.0", optional = true } @@ -33,7 +33,7 @@ itertools = { version = "0.11.0", optional = true } rio_turtle = { version = "0.8.4", optional = true, features = ["generalized"] } # feature: compat-chrono -chrono = { version = "0.4.26", optional = true, default-features = false, features = ["std"]} +chrono = { version = "0.4.33", optional = true, default-features = false, features = ["std"]} # feature: compat-iri-string iri-string = { version = "0.7.0", optional = true } diff --git a/fcrates/solid_oidc_types/Cargo.toml b/fcrates/solid_oidc_types/Cargo.toml index fa4725c..28cbb96 100644 --- a/fcrates/solid_oidc_types/Cargo.toml +++ b/fcrates/solid_oidc_types/Cargo.toml @@ -15,10 +15,10 @@ http_uri = { version = "1.0.1", path = "../http_uri", features = ["serde"] } picky = { version = "7.0.0-rc.8", default-features = false, features = [ "jose", ] } -serde = { version = "1.0.167", features = ["derive"] } -serde_json = "1.0.100" -thiserror = "1.0.43" -tracing = { version = "0.1.37", features = ["attributes"] } +serde = { version = "1.0.196", features = ["derive"] } +serde_json = "1.0.113" +thiserror = "1.0.56" +tracing = { version = "0.1.40", features = ["attributes"] } webid = { version = "0.1.0", path = "../webid", features = ["serde"] } [package.metadata.docs.rs] diff --git a/fcrates/typed_record/Cargo.toml b/fcrates/typed_record/Cargo.toml index 8dbb36d..0dc4962 100644 --- a/fcrates/typed_record/Cargo.toml +++ b/fcrates/typed_record/Cargo.toml @@ -13,7 +13,7 @@ license = "MIT OR Apache-2.0" anymap2 = { version = "0.13.0", optional = true } # feature: ext-http -http = { version = "0.2.9", optional = true } +http = { version = "0.2.11", optional = true } [features] diff --git a/fcrates/webid/Cargo.toml b/fcrates/webid/Cargo.toml index 6c480c2..9d89ae5 100644 --- a/fcrates/webid/Cargo.toml +++ b/fcrates/webid/Cargo.toml @@ -10,10 +10,10 @@ license = "MIT OR Apache-2.0" [dependencies] http_uri = { version = "1.0.1", path = "../http_uri", default-features = false, features = ["sophia"]} iri-string = "0.7.0" -thiserror = "1.0.43" +thiserror = "1.0.56" # feature: serde -serde = { version = "1.0.167", features = ["derive"], optional = true } +serde = { version = "1.0.196", features = ["derive"], optional = true } # feature: invariant gdp_rs = { version = "0.1.1", path = "../gdp_rs", optional = true } @@ -22,14 +22,14 @@ gdp_rs = { version = "0.1.1", path = "../gdp_rs", optional = true } sophia_api = { version = "0.8.0", optional = true } # feature: profile-req-agent -reqwest = { version = "0.11.18", optional = true, features = ["stream"], default-features = false} -tracing = { version = "0.1.37", features = ["attributes"] } +reqwest = { version = "0.11.24", optional = true, features = ["stream"], default-features = false} +tracing = { version = "0.1.40", features = ["attributes"] } rdf_dynsyn = { version = "0.4.0", path = "../rdf_dynsyn", optional = true, features = [ "async", ] } -headers = { version = "0.3.8", optional = true } +headers = { version = "0.3.9", optional = true } mime = { version = "0.3.17", optional = true } -futures = { version = "0.3.28", optional = true } +futures = { version = "0.3.30", optional = true } [features]