From c0420fe2fba842e0418591e3d072a445734378bb Mon Sep 17 00:00:00 2001 From: Niko PLP Date: Mon, 20 May 2024 10:35:51 +0300 Subject: [PATCH] removing all dependencies to git urls. they now have their own crate --- Cargo.lock | 305 +++++++++++++++++++--------------- ng-app/src-tauri/Cargo.toml | 2 +- ng-broker/Cargo.toml | 4 +- ng-broker/src/interfaces.rs | 6 +- ng-broker/src/server_ws.rs | 6 +- ng-client-ws/Cargo.toml | 2 +- ng-client-ws/src/remote_ws.rs | 8 +- ng-net/Cargo.toml | 4 +- ng-net/src/types.rs | 6 +- ng-verifier/Cargo.toml | 3 + 10 files changed, 196 insertions(+), 150 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2973f0e..72e8431 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -409,20 +409,6 @@ dependencies = [ "syn 2.0.58", ] -[[package]] -name = "async-tungstenite" -version = "0.22.2" -source = "git+https://git.nextgraph.org/NextGraph/async-tungstenite.git?branch=nextgraph#979de8e77d365af4630607dfdc721d5d9aeea42e" -dependencies = [ - "async-native-tls", - "async-std", - "futures-io", - "futures-util", - "log", - "pin-project-lite", - "tungstenite 0.19.0", -] - [[package]] name = "async_io_stream" version = "0.3.3" @@ -441,7 +427,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39991bc421ddf72f70159011b323ff49b0f783cc676a7287c59453da2e2531cf" dependencies = [ "atk-sys", - "bitflags", + "bitflags 1.3.2", "glib", "libc", ] @@ -555,7 +541,7 @@ version = "0.65.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cexpr", "clang-sys", "lazy_static", @@ -591,6 +577,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" + [[package]] name = "bitmaps" version = "2.1.0" @@ -758,7 +750,7 @@ version = "0.16.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3125b15ec28b84c238f6f476c6034016a5f6cc0221cb514ca46c532139fc97d" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cairo-sys-rs", "glib", "libc", @@ -981,7 +973,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "block", "cocoa-foundation", "core-foundation", @@ -997,7 +989,7 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" dependencies = [ - "bitflags", + "bitflags 1.3.2", "block", "cocoa-foundation", "core-foundation", @@ -1013,7 +1005,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "931d3837c286f56e3c58423ce4eba12d08db2374461a785c86f672b08b5650d6" dependencies = [ - "bitflags", + "bitflags 1.3.2", "block", "core-foundation", "core-graphics-types", @@ -1129,7 +1121,7 @@ version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-graphics-types", "foreign-types 0.3.2", @@ -1142,7 +1134,7 @@ version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-graphics-types", "foreign-types 0.5.0", @@ -1155,7 +1147,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "libc", ] @@ -1422,22 +1414,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f215f9b7224f49fb73256115331f677d868b34d18b65dbe4db392e6021eea90" -[[package]] -name = "default-net" -version = "0.16.2" -source = "git+https://git.nextgraph.org/NextGraph/default-net.git#a06134963af02c415fda83a9d270499118ff6570" -dependencies = [ - "dlopen2", - "libc", - "memalloc", - "netlink-packet-core", - "netlink-packet-route", - "netlink-sys", - "once_cell", - "system-configuration", - "windows", -] - [[package]] name = "derivative" version = "2.2.0" @@ -1991,7 +1967,7 @@ version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa9cb33da481c6c040404a11f8212d193889e9b435db2c14fd86987f630d3ce1" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cairo-rs", "gdk-pixbuf", "gdk-sys", @@ -2007,7 +1983,7 @@ version = "0.16.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3578c60dee9d029ad86593ed88cb40f35c1b83360e12498d055022385dd9a05" dependencies = [ - "bitflags", + "bitflags 1.3.2", "gdk-pixbuf-sys", "gio", "glib", @@ -2081,7 +2057,7 @@ dependencies = [ "libc", "log", "rustversion", - "windows", + "windows 0.48.0", ] [[package]] @@ -2152,7 +2128,7 @@ version = "0.16.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a1c84b4534a290a29160ef5c6eff2a9c95833111472e824fc5cb78b513dd092" dependencies = [ - "bitflags", + "bitflags 1.3.2", "futures-channel", "futures-core", "futures-io", @@ -2185,7 +2161,7 @@ version = "0.16.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16aa2475c9debed5a32832cb5ff2af5a3f9e1ab9e69df58eaadc1ab2004d6eba" dependencies = [ - "bitflags", + "bitflags 1.3.2", "futures-channel", "futures-core", "futures-executor", @@ -2286,7 +2262,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4d3507d43908c866c805f74c9dd593c0ce7ba5c38e576e41846639cdcd4bee6" dependencies = [ "atk", - "bitflags", + "bitflags 1.3.2", "cairo-rs", "field-offset", "futures-channel", @@ -2384,7 +2360,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" dependencies = [ "base64 0.13.1", - "bitflags", + "bitflags 1.3.2", "bytes", "headers-core", "http", @@ -2550,7 +2526,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows 0.48.0", ] [[package]] @@ -2724,7 +2700,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cfcc681b896b083864a4a3c3b3ea196f14ff66b8641a68fde209c6d84434056" dependencies = [ - "bitflags", + "bitflags 1.3.2", "glib", "javascriptcore-rs-sys", ] @@ -2814,7 +2790,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7668b7cff6a51fe61cdde64cd27c8a220786f399501b57ebe36f7d8112fd68" dependencies = [ - "bitflags", + "bitflags 1.3.2", "serde", "unicode-segmentation", ] @@ -2891,9 +2867,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.146" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libloading" @@ -3168,7 +3144,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" dependencies = [ - "bitflags", + "bitflags 1.3.2", "jni-sys", "ndk-sys", "num_enum", @@ -3191,6 +3167,23 @@ dependencies = [ "jni-sys", ] +[[package]] +name = "netdev" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea7fff9396e7c96a7f1ce778e91a00f0afb22337a6150ab50a22c15e0d902621" +dependencies = [ + "dlopen2", + "libc", + "memalloc", + "netlink-packet-core", + "netlink-packet-route", + "netlink-sys", + "once_cell", + "system-configuration", + "windows 0.54.0", +] + [[package]] name = "netlink-packet-core" version = "0.7.0" @@ -3209,7 +3202,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6de2fe935f44cbdfcab77dce2150d68eda75be715cd42d4d6f52b0bd4dcc5b1" dependencies = [ "anyhow", - "bitflags", + "bitflags 1.3.2", "byteorder", "libc", "netlink-packet-core", @@ -3272,8 +3265,8 @@ name = "ng-app" version = "0.1.0" dependencies = [ "async-std", - "async-tungstenite", "nextgraph", + "ng-async-tungstenite", "ng-net", "ng-repo", "ng-wallet", @@ -3285,18 +3278,32 @@ dependencies = [ "tauri-plugin-window", ] +[[package]] +name = "ng-async-tungstenite" +version = "0.22.2" +source = "git+https://git.nextgraph.org/NextGraph/async-tungstenite.git?branch=nextgraph#13de4e36436cdfcb0d2cbe7d21995ff4072faf30" +dependencies = [ + "async-native-tls", + "async-std", + "futures-io", + "futures-util", + "log", + "ng-tungstenite", + "pin-project-lite", +] + [[package]] name = "ng-broker" version = "0.1.0" dependencies = [ "async-std", "async-trait", - "async-tungstenite", "blake3", - "default-net", "either", "futures", "getrandom 0.2.10", + "netdev", + "ng-async-tungstenite", "ng-client-ws", "ng-net", "ng-repo", @@ -3316,10 +3323,10 @@ version = "0.1.0" dependencies = [ "async-std", "async-trait", - "async-tungstenite", "either", "futures", "getrandom 0.2.10", + "ng-async-tungstenite", "ng-net", "ng-repo", "pharos", @@ -3336,14 +3343,14 @@ dependencies = [ "async-recursion", "async-std", "async-trait", - "async-tungstenite", "base64-url", - "default-net", "ed25519-dalek", "either", "futures", "getrandom 0.2.10", "lazy_static", + "netdev", + "ng-async-tungstenite", "ng-repo", "noise-protocol", "noise-rust-crypto", @@ -3382,7 +3389,7 @@ dependencies = [ "serde", "sha1", "sha2 0.10.7", - "siphasher 0.3.10", + "siphasher 1.0.1", "thiserror", "zstd", ] @@ -3470,6 +3477,25 @@ dependencies = [ "serde_bare", ] +[[package]] +name = "ng-tungstenite" +version = "0.19.0" +source = "git+https://git.nextgraph.org/NextGraph/tungstenite-rs.git?branch=nextgraph#8788a92cec247e058fe69a883838190497129710" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http", + "httparse", + "log", + "native-tls", + "rand 0.8.5", + "sha1", + "thiserror", + "url", + "utf-8", +] + [[package]] name = "ng-verifier" version = "0.1.0-alpha" @@ -3601,7 +3627,7 @@ version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", "memoffset 0.7.1", @@ -3791,7 +3817,7 @@ version = "0.10.55" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "foreign-types 0.3.2", "libc", @@ -3931,7 +3957,7 @@ version = "0.16.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdff66b271861037b89d028656184059e03b0b6ccb36003820be19f7200b1e94" dependencies = [ - "bitflags", + "bitflags 1.3.2", "gio", "glib", "libc", @@ -4246,7 +4272,7 @@ version = "0.17.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crc32fast", "fdeflate", "flate2", @@ -4260,7 +4286,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ "autocfg", - "bitflags", + "bitflags 1.3.2", "cfg-if", "concurrent-queue", "libc", @@ -4547,7 +4573,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -4556,7 +4582,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -4713,7 +4739,7 @@ version = "0.37.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", @@ -4799,7 +4825,7 @@ version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -4822,7 +4848,7 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cssparser", "derive_more", "fxhash", @@ -5170,7 +5196,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82bc46048125fefd69d30b32b9d263d6556c9ffe82a7a7df181a86d912da5616" dependencies = [ - "bitflags", + "bitflags 1.3.2", "futures-channel", "gio", "glib", @@ -5307,20 +5333,20 @@ dependencies = [ [[package]] name = "system-configuration" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +checksum = "658bc6ee10a9b4fcf576e9b0819d95ec16f4d2c02d39fd83ac1c8789785c4a42" dependencies = [ - "bitflags", + "bitflags 2.5.0", "core-foundation", "system-configuration-sys", ] [[package]] name = "system-configuration-sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" dependencies = [ "core-foundation-sys", "libc", @@ -5345,7 +5371,7 @@ version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f76221bce9db3af6b2b9cca4e92d8ea46c4cc88d785bc4b1a5cbcaab06f0b56" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cairo-rs", "cc", "cocoa 0.24.1", @@ -5382,7 +5408,7 @@ dependencies = [ "unicode-segmentation", "url", "uuid", - "windows", + "windows 0.48.0", "windows-implement", "x11-dl", "zbus", @@ -5451,7 +5477,7 @@ dependencies = [ "uuid", "webkit2gtk", "webview2-com", - "windows", + "windows 0.48.0", ] [[package]] @@ -5542,7 +5568,7 @@ dependencies = [ "thiserror", "url", "uuid", - "windows", + "windows 0.48.0", ] [[package]] @@ -5563,7 +5589,7 @@ dependencies = [ "uuid", "webkit2gtk", "webview2-com", - "windows", + "windows 0.48.0", "wry", ] @@ -5593,7 +5619,7 @@ dependencies = [ "thiserror", "url", "walkdir", - "windows", + "windows 0.48.0", ] [[package]] @@ -5839,7 +5865,7 @@ dependencies = [ "futures-util", "log", "tokio", - "tungstenite 0.18.0", + "tungstenite", ] [[package]] @@ -6012,25 +6038,6 @@ dependencies = [ "utf-8", ] -[[package]] -name = "tungstenite" -version = "0.19.0" -source = "git+https://git.nextgraph.org/NextGraph/tungstenite-rs.git?branch=nextgraph#3961996e6d0e50281a0ec5654df400b46d01f1a2" -dependencies = [ - "byteorder", - "bytes", - "data-encoding", - "http", - "httparse", - "log", - "native-tls", - "rand 0.8.5", - "sha1", - "thiserror", - "url", - "utf-8", -] - [[package]] name = "typenum" version = "1.16.0" @@ -6411,7 +6418,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ba4cce9085e0fb02575cfd45c328740dde78253cba516b1e8be2ca0f57bd8bf" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cairo-rs", "gdk", "gdk-sys", @@ -6435,7 +6442,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4489eb24e8cf0a3d0555fd3a8f7adec2a5ece34c1e7b7c9a62da7822fd40a59" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cairo-sys-rs", "gdk-sys", "gio-sys", @@ -6457,7 +6464,7 @@ checksum = "79e563ffe8e84d42e43ffacbace8780c0244fc8910346f334613559d92e203ad" dependencies = [ "webview2-com-macros", "webview2-com-sys", - "windows", + "windows 0.48.0", "windows-implement", "windows-interface", ] @@ -6483,7 +6490,7 @@ dependencies = [ "serde", "serde_json", "thiserror", - "windows", + "windows 0.48.0", "windows-bindgen", "windows-metadata", ] @@ -6536,6 +6543,16 @@ dependencies = [ "windows-targets 0.48.0", ] +[[package]] +name = "windows" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" +dependencies = [ + "windows-core", + "windows-targets 0.52.5", +] + [[package]] name = "windows-bindgen" version = "0.48.0" @@ -6546,6 +6563,16 @@ dependencies = [ "windows-tokens", ] +[[package]] +name = "windows-core" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" +dependencies = [ + "windows-result", + "windows-targets 0.52.5", +] + [[package]] name = "windows-implement" version = "0.48.0" @@ -6574,6 +6601,15 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "422ee0e5f0e2cc372bb6addbfff9a8add712155cd743df9c15f6ab000f31432d" +[[package]] +name = "windows-result" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "749f0da9cc72d82e600d8d2e44cadd0b9eedb9038f71a1c58556ac1c5791813b" +dependencies = [ + "windows-targets 0.52.5", +] + [[package]] name = "windows-sys" version = "0.45.0" @@ -6598,7 +6634,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -6633,17 +6669,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -6666,9 +6703,9 @@ checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -6684,9 +6721,9 @@ checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -6702,9 +6739,15 @@ checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -6720,9 +6763,9 @@ checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -6738,9 +6781,9 @@ checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -6756,9 +6799,9 @@ checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -6774,9 +6817,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" @@ -6841,7 +6884,7 @@ dependencies = [ "webkit2gtk", "webkit2gtk-sys", "webview2-com", - "windows", + "windows 0.48.0", "windows-implement", ] diff --git a/ng-app/src-tauri/Cargo.toml b/ng-app/src-tauri/Cargo.toml index b83c28c..8db8c84 100644 --- a/ng-app/src-tauri/Cargo.toml +++ b/ng-app/src-tauri/Cargo.toml @@ -28,7 +28,7 @@ serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" serde_bytes = "0.11.7" async-std = { version = "1.12.0", features = ["attributes", "unstable"] } -async-tungstenite = { git = "https://git.nextgraph.org/NextGraph/async-tungstenite.git", branch = "nextgraph", features = ["async-std-runtime", "async-native-tls"] } +ng-async-tungstenite = { git = "https://git.nextgraph.org/NextGraph/async-tungstenite.git", branch = "nextgraph", features = ["async-std-runtime", "async-native-tls"] } tauri = { version = "2.0.0-alpha.14", features = [] } tauri-plugin-window = "2.0.0-alpha.1" # tauri-plugin-window = { git = "https://git.nextgraph.org/NextGraph/plugins-workspace.git", branch="window-alpha.1-nextgraph" } diff --git a/ng-broker/Cargo.toml b/ng-broker/Cargo.toml index 6103e22..41e848c 100644 --- a/ng-broker/Cargo.toml +++ b/ng-broker/Cargo.toml @@ -25,7 +25,7 @@ either = { version = "1.8.1", features=["serde"] } async-std = { version = "1.12.0", features = ["attributes"] } async-trait = "0.1.64" rust-embed= { version = "6.7.0", features=["include-exclude"] } -async-tungstenite = { version = "0.22.2", git = "https://git.nextgraph.org/NextGraph/async-tungstenite.git", branch = "nextgraph", features = ["async-std-runtime"] } +ng-async-tungstenite = { version = "0.22.2", git = "https://git.nextgraph.org/NextGraph/async-tungstenite.git", branch = "nextgraph", features = ["async-std-runtime"] } blake3 = "1.3.1" ng-repo = { path = "../ng-repo", version = "0.1.0" } ng-net = { path = "../ng-net", version = "0.1.0" } @@ -39,7 +39,7 @@ features = ["js"] [target.'cfg(not(target_arch = "wasm32"))'.dependencies] getrandom = "0.2.7" -default-net = { version = "0.16.2", git = "https://git.nextgraph.org/NextGraph/default-net.git" } +netdev = "0.26" [dev-dependencies] tempfile = "3" \ No newline at end of file diff --git a/ng-broker/src/interfaces.rs b/ng-broker/src/interfaces.rs index 1c8ad7d..044ad61 100644 --- a/ng-broker/src/interfaces.rs +++ b/ng-broker/src/interfaces.rs @@ -12,11 +12,11 @@ use ng_net::types::{Interface, InterfaceType}; use ng_net::utils::{is_ipv4_private, is_public_ipv4}; #[cfg(not(target_arch = "wasm32"))] -pub fn print_ipv4(ip: &default_net::ip::Ipv4Net) -> String { +pub fn print_ipv4(ip: &netdev::ip::Ipv4Net) -> String { format!("{}/{}", ip.addr, ip.prefix_len) } #[cfg(not(target_arch = "wasm32"))] -pub fn print_ipv6(ip: &default_net::ip::Ipv6Net) -> String { +pub fn print_ipv6(ip: &netdev::ip::Ipv6Net) -> String { format!("{}/{}", ip.addr, ip.prefix_len) } @@ -54,7 +54,7 @@ pub fn find_name(list: &Vec, name: &String) -> Option { #[cfg(not(target_arch = "wasm32"))] pub fn get_interface() -> Vec { let mut res: Vec = vec![]; - let interfaces = default_net::get_interfaces(); + let interfaces = netdev::get_interfaces(); for interface in interfaces { if interface.ipv4.len() > 0 { let first_v4 = interface.ipv4[0].addr; diff --git a/ng-broker/src/server_ws.rs b/ng-broker/src/server_ws.rs index d1b2568..302e29e 100644 --- a/ng-broker/src/server_ws.rs +++ b/ng-broker/src/server_ws.rs @@ -23,11 +23,11 @@ use rust_embed::RustEmbed; use serde_json::json; use async_std::net::{TcpListener, TcpStream}; -use async_tungstenite::accept_hdr_async; -use async_tungstenite::tungstenite::handshake::server::{ +use ng_async_tungstenite::accept_hdr_async; +use ng_async_tungstenite::tungstenite::handshake::server::{ Callback, ErrorResponse, Request, Response, }; -use async_tungstenite::tungstenite::http::{ +use ng_async_tungstenite::tungstenite::http::{ header::{CONNECTION, HOST, ORIGIN}, HeaderValue, Method, StatusCode, Uri, Version, }; diff --git a/ng-client-ws/Cargo.toml b/ng-client-ws/Cargo.toml index 6578a9b..e69cb60 100644 --- a/ng-client-ws/Cargo.toml +++ b/ng-client-ws/Cargo.toml @@ -35,4 +35,4 @@ features = ["js"] [target.'cfg(not(target_arch = "wasm32"))'.dependencies] getrandom = "0.2.7" -async-tungstenite = { version = "0.22.2", git = "https://git.nextgraph.org/NextGraph/async-tungstenite.git", branch = "nextgraph", features = ["async-std-runtime"] } +ng-async-tungstenite = { version = "0.22.2", git = "https://git.nextgraph.org/NextGraph/async-tungstenite.git", branch = "nextgraph", features = ["async-std-runtime"] } diff --git a/ng-client-ws/src/remote_ws.rs b/ng-client-ws/src/remote_ws.rs index 97d0698..edc3f59 100644 --- a/ng-client-ws/src/remote_ws.rs +++ b/ng-client-ws/src/remote_ws.rs @@ -12,14 +12,14 @@ //! WebSocket Remote Connection to a Broker use async_std::task; -use async_tungstenite::{ +use either::Either; +use futures::{pin_mut, select, StreamExt}; +use futures::{FutureExt, SinkExt}; +use ng_async_tungstenite::{ async_std::{connect_async, ConnectStream}, tungstenite::{protocol::frame::coding::CloseCode, protocol::CloseFrame, Message}, WebSocketStream, }; -use either::Either; -use futures::{pin_mut, select, StreamExt}; -use futures::{FutureExt, SinkExt}; use ng_repo::errors::*; use ng_repo::log::*; diff --git a/ng-net/Cargo.toml b/ng-net/Cargo.toml index cc79228..ad969d3 100644 --- a/ng-net/Cargo.toml +++ b/ng-net/Cargo.toml @@ -47,7 +47,7 @@ features = ["js"] [target.'cfg(not(target_arch = "wasm32"))'.dependencies] getrandom = "0.2.7" -default-net = { version = "0.16.2", git = "https://git.nextgraph.org/NextGraph/default-net.git" } +netdev = "0.26" [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies] -async-tungstenite = { version = "0.22.2", git = "https://git.nextgraph.org/NextGraph/async-tungstenite.git", branch = "nextgraph", features = ["async-std-runtime", "async-native-tls"] } \ No newline at end of file +ng-async-tungstenite = { version = "0.22.2", git = "https://git.nextgraph.org/NextGraph/async-tungstenite.git", branch = "nextgraph", features = ["async-std-runtime", "async-native-tls"] } \ No newline at end of file diff --git a/ng-net/src/types.rs b/ng-net/src/types.rs index c4d8e3a..fbb97fb 100644 --- a/ng-net/src/types.rs +++ b/ng-net/src/types.rs @@ -109,11 +109,11 @@ impl InterfaceType { pub struct Interface { pub if_type: InterfaceType, pub name: String, - pub mac_addr: Option, + pub mac_addr: Option, /// List of Ipv4Net for the network interface - pub ipv4: Vec, + pub ipv4: Vec, /// List of Ipv6Net for the network interface - pub ipv6: Vec, + pub ipv6: Vec, } /// Bind address diff --git a/ng-verifier/Cargo.toml b/ng-verifier/Cargo.toml index c326797..26dc2b8 100644 --- a/ng-verifier/Cargo.toml +++ b/ng-verifier/Cargo.toml @@ -34,6 +34,9 @@ ng-repo = { path = "../ng-repo", version = "0.1.0" } ng-net = { path = "../ng-net", version = "0.1.0" } ng-oxigraph = { path = "../ng-oxigraph", version = "0.4.0-alpha.9-ng" } +[target.'cfg(target_arch = "wasm32")'.dependencies] +ng-oxigraph = { path = "../ng-oxigraph", version = "0.4.0-alpha.9-ng", features = ["js"] } + [target.'cfg(not(target_arch = "wasm32"))'.dependencies] ng-storage-rocksdb = { path = "../ng-storage-rocksdb", version = "0.1.0" } getrandom = "0.2.7"