diff --git a/.chord/src/quickjs/smoking.csv b/.chord/src/quickjs/smoking.csv new file mode 100644 index 00000000..122e5f5d --- /dev/null +++ b/.chord/src/quickjs/smoking.csv @@ -0,0 +1,101 @@ +foo,bar +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 +1 ,2.3 \ No newline at end of file diff --git a/.chord/src/quickjs/task.js b/.chord/src/quickjs/task.js new file mode 100644 index 00000000..73651620 --- /dev/null +++ b/.chord/src/quickjs/task.js @@ -0,0 +1,32 @@ +let conf = { + version: "0.0.1", + stage: { + smoking: { + step: {} + } + } +}; + +module.exports = () => conf; +let step = conf.stage.smoking.step; + +step.step1 = { + var: { + let: { + foo: "{{case.foo}}", + bar: "{{case.bar}}", + }, + }, + value: { + // language=JavaScript + quickjs: `async function a() { + console.log('a called at %s ms', new Date().getTime()); + let res = await chord.action.Http.newClient(123); + console.log('a got result %s at %s ms', res, new Date().getTime()); + };a(); + ; + `, + }, +} + + diff --git a/.github/workflows/cr.yml b/.github/workflows/cr.yml new file mode 100644 index 00000000..2ef128f7 --- /dev/null +++ b/.github/workflows/cr.yml @@ -0,0 +1,21 @@ +name: Code Review + +permissions: + contents: read + pull-requests: write + +on: + pull_request: + types: [ opened, reopened, edited ] + branches: [ dev ] + +jobs: + cr: + runs-on: ubuntu-latest + steps: + - name: ChatGPT CodeReviewer + uses: anc95/ChatGPT-CodeReview@v1.0.10 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }} + diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 96195f60..6f74b3bf 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -139,7 +139,43 @@ jobs: path: | target/release/chord.exe target/release/chord-web.exe - + + windows-gnu: + runs-on: windows-2022 + + steps: + - name: checkout + uses: actions/checkout@v2 + + - name: env-prepare + run: | + rustup update + rustup default stable-x86_64-pc-windows-gnu + + - name: chord-build-cache-simple + uses: actions/cache@v2 + with: + key: build-target-windows-gnu-simple-${{ hashFiles('Cargo.lock') }} + path: | + ./target + + - name: chord-build-simple + run: | + chmod -R 777 $PWD + cargo --version + cargo build --all-features --verbose --release + + + - name: chord-target-upload + uses: actions/upload-artifact@v2 + with: + name: x86_64-pc-windows-gnu + retention-days: 1 + if-no-files-found: error + path: | + target/release/chord.exe + target/release/chord-web.exe + macos: runs-on: macos-11 diff --git a/Cargo.lock b/Cargo.lock index c18d9a40..89fa13c8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -21,16 +21,16 @@ dependencies = [ [[package]] name = "actix-http" -version = "3.2.2" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c83abf9903e1f0ad9973cc4f7b9767fd5a03a583f51a5b7a339e07987cd2724" +checksum = "0070905b2c4a98d184c4e81025253cb192aa8a73827553f38e9410801ceb35bb" dependencies = [ "actix-codec", "actix-rt", "actix-service", "actix-utils", "ahash", - "base64", + "base64 0.21.0", "bitflags", "brotli", "bytes", @@ -43,7 +43,7 @@ dependencies = [ "http", "httparse", "httpdate", - "itoa 1.0.4", + "itoa", "language-tags", "local-channel", "mime", @@ -52,6 +52,8 @@ dependencies = [ "rand 0.8.5", "sha1 0.10.5", "smallvec", + "tokio", + "tokio-util", "tracing", "zstd", ] @@ -63,7 +65,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "465a6172cf69b960917811022d8f29bc0b7fa1398bc4f78b3c466673db1213b6" dependencies = [ "quote", - "syn", + "syn 1.0.104", ] [[package]] @@ -130,9 +132,9 @@ dependencies = [ [[package]] name = "actix-web" -version = "4.2.1" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d48f7b6534e06c7bfc72ee91db7917d4af6afe23e7d223b51e68fffbb21e96b9" +checksum = "cd3cb42f9566ab176e1ef0b8b3a896529062b4efc6be0123046095914c4c1c96" dependencies = [ "actix-codec", "actix-http", @@ -153,7 +155,7 @@ dependencies = [ "futures-core", "futures-util", "http", - "itoa 1.0.4", + "itoa", "language-tags", "log", "mime", @@ -171,14 +173,14 @@ dependencies = [ [[package]] name = "actix-web-codegen" -version = "4.1.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fa9362663c8643d67b2d5eafba49e4cb2c8a053a29ed00a0bea121f17c76b13" +checksum = "2262160a7ae29e3415554a3f1fc04c764b1540c116aa524683208078b7a75bc9" dependencies = [ "actix-router", "proc-macro2", "quote", - "syn", + "syn 1.0.104", ] [[package]] @@ -222,6 +224,12 @@ dependencies = [ "alloc-no-stdlib", ] +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + [[package]] name = "android_system_properties" version = "0.1.5" @@ -248,24 +256,24 @@ checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] name = "async-recursion" -version = "1.0.0" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cda8f4bcc10624c4e85bc66b3f452cca98cfa5ca002dc83a16aad2367641bea" +checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.32", ] [[package]] name = "async-trait" -version = "0.1.61" +version = "0.1.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "705339e0e4a9690e2908d2b3d049d85682cf19fbd5782494498fbf7003a6a282" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.32", ] [[package]] @@ -306,6 +314,12 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +[[package]] +name = "base64" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" + [[package]] name = "base64ct" version = "1.5.3" @@ -329,7 +343,7 @@ checksum = "9fe497c2ff17a4b29e2231825d5fe6f9a5dab366e189d71378f9f72f08746afe" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.104", ] [[package]] @@ -359,6 +373,18 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + [[package]] name = "block-buffer" version = "0.10.3" @@ -391,14 +417,16 @@ dependencies = [ [[package]] name = "bson" -version = "2.4.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d76085681585d39016f4d3841eb019201fc54d2dd0d92ad1e4fab3bfb32754" +checksum = "9aeb8bae494e49dbc330dd23cf78f6f7accee22f640ce3ab17841badaa4ce232" dependencies = [ "ahash", - "base64", + "base64 0.13.1", + "bitvec", "hex", "indexmap", + "js-sys", "lazy_static", "rand 0.8.5", "serde", @@ -414,10 +442,7 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" dependencies = [ - "lazy_static", "memchr", - "regex-automata", - "serde", ] [[package]] @@ -474,7 +499,7 @@ version = "0.1.22" dependencies = [ "chord-core", "chord-util", - "dirs", + "dirs 5.0.1", "dynamic_reload", "futures", "itertools", @@ -501,7 +526,7 @@ dependencies = [ "chord-output", "chrono", "colored", - "dirs", + "dirs 5.0.1", "flume", "futures", "itertools", @@ -596,7 +621,7 @@ dependencies = [ "chord-input", "chord-util", "chrono", - "dirs", + "dirs 5.0.1", "flume", "futures", "itertools", @@ -616,13 +641,13 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.23" +version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" dependencies = [ + "android-tzdata", "iana-time-zone", "js-sys", - "num-integer", "num-traits", "serde", "time 0.1.44", @@ -809,13 +834,12 @@ dependencies = [ [[package]] name = "csv" -version = "1.1.6" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" +checksum = "0b015497079b9a9d69c02ad25de6c0a6edef051ea6360a327d0bd05802ef64ad" dependencies = [ - "bstr", "csv-core", - "itoa 0.4.8", + "itoa", "ryu", "serde", ] @@ -853,7 +877,7 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn", + "syn 1.0.104", ] [[package]] @@ -870,7 +894,7 @@ checksum = "309e4fb93eed90e1e14bea0da16b209f81813ba9fc7830c20ed151dd7bc0a4d7" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.104", ] [[package]] @@ -894,7 +918,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn", + "syn 1.0.104", ] [[package]] @@ -905,7 +929,7 @@ checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ "darling_core", "quote", - "syn", + "syn 1.0.104", ] [[package]] @@ -933,7 +957,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.104", ] [[package]] @@ -946,7 +970,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version 0.4.0", - "syn", + "syn 1.0.104", ] [[package]] @@ -966,7 +990,16 @@ version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" dependencies = [ - "dirs-sys", + "dirs-sys 0.3.7", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys 0.4.1", ] [[package]] @@ -980,6 +1013,18 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + [[package]] name = "discard" version = "1.0.4" @@ -1089,7 +1134,7 @@ dependencies = [ "heck 0.4.0", "proc-macro2", "quote", - "syn", + "syn 1.0.104", ] [[package]] @@ -1165,9 +1210,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] @@ -1213,11 +1258,17 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + [[package]] name = "futures" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" +checksum = "531ac96c6ff5fd7c62263c5e3c67a603af4fcaee2e1a0ae5565ba3a11e69e549" dependencies = [ "futures-channel", "futures-core", @@ -1230,9 +1281,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +checksum = "164713a5a0dcc3e7b4b1ed7d3b433cabc18025386f9339346e8daf15963cf7ac" dependencies = [ "futures-core", "futures-sink", @@ -1240,15 +1291,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" +checksum = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd" [[package]] name = "futures-executor" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" +checksum = "1997dd9df74cdac935c76252744c1ed5794fac083242ea4fe77ef3ed60ba0f83" dependencies = [ "futures-core", "futures-task", @@ -1268,38 +1319,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" +checksum = "89d422fa3cbe3b40dca574ab087abb5bc98258ea57eea3fd6f1fa7162c778b91" [[package]] name = "futures-macro" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +checksum = "3eb14ed937631bd8b8b8977f2c198443447a8355b6e3ca599f38c975e5a963b6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.104", ] [[package]] name = "futures-sink" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" +checksum = "ec93083a4aecafb2a80a885c9de1f0ccae9dbd32c2bb54b0c3a65690e0b8d2f2" [[package]] name = "futures-task" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" +checksum = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879" [[package]] name = "futures-util" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +checksum = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab" dependencies = [ "futures-channel", "futures-core", @@ -1493,7 +1544,7 @@ checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" dependencies = [ "bytes", "fnv", - "itoa 1.0.4", + "itoa", ] [[package]] @@ -1534,7 +1585,7 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa 1.0.4", + "itoa", "pin-project-lite", "socket2", "tokio", @@ -1545,15 +1596,15 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac" +checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7" dependencies = [ "http", "hyper", - "rustls 0.20.7", + "rustls 0.21.7", "tokio", - "tokio-rustls 0.23.4", + "tokio-rustls 0.24.0", ] [[package]] @@ -1612,9 +1663,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -1710,12 +1761,6 @@ dependencies = [ "either", ] -[[package]] -name = "itoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - [[package]] name = "itoa" version = "1.0.4" @@ -1753,9 +1798,9 @@ dependencies = [ [[package]] name = "jsonpath-rust" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a253c3700953a3f08b978b5a24fa2bb1670b1e6b1a85383a847fa4277148872" +checksum = "f7ea2fa3ba7d1404aa6b094aceec1d49106ec0110b40c40b76cedae148837a3b" dependencies = [ "pest", "pest_derive", @@ -2008,30 +2053,31 @@ dependencies = [ [[package]] name = "mongodb" -version = "2.3.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5a1df476ac9541b0e4fdc8e2cc48884e66c92c933cd17a1fd75e68caf75752e" +checksum = "ebe15399de63ad4294c80069967736cbb87ebe467a8cd0629df9cab88a6fbde6" dependencies = [ "async-trait", - "base64", + "base64 0.13.1", "bitflags", "bson", "chrono", "derivative", + "derive_more", "futures-core", "futures-executor", + "futures-io", "futures-util", "hex", "hmac", "lazy_static", "md-5", - "os_info", "pbkdf2", "percent-encoding", "rand 0.8.5", "rustc_version_runtime", "rustls 0.20.7", - "rustls-pemfile 0.3.0", + "rustls-pemfile", "serde", "serde_bytes", "serde_with", @@ -2048,7 +2094,7 @@ dependencies = [ "trust-dns-proto", "trust-dns-resolver", "typed-builder", - "uuid 0.8.2", + "uuid 1.2.1", "webpki-roots 0.22.5", ] @@ -2224,9 +2270,9 @@ checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" [[package]] name = "openssl" -version = "0.10.45" +version = "0.10.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1" +checksum = "69b3f656a17a6cbc115b5c7a40c616947d213ba182135b014d6051b73ab6f019" dependencies = [ "bitflags", "cfg-if 1.0.0", @@ -2245,7 +2291,7 @@ checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.104", ] [[package]] @@ -2265,11 +2311,10 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.80" +version = "0.9.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7" +checksum = "c2ce0f250f34a308dcfdbb351f511359857d4ed2134ba715a4eadd46e1ffd617" dependencies = [ - "autocfg", "cc", "libc", "openssl-src", @@ -2278,14 +2323,10 @@ dependencies = [ ] [[package]] -name = "os_info" -version = "3.5.1" +name = "option-ext" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4750134fb6a5d49afc80777394ad5d95b04bc12068c6abb92fae8f43817270f" -dependencies = [ - "log", - "winapi 0.3.9", -] +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "overload" @@ -2324,9 +2365,9 @@ checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" [[package]] name = "pbkdf2" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271779f35b581956db91a3e55737327a03aa051e90b1c47aeb189508533adfd7" +checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ "digest", ] @@ -2342,9 +2383,9 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pest" @@ -2376,7 +2417,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn", + "syn 1.0.104", ] [[package]] @@ -2407,7 +2448,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.104", ] [[package]] @@ -2465,7 +2506,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.104", "version_check 0.9.4", ] @@ -2488,9 +2529,9 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro2" -version = "1.0.47" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] @@ -2503,13 +2544,19 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.21" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" dependencies = [ "proc-macro2", ] +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + [[package]] name = "rand" version = "0.4.6" @@ -2596,7 +2643,7 @@ version = "3.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6324adca27a8b4f1fb5e98b8cfd08d91cf3c5007d1c1c24651234004e585123" dependencies = [ - "base64", + "base64 0.13.1", "bigdecimal", "bit-vec", "chrono", @@ -2621,7 +2668,7 @@ dependencies = [ "html_parser", "proc-macro2", "quote", - "syn", + "syn 1.0.104", ] [[package]] @@ -2642,11 +2689,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "187141a7d66aea864ac042af881cd0618e4ae11fe86232600c0b172e35741b59" dependencies = [ "async-trait", - "base64", + "base64 0.13.1", "html_parser", "proc-macro2", "quote", - "syn", + "syn 1.0.104", "url", ] @@ -2657,7 +2704,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65bf0ecc799682a85ab76226c1b63fd2ef9dd0a0f5cd21d877b0af44dc8cc2bf" dependencies = [ "ahash", - "base64", + "base64 0.13.1", "chrono", "hex", "indexmap", @@ -2680,15 +2727,15 @@ dependencies = [ [[package]] name = "redis" -version = "0.22.1" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "513b3649f1a111c17954296e4a3b9eecb108b766c803e2b99f179ebe27005985" +checksum = "3ea8c51b5dc1d8e5fd3350ec8167f464ec0995e79f2e90a075b63371500d557f" dependencies = [ "async-trait", "bytes", "combine", "futures-util", - "itoa 1.0.4", + "itoa", "percent-encoding", "pin-project-lite", "ryu", @@ -2755,11 +2802,11 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.13" +version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ - "base64", + "base64 0.21.0", "bytes", "encoding_rs", "futures-core", @@ -2778,22 +2825,24 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.20.7", + "rustls 0.21.7", "rustls-native-certs", - "rustls-pemfile 1.0.1", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", + "system-configuration", "tokio", "tokio-native-tls", - "tokio-rustls 0.23.4", + "tokio-rustls 0.24.0", "tokio-util", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", + "wasm-streams", "web-sys", - "winreg 0.10.1", + "winreg 0.50.0", ] [[package]] @@ -2823,9 +2872,9 @@ dependencies = [ [[package]] name = "rlua" -version = "0.19.4" +version = "0.19.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b38117a836316ef62c02f6751e6d28e2eb53a1c35f0329427a9fb9c1c7b6a0" +checksum = "5d33e5ba15c3d43178f283ed5863d4531e292fc0e56fb773f3bea45f18e3a42a" dependencies = [ "bitflags", "bstr", @@ -2836,9 +2885,9 @@ dependencies = [ [[package]] name = "rlua-lua54-sys" -version = "0.1.3" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23ae48797c3e76fb2c205fda8f30e28416a15b9fc1d649cc7cea9ff1fb9cf028" +checksum = "7aafabafe1895cb4a2be81a56d7ff3d46bf4b5d2f9cfdbea2ed404cdabe96474" dependencies = [ "cc", "libc", @@ -2910,7 +2959,7 @@ version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" dependencies = [ - "base64", + "base64 0.13.1", "log", "ring", "sct 0.6.1", @@ -2929,6 +2978,18 @@ dependencies = [ "webpki 0.22.0", ] +[[package]] +name = "rustls" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct 0.7.0", +] + [[package]] name = "rustls-native-certs" version = "0.6.2" @@ -2936,27 +2997,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" dependencies = [ "openssl-probe", - "rustls-pemfile 1.0.1", + "rustls-pemfile", "schannel", "security-framework", ] [[package]] name = "rustls-pemfile" -version = "0.3.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee86d63972a7c661d1536fefe8c3c8407321c3df668891286de28abcd087360" +checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55" dependencies = [ - "base64", + "base64 0.13.1", ] [[package]] -name = "rustls-pemfile" -version = "1.0.1" +name = "rustls-webpki" +version = "0.101.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55" +checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" dependencies = [ - "base64", + "ring", + "untrusted", ] [[package]] @@ -3062,9 +3124,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.152" +version = "1.0.191" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +checksum = "a834c4821019838224821468552240d4d95d14e751986442c816572d39a080c9" dependencies = [ "serde_derive", ] @@ -3080,23 +3142,23 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.152" +version = "1.0.191" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +checksum = "46fa52d5646bce91b680189fe5b1c049d2ea38dabb4e2e7c8d00ca12cfbfbcfd" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.32", ] [[package]] name = "serde_json" -version = "1.0.91" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" +checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" dependencies = [ "indexmap", - "itoa 1.0.4", + "itoa", "ryu", "serde", ] @@ -3117,7 +3179,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 1.0.4", + "itoa", "ryu", "serde", ] @@ -3141,7 +3203,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn", + "syn 1.0.104", ] [[package]] @@ -3279,7 +3341,7 @@ checksum = "e48c61941ccf5ddcada342cd59e3e5173b007c509e1e8e990dafc830294d9dc5" dependencies = [ "ahash", "atoi", - "base64", + "base64 0.13.1", "bigdecimal", "bit-vec", "bitflags", @@ -3289,7 +3351,7 @@ dependencies = [ "crc", "crossbeam-queue", "digest", - "dirs", + "dirs 4.0.0", "either", "encoding_rs", "event-listener", @@ -3305,7 +3367,7 @@ dependencies = [ "hkdf", "hmac", "indexmap", - "itoa 1.0.4", + "itoa", "libc", "libsqlite3-sys", "log", @@ -3381,7 +3443,7 @@ dependencies = [ "quote", "serde", "serde_derive", - "syn", + "syn 1.0.104", ] [[package]] @@ -3397,7 +3459,7 @@ dependencies = [ "serde_derive", "serde_json", "sha1 0.6.1", - "syn", + "syn 1.0.104", ] [[package]] @@ -3449,7 +3511,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.104", ] [[package]] @@ -3469,12 +3531,50 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn" +version = "2.0.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "take_mut" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60" +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + [[package]] name = "tempdir" version = "0.3.7" @@ -3519,22 +3619,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.32", ] [[package]] @@ -3579,7 +3679,7 @@ version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fab5c8b9980850e06d92ddbe3ab839c062c801f3927c0fb8abd6fc8e918fbca" dependencies = [ - "itoa 1.0.4", + "itoa", "libc", "num_threads", "serde", @@ -3622,7 +3722,7 @@ dependencies = [ "proc-macro2", "quote", "standback", - "syn", + "syn 1.0.104", ] [[package]] @@ -3642,9 +3742,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.24.1" +version = "1.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d9f76183f91ecfb55e1d7d5602bd1d979e38a3a522fe900241cf195624d67ae" +checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64" dependencies = [ "autocfg", "bytes", @@ -3658,7 +3758,7 @@ dependencies = [ "socket2", "tokio-macros", "tracing", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -3669,7 +3769,7 @@ checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.104", ] [[package]] @@ -3704,6 +3804,16 @@ dependencies = [ "webpki 0.22.0", ] +[[package]] +name = "tokio-rustls" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0d409377ff5b1e3ca6437aa86c1eb7d40c134bfec254e44c830defa92669db5" +dependencies = [ + "rustls 0.21.7", + "tokio", +] + [[package]] name = "tokio-stream" version = "0.1.11" @@ -3723,6 +3833,7 @@ checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" dependencies = [ "bytes", "futures-core", + "futures-io", "futures-sink", "pin-project-lite", "tokio", @@ -3767,7 +3878,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.104", ] [[package]] @@ -3868,7 +3979,7 @@ checksum = "89851716b67b937e393b3daa8423e67ddfc4bbbf1654bcf05488e95e0828db0c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.104", ] [[package]] @@ -3885,9 +3996,9 @@ checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" [[package]] name = "unicode-bidi" -version = "0.3.8" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" @@ -3930,12 +4041,12 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" dependencies = [ "form_urlencoded", - "idna 0.3.0", + "idna 0.4.0", "percent-encoding", ] @@ -3993,7 +4104,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn", + "syn 1.0.104", "validator_types", ] @@ -4004,7 +4115,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "111abfe30072511849c5910134e8baf8dc05de4c0e5903d681cbd5c9c4d611e3" dependencies = [ "proc-macro2", - "syn", + "syn 1.0.104", ] [[package]] @@ -4091,7 +4202,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.104", "wasm-bindgen-shared", ] @@ -4125,7 +4236,7 @@ checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.104", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4136,6 +4247,19 @@ version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" +[[package]] +name = "wasm-streams" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + [[package]] name = "web-sys" version = "0.3.60" @@ -4263,20 +4387,74 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.0", - "windows_i686_gnu 0.42.0", - "windows_i686_msvc 0.42.0", - "windows_x86_64_gnu 0.42.0", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.0", + "windows_aarch64_gnullvm 0.42.1", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", + "windows_x86_64_gnullvm 0.42.1", + "windows_x86_64_msvc 0.42.1", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.1", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +dependencies = [ + "windows_aarch64_gnullvm 0.42.1", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", + "windows_x86_64_gnullvm 0.42.1", + "windows_x86_64_msvc 0.42.1", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" @@ -4286,9 +4464,15 @@ checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" [[package]] name = "windows_aarch64_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" @@ -4298,9 +4482,15 @@ checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" [[package]] name = "windows_i686_gnu" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" @@ -4310,9 +4500,15 @@ checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" [[package]] name = "windows_i686_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" @@ -4322,15 +4518,27 @@ checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" [[package]] name = "windows_x86_64_gnu" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.0" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" @@ -4340,9 +4548,15 @@ checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" [[package]] name = "windows_x86_64_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winreg" @@ -4355,11 +4569,12 @@ dependencies = [ [[package]] name = "winreg" -version = "0.10.1" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ - "winapi 0.3.9", + "cfg-if 1.0.0", + "windows-sys 0.48.0", ] [[package]] @@ -4372,6 +4587,15 @@ dependencies = [ "winapi-build", ] +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + [[package]] name = "zeroize" version = "1.5.7" @@ -4380,18 +4604,18 @@ checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" [[package]] name = "zstd" -version = "0.11.2+zstd.1.5.2" +version = "0.12.3+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" +version = "6.0.3+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +checksum = "68e4a3f57d13d0ab7e478665c60f35e2a613dcd527851c2c7287ce5c787e134a" dependencies = [ "libc", "zstd-sys", diff --git a/action/Cargo.toml b/action/Cargo.toml index 98c89d0c..01ff211d 100644 --- a/action/Cargo.toml +++ b/action/Cargo.toml @@ -20,18 +20,19 @@ chord-core = { path = "../core", version = "0.1.22" } chord-util = { path = "../util", version = "0.1.22", optional = true } serde = { version = "1.0" } itertools = "0.10.5" -futures = { version = "0.3.25" } +futures = { version = "0.3.27" } log = { version = "0.4.14", features = ["std"] } -reqwest = { version = "0.11.13", features = ['stream'], optional = true } +reqwest = { version = "0.11.22", features = ['stream'], optional = true } md5 = { version = "0.7.0", optional = true } -redis = { version = "0.22.1", features = ["tokio-comp"], optional = true } +redis = { version = "0.23.0", features = ["tokio-comp"], optional = true } rbatis = { version = "3.1.14", optional = true, default-features = false, features = ["default_mode", "all-database", "upper_case_sql_keyword", "runtime-tokio-rustls"] } -mongodb = { version = "2.3.1", default-features = false, features = ["tokio-runtime"], optional = true } +mongodb = { version = "2.5.0", default-features = false, features = ["tokio-runtime"], optional = true } urlencoding = { version = "2.1.2", optional = true } dynamic_reload = { version = "0.4.0", optional = true } -rlua = { version = "0.19.4", optional = true } -dirs = "4.0.0" - +rlua = { version = "0.19.7", optional = true } +dirs = "5.0.1" +#quickjs_runtime = { version = "0.8", optional = true } +#hirofa_utils = { version = "0.5", optional = true } [features] default = [] @@ -47,5 +48,6 @@ act_docker = ["chord-util"] act_lua = ["rlua"] act_shell = [] act_program = [] +#act_quickjs = ['quickjs_runtime', "hirofa_utils"] diff --git a/action/src/action/mod.rs b/action/src/action/mod.rs index 7f7ee038..354e7f3e 100644 --- a/action/src/action/mod.rs +++ b/action/src/action/mod.rs @@ -25,6 +25,8 @@ mod docker; mod dubbo; #[cfg(feature = "act_lua")] mod lua; +#[cfg(feature = "act_quickjs")] +mod quickjs; #[cfg(feature = "act_mongodb")] mod mongodb; #[cfg(feature = "act_program")] @@ -93,6 +95,9 @@ impl CreatorComposite { #[cfg(feature = "act_lua")] register!(table, config_ref, "lua", lua::LuaCreator::new); + #[cfg(feature = "act_quickjs")] + register!(table, config_ref, "quickjs", quickjs::QuickjsCreator::new); + #[cfg(feature = "act_program")] register!(table, config_ref, "program", program::ProgramCreator::new); diff --git a/action/src/action/quickjs.rs b/action/src/action/quickjs.rs new file mode 100644 index 00000000..8596c7d9 --- /dev/null +++ b/action/src/action/quickjs.rs @@ -0,0 +1,96 @@ +use std::sync::Arc; +use std::time::Duration; + +use futures::executor::block_on; +use hirofa_utils::js_utils::{JsError, Script}; +use hirofa_utils::js_utils::adapters::{JsRealmAdapter, JsValueAdapter}; +use hirofa_utils::js_utils::adapters::proxies::JsProxy; +use hirofa_utils::js_utils::facades::{JsRuntimeBuilder, JsRuntimeFacade}; +use hirofa_utils::js_utils::facades::values::{JsValueConvertable, JsValueFacade}; +use log::info; +use quickjs_runtime::builder::QuickJsRuntimeBuilder; +use quickjs_runtime::facades::QuickJsRuntimeFacade; +use quickjs_runtime::quickjsrealmadapter::QuickJsRealmAdapter; + +use chord_core::action::prelude::*; + +use crate::err; + +pub struct QuickjsCreator { + rt: Arc, +} + +impl QuickjsCreator { + pub async fn new(_: Option) -> Result { + let rt = QuickJsRuntimeBuilder::new().js_build(); + rt.js_loop_realm_sync(None, |_rt_adapter, realm_adapter| { + let proxy = JsProxy::new(&["chord", "action"], "Http").add_static_method( + "newClient", + |_rt_adapter, realm_adapter: &QuickJsRealmAdapter, args| { + let args_str = format!("{}", &args[0].js_to_i32()); + realm_adapter.js_promise_create_resolving_async( + async { Ok(args_str) }, + |realm_adapter, producer_result| { + realm_adapter.js_string_create(producer_result.as_str()) + }, + ) + }, + ); + realm_adapter + .js_proxy_install(proxy, true) + .ok() + .expect("could not install proxy"); + }); + + Ok(QuickjsCreator { + rt: Arc::new(rt) + }) + } +} + +#[async_trait] +impl Creator for QuickjsCreator { + async fn create(&self, _chord: &dyn Chord, _arg: &dyn Arg) -> Result, Error> { + Ok(Box::new(Quickjs { + rt: self.rt.clone() + })) + } +} + +struct Quickjs { + rt: Arc, +} + +#[async_trait] +impl Action for Quickjs { + async fn execute( + &self, + _chord: &dyn Chord, + arg: &mut dyn Arg, + ) -> Result { + let code = arg + .args_raw() + .as_str() + .ok_or(err!("100", "missing quickjs"))? + .to_string(); + + block_on(run_code(self.rt.as_ref(), &code))?; + return Ok(Asset::Value(Value::Null)); + } +} + + +async fn run_code(rt: &QuickJsRuntimeFacade, code: &str) -> Result<(), Error> { + + // create simple proxy class with an async function + + rt.js_eval( + None, + Script::new( + "tmp.js", + code, + ), + ).await + .map_err(|e| err!("110", "could not eval code"))?; + Ok(()) +} \ No newline at end of file diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 9fd72c7f..564aba16 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -24,16 +24,16 @@ chord-flow = { path = "../flow", version = "0.1.22" } chord-input = { path = "../input", version = "0.1.22" } chord-output = { path = "../output", version = "0.1.22", features = ["report_csv", "report_webhook"] } chord-action = { path = "../action", version = "0.1.22", features = ["act_restapi", "act_crypto", "act_dubbo", "act_redis", "act_database", "act_mongodb", "act_url", "act_cdylib", "act_docker", "act_lua", "act_program"] } -tokio = { version = "1.24", features = ["fs", "time", "tracing", "process", "macros", "rt", "io-util"] } +tokio = { version = "1.26", features = ["fs", "time", "tracing", "process", "macros", "rt", "io-util"] } log = { version = "0.4.14", features = ["std"] } tracing = "0.1" tracing-subscriber = { version = "0.3.16", features = ['env-filter'] } -futures = "0.3.25" +futures = "0.3.27" itertools = "0.10.5" flume = "0.10.14" structopt = "0.3" -dirs = "4.0.0" -async-recursion = "1.0.0" +dirs = "5.0.1" +async-recursion = "1.0.4" colored = "2" thiserror = "1.0" -chrono = { version = "0.4.23", features = ["serde"] } +chrono = { version = "0.4.26", features = ["serde"] } diff --git a/core/Cargo.toml b/core/Cargo.toml index f4d307bc..06db8d92 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -17,13 +17,13 @@ repository = "https://github.com/bit-ranger/chord" [dependencies] serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -chrono = { version = "0.4.23", features = ["serde"] } -async-trait = "0.1.61" +chrono = { version = "0.4.26", features = ["serde"] } +async-trait = "0.1.73" regex = "1.7.1" lazy_static = "1.4.0" itertools = "0.10.5" thiserror = "1.0" -tokio = { version = "1.24", features = ["fs", "time", "tracing", "process", "macros", "rt", "io-util", "sync"] } +tokio = { version = "1.26", features = ["fs", "time", "tracing", "process", "macros", "rt", "io-util", "sync"] } [target.'cfg(linux)'.dependencies] diff --git a/flow/Cargo.toml b/flow/Cargo.toml index 02b5faaf..201c2a64 100644 --- a/flow/Cargo.toml +++ b/flow/Cargo.toml @@ -17,11 +17,11 @@ repository = "https://github.com/bit-ranger/chord" [dependencies] chord-core = { path = "../core", version = "0.1.22" } itertools = "0.10.5" -futures = "0.3.25" +futures = "0.3.27" handlebars = "4.3.6" log = { version = "0.4.14", features = ["std"] } tracing = "0.1" -chrono = "0.4.23" +chrono = "0.4.26" lazy_static = "1.4.0" -jsonpath-rust = "0.2.0" +jsonpath-rust = "0.3.0" thiserror = "1.0" \ No newline at end of file diff --git a/flow/src/flow/case/mod.rs b/flow/src/flow/case/mod.rs index 6787e589..8763b3d7 100644 --- a/flow/src/flow/case/mod.rs +++ b/flow/src/flow/case/mod.rs @@ -1,6 +1,6 @@ use chrono::Utc; use log::{info, trace, warn}; -use tracing::{error_span, Instrument}; +use tracing::{debug_span, Instrument}; use chord_core::case::{CaseId, CaseState}; use chord_core::collection::TailDropVec; @@ -17,7 +17,7 @@ pub mod res; pub async fn run(flow_ctx: &dyn App, arg: CaseArgStruct) -> CaseAssetStruct { let trace_id = format!("{}", arg.id().case()); run0(flow_ctx, arg) - .instrument(error_span!("case", case=trace_id)) + .instrument(debug_span!("case", case=trace_id)) .await } @@ -33,7 +33,7 @@ async fn run0(flow_ctx: &dyn App, mut arg: CaseArgStruct) -> CaseAssetStruct { let mut step_arg = arg.step_arg_create(step_id, flow_ctx); let step_asset = step_runner.run(&mut step_arg) - .instrument(error_span!("step", step=step_id)) + .instrument(debug_span!("step", step=step_id)) .await; if !step_asset.state().is_ok() { diff --git a/flow/src/flow/step/mod.rs b/flow/src/flow/step/mod.rs index 9b5633e3..748df592 100644 --- a/flow/src/flow/step/mod.rs +++ b/flow/src/flow/step/mod.rs @@ -3,7 +3,7 @@ use std::sync::Arc; use chrono::{DateTime, Utc}; use log::{debug, error, info, trace, warn}; -use tracing::{error_span, Instrument}; +use tracing::{debug_span, Instrument}; use chord_core::action::{Action, Asset, Chord}; use chord_core::collection::TailDropVec; @@ -75,7 +75,7 @@ impl StepRunner { .unwrap_or(Value::Null); let start = Utc::now(); let value = action.execute(self.chord.as_ref(), arg) - .instrument(error_span!("action", action=key)) + .instrument(debug_span!("action", action=key)) .await; let end = Utc::now(); match value { diff --git a/flow/src/flow/task/mod.rs b/flow/src/flow/task/mod.rs index 92899cfb..124b52e5 100644 --- a/flow/src/flow/task/mod.rs +++ b/flow/src/flow/task/mod.rs @@ -4,7 +4,7 @@ use std::sync::Arc; use futures::future::join_all; use handlebars::RenderError; use log::{error, info, trace, warn}; -use tracing::{error_span, Instrument}; +use tracing::{debug_span, Instrument}; use chord_core::case::{CaseAsset, CaseState}; use chord_core::collection::TailDropVec; @@ -123,7 +123,7 @@ impl TaskRunner { pub async fn run(self) -> Box { let task_id = self.id.to_string(); self.run0() - .instrument(error_span!("task", task=task_id)) + .instrument(debug_span!("task", task = task_id)) .await } @@ -177,7 +177,7 @@ impl TaskRunner { )), self.chord.clone(), ) - .await; + .await; if let Err(e) = pre_step_vec { error!("task Err"); return Box::new(TaskAssetStruct::new( @@ -195,7 +195,7 @@ impl TaskRunner { self.def_ctx.clone(), pre_step_vec.clone(), ) - .await; + .await; if let Err(e) = pre_arg { error!("task Err"); return Box::new(TaskAssetStruct::new( @@ -298,8 +298,7 @@ impl TaskRunner { .collect(); for state_id in stage_id_vec { trace!("stage run"); - self.stage_run(state_id.as_str()) - .await?; + self.stage_run(state_id.as_str()).await?; if let StageState::Fail(_) = self.stage_state { if "stage_fail" == self.flow.stage_break_on(state_id.as_str()) { break; @@ -325,10 +324,11 @@ impl TaskRunner { Arc::new(StageIdStruct::new( self.id.clone(), stage_id.to_string(), - "0".to_string())), + "0".to_string(), + )), self.chord.clone(), ) - .await?; + .await?; self.step_vec = Arc::new(TailDropVec::from(action_vec)); let duration = self.flow.stage_duration(stage_id); @@ -353,7 +353,10 @@ impl TaskRunner { round_count.to_string(), )); self.stage_run_once(stage, concurrency) - .instrument(error_span!("stage", stage=format!("{}-{}", stage_id, round_count))) + .instrument(debug_span!( + "stage", + stage = format!("{}-{}", stage_id, round_count) + )) .await?; if round_count >= round_max { break; @@ -363,7 +366,11 @@ impl TaskRunner { return Ok(()); } - async fn stage_run_once(&mut self, stage: Arc, concurrency: usize) -> Result<(), Error> { + async fn stage_run_once( + &mut self, + stage: Arc, + concurrency: usize, + ) -> Result<(), Error> { trace!("stage run"); let start = Utc::now(); @@ -385,7 +392,12 @@ impl TaskRunner { .map_err(|e| Reporter("stage".to_string(), stage.to_string(), e))?; let result = self - .stage_run_io(stage.clone(), loader.as_mut(), reporter.as_mut(), concurrency) + .stage_run_io( + stage.clone(), + loader.as_mut(), + reporter.as_mut(), + concurrency, + ) .await; let stage_asset = if let Err(e) = result { @@ -450,12 +462,11 @@ impl TaskRunner { }; } - trace!( - "stage load data, {}", - case_data_vec.len() - ); + trace!("stage load data, {}", case_data_vec.len()); - let case_asset_vec = self.case_data_vec_run(stage.clone(), case_data_vec, concurrency).await; + let case_asset_vec = self + .case_data_vec_run(stage.clone(), case_data_vec, concurrency) + .await; let first_fail = case_asset_vec.iter().find(|ca| !ca.state().is_ok()); if first_fail.is_some() { let cause_case = first_fail.unwrap(); @@ -507,7 +518,11 @@ impl TaskRunner { case_asset_vec } - fn case_arg_vec<'p>(&self, stage: Arc, data: Vec<(String, Value)>) -> Vec { + fn case_arg_vec<'p>( + &self, + stage: Arc, + data: Vec<(String, Value)>, + ) -> Vec { let vec = data .into_iter() .map(|(id, d)| { @@ -563,7 +578,6 @@ async fn pre_ctx_create(sa_vec: &Vec>) -> Map { pre_ctx } - async fn step_vec_create( app: &dyn App, flow: &Flow, @@ -572,10 +586,7 @@ async fn step_vec_create( chord: Arc, ) -> Result, Error> { let mut step_vec = vec![]; - let fake_case_id = Arc::new(CaseIdStruct::new( - stage, - "0".to_string(), - )); + let fake_case_id = Arc::new(CaseIdStruct::new(stage, "0".to_string())); for sid in step_id_vec { let mut arg = ArgStruct::new( app, @@ -595,12 +606,10 @@ async fn step_vec_create( } async fn case_run(flow_ctx: &dyn App, case_arg: CaseArgStruct) -> Box { - let cas = case::run(flow_ctx, case_arg) - .await; + let cas = case::run(flow_ctx, case_arg).await; Box::new(cas) } - async fn case_run_arc(flow_ctx: Arc, case_arg: CaseArgStruct) -> Box { CTX_ID .scope( diff --git a/input/Cargo.toml b/input/Cargo.toml index 9e4b9de5..9027ad1c 100644 --- a/input/Cargo.toml +++ b/input/Cargo.toml @@ -17,8 +17,8 @@ repository = "https://github.com/bit-ranger/chord" [dependencies] chord-core = { path = "../core", version = "0.1.22" } -csv = { version = "1.1.5" } -chrono = { version = "0.4.23", features = ["serde"] } +csv = { version = "1.2.1" } +chrono = { version = "0.4.26", features = ["serde"] } log = { version = "0.4.14", features = ["std"] } hocon = { version = "0.9.0", features = [] } thiserror = "1.0" \ No newline at end of file diff --git a/output/Cargo.toml b/output/Cargo.toml index 565c3c0c..4721775b 100644 --- a/output/Cargo.toml +++ b/output/Cargo.toml @@ -17,13 +17,13 @@ repository = "https://github.com/bit-ranger/chord" [dependencies] chord-core = { path = "../core", version = "0.1.22" } serde = { version = "1.0" } -chrono = { version = "0.4.23", features = ["serde"] } +chrono = { version = "0.4.26", features = ["serde"] } itertools = { version = "0.10.5" } log = { version = "0.4.14", features = ["std"] } -async-trait = "0.1.61" -futures = "0.3.25" -csv = { version = "1.1.5", optional = true } -reqwest = { version = "0.11.13", features = ['stream'], optional = true } +async-trait = "0.1.73" +futures = "0.3.27" +csv = { version = "1.2.1", optional = true } +reqwest = { version = "0.11.22", features = ['stream'], optional = true } thiserror = "1.0" [features] diff --git a/util/Cargo.toml b/util/Cargo.toml index 31164e4c..5c126e5b 100644 --- a/util/Cargo.toml +++ b/util/Cargo.toml @@ -17,7 +17,7 @@ repository = "https://github.com/bit-ranger/chord" [dependencies] chord-core = { path = "../core", version = "0.1.22" } serde = { version = "1.0" } -reqwest = { version = "0.11.13", features = ['stream'] } -futures = "0.3.25" +reqwest = { version = "0.11.22", features = ['stream'] } +futures = "0.3.27" log = { version = "0.4.14", features = ["std"] } thiserror = "1.0" \ No newline at end of file diff --git a/web/Cargo.toml b/web/Cargo.toml index 0386049d..4d59d122 100644 --- a/web/Cargo.toml +++ b/web/Cargo.toml @@ -23,23 +23,23 @@ chord-core = { path = "../core", version = "0.1.22" } chord-input = { path = "../input", version = "0.1.22" } chord-util = { path = "../util", version = "0.1.22" } -tokio = { version = "1.24", features = ["fs", "time", "tracing", "process", "macros"] } +tokio = { version = "1.26", features = ["fs", "time", "tracing", "process", "macros"] } serde = { version = "1.0" } -futures = "0.3.25" +futures = "0.3.27" itertools = "0.10.5" log = { version = "0.4.14", features = ["std"] } tracing = "0.1" tracing-subscriber = { version = "0.3.16", features = ['env-filter'] } tracing-appender = "0.2" flume = "0.10.14" -actix-web = "4.2.1" +actix-web = "4.3.1" validator = { version = "0.16", features = ["derive"] } lazy_static = "1.4.0" -url = "2.3.1" +url = "2.4.0" regex = "1.7.1" structopt = "0.3" -async-trait = "0.1.61" +async-trait = "0.1.73" bean = "0.1.4" -dirs = "4.0.0" +dirs = "5.0.1" thiserror = "1.0" -chrono = { version = "0.4.23", features = ["serde"] } \ No newline at end of file +chrono = { version = "0.4.26", features = ["serde"] } \ No newline at end of file