NextGraph
/
nextgraph-rs
1
2
Fork 0
Code Issues 1 Pull Requests Packages Projects 2 Releases 3 Activity

temporarly removing reqwest to test on openbsd

Browse Source
pull/19/head
Niko PLP 1 year ago
parent bce94d8e9c
commit dce163bfda
4 changed files with 58 additions and 156 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 120
      Cargo.lock
  2. 2
      p2p-net/Cargo.toml
  3. 52
      p2p-net/src/types.rs
  4. 36
      p2p-net/src/utils.rs

120
Cargo.lock generated
Unescape View File

@ -153,7 +153,7 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
dependencies = [ dependencies = [
"windows-sys 0.48.0", "windows-sys",
] ]
[[package]] [[package]]
@ -163,7 +163,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188"
dependencies = [ dependencies = [
"anstyle", "anstyle",
"windows-sys 0.48.0", "windows-sys",
] ]
[[package]] [[package]]
@ -324,7 +324,7 @@ dependencies = [
"futures-lite", "futures-lite",
"rustix", "rustix",
"signal-hook", "signal-hook",
"windows-sys 0.48.0", "windows-sys",
] ]
[[package]] [[package]]
@ -1410,7 +1410,7 @@ checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
dependencies = [ dependencies = [
"errno-dragonfly", "errno-dragonfly",
"libc", "libc",
"windows-sys 0.48.0", "windows-sys",
] ]
[[package]] [[package]]
@ -2206,19 +2206,6 @@ dependencies = [
"want", "want",
] ]
[[package]]
name = "hyper-tls"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
dependencies = [
"bytes",
"hyper",
"native-tls",
"tokio",
"tokio-native-tls",
]
[[package]] [[package]]
name = "iana-time-zone" name = "iana-time-zone"
version = "0.1.57" version = "0.1.57"
@ -2339,7 +2326,7 @@ checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
dependencies = [ dependencies = [
"hermit-abi 0.3.1", "hermit-abi 0.3.1",
"libc", "libc",
"windows-sys 0.48.0", "windows-sys",
] ]
[[package]] [[package]]
@ -2357,7 +2344,7 @@ dependencies = [
"hermit-abi 0.3.1", "hermit-abi 0.3.1",
"io-lifetimes", "io-lifetimes",
"rustix", "rustix",
"windows-sys 0.48.0", "windows-sys",
] ]
[[package]] [[package]]
@ -2725,7 +2712,7 @@ checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
dependencies = [ dependencies = [
"libc", "libc",
"wasi 0.11.0+wasi-snapshot-preview1", "wasi 0.11.0+wasi-snapshot-preview1",
"windows-sys 0.48.0", "windows-sys",
] ]
[[package]] [[package]]
@ -2755,24 +2742,6 @@ dependencies = [
"getrandom 0.2.10", "getrandom 0.2.10",
] ]
[[package]]
name = "native-tls"
version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
dependencies = [
"lazy_static",
"libc",
"log",
"openssl",
"openssl-probe",
"openssl-sys",
"schannel",
"security-framework",
"security-framework-sys",
"tempfile",
]
[[package]] [[package]]
name = "ndk" name = "ndk"
version = "0.6.0" version = "0.6.0"
@ -3200,12 +3169,6 @@ dependencies = [
"syn 2.0.18", "syn 2.0.18",
] ]
[[package]]
name = "openssl-probe"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
[[package]] [[package]]
name = "openssl-src" name = "openssl-src"
version = "111.26.0+1.1.1u" version = "111.26.0+1.1.1u"
@ -3313,7 +3276,6 @@ dependencies = [
"num_enum", "num_enum",
"once_cell", "once_cell",
"p2p-repo", "p2p-repo",
"reqwest",
"serde", "serde",
"serde_bare", "serde_bare",
"serde_bytes", "serde_bytes",
@ -3648,7 +3610,7 @@ dependencies = [
"libc", "libc",
"log", "log",
"pin-project-lite", "pin-project-lite",
"windows-sys 0.48.0", "windows-sys",
] ]
[[package]] [[package]]
@ -4000,12 +3962,10 @@ dependencies = [
"http", "http",
"http-body", "http-body",
"hyper", "hyper",
"hyper-tls",
"ipnet", "ipnet",
"js-sys", "js-sys",
"log", "log",
"mime", "mime",
"native-tls",
"once_cell", "once_cell",
"percent-encoding", "percent-encoding",
"pin-project-lite", "pin-project-lite",
@ -4013,7 +3973,6 @@ dependencies = [
"serde_json", "serde_json",
"serde_urlencoded", "serde_urlencoded",
"tokio", "tokio",
"tokio-native-tls",
"tokio-util", "tokio-util",
"tower-service", "tower-service",
"url", "url",
@ -4126,7 +4085,7 @@ dependencies = [
"io-lifetimes", "io-lifetimes",
"libc", "libc",
"linux-raw-sys", "linux-raw-sys",
"windows-sys 0.48.0", "windows-sys",
] ]
[[package]] [[package]]
@ -4180,15 +4139,6 @@ dependencies = [
"winapi-util", "winapi-util",
] ]
[[package]]
name = "schannel"
version = "0.1.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3"
dependencies = [
"windows-sys 0.42.0",
]
[[package]] [[package]]
name = "scoped-tls" name = "scoped-tls"
version = "1.0.1" version = "1.0.1"
@ -4201,29 +4151,6 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
name = "security-framework"
version = "2.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8"
dependencies = [
"bitflags",
"core-foundation",
"core-foundation-sys",
"libc",
"security-framework-sys",
]
[[package]]
name = "security-framework-sys"
version = "2.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7"
dependencies = [
"core-foundation-sys",
"libc",
]
[[package]] [[package]]
name = "selectors" name = "selectors"
version = "0.22.0" version = "0.22.0"
@ -4993,7 +4920,7 @@ dependencies = [
"fastrand", "fastrand",
"redox_syscall 0.3.5", "redox_syscall 0.3.5",
"rustix", "rustix",
"windows-sys 0.48.0", "windows-sys",
] ]
[[package]] [[package]]
@ -5138,7 +5065,7 @@ dependencies = [
"signal-hook-registry", "signal-hook-registry",
"socket2", "socket2",
"tokio-macros", "tokio-macros",
"windows-sys 0.48.0", "windows-sys",
] ]
[[package]] [[package]]
@ -5152,16 +5079,6 @@ dependencies = [
"syn 2.0.18", "syn 2.0.18",
] ]
[[package]]
name = "tokio-native-tls"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
dependencies = [
"native-tls",
"tokio",
]
[[package]] [[package]]
name = "tokio-stream" name = "tokio-stream"
version = "0.1.14" version = "0.1.14"
@ -5901,21 +5818,6 @@ version = "0.44.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ee78911e3f4ce32c1ad9d3c7b0bd95389662ad8d8f1a3155688fed70bd96e2b6" checksum = "ee78911e3f4ce32c1ad9d3c7b0bd95389662ad8d8f1a3155688fed70bd96e2b6"
[[package]]
name = "windows-sys"
version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
dependencies = [
"windows_aarch64_gnullvm 0.42.2",
"windows_aarch64_msvc 0.42.2",
"windows_i686_gnu 0.42.2",
"windows_i686_msvc 0.42.2",
"windows_x86_64_gnu 0.42.2",
"windows_x86_64_gnullvm 0.42.2",
"windows_x86_64_msvc 0.42.2",
]
[[package]] [[package]]
name = "windows-sys" name = "windows-sys"
version = "0.48.0" version = "0.48.0"

2
p2p-net/Cargo.toml
Unescape View File

@ -25,7 +25,7 @@ noise-protocol = "0.2.0-rc1"
noise-rust-crypto = "0.6.0-rc.1" noise-rust-crypto = "0.6.0-rc.1"
ed25519-dalek = "1.0.1" ed25519-dalek = "1.0.1"
either = "1.8.1" either = "1.8.1"
reqwest = { version = "0.11.18", features = ["json"] } # reqwest = { version = "0.11.18", features = ["json"] }
#,"native-tls-vendored" #,"native-tls-vendored"
url = "2.4.0" url = "2.4.0"
base64-url = "2.0.0" base64-url = "2.0.0"

52
p2p-net/src/types.rs
Unescape View File

@ -367,18 +367,18 @@ impl BrokerServerV0 {
) )
} }
BrokerServerTypeV0::BoxPublicDyn(addrs) => { BrokerServerTypeV0::BoxPublicDyn(addrs) => {
let resp = reqwest::get(api_dyn_peer_url(&self.peer_id)).await; // let resp = reqwest::get(api_dyn_peer_url(&self.peer_id)).await;
if resp.is_ok() { // if resp.is_ok() {
let resp = resp.unwrap().json::<Vec<BindAddress>>().await; // let resp = resp.unwrap().json::<Vec<BindAddress>>().await;
if resp.is_ok() { // if resp.is_ok() {
return Self::app_ng_one_bootstrap_url_with_first_ipv6_or_ipv4( // return Self::app_ng_one_bootstrap_url_with_first_ipv6_or_ipv4(
ipv4, // ipv4,
ipv6, // ipv6,
&resp.unwrap(), // &resp.unwrap(),
self.peer_id, // self.peer_id,
); // );
} // }
} // }
if addrs.len() > 0 { if addrs.len() > 0 {
Self::app_ng_one_bootstrap_url_with_first_ipv6_or_ipv4( Self::app_ng_one_bootstrap_url_with_first_ipv6_or_ipv4(
ipv4, ipv4,
@ -436,13 +436,13 @@ impl BrokerServerV0 {
Some((APP_NG_ONE_WS_URL.to_string(), addrs.clone())) Some((APP_NG_ONE_WS_URL.to_string(), addrs.clone()))
} }
BrokerServerTypeV0::BoxPublicDyn(addrs) => { BrokerServerTypeV0::BoxPublicDyn(addrs) => {
let resp = reqwest::get(api_dyn_peer_url(&self.peer_id)).await; // let resp = reqwest::get(api_dyn_peer_url(&self.peer_id)).await;
if resp.is_ok() { // if resp.is_ok() {
let resp = resp.unwrap().json::<Vec<BindAddress>>().await; // let resp = resp.unwrap().json::<Vec<BindAddress>>().await;
if resp.is_ok() { // if resp.is_ok() {
return Some((APP_NG_ONE_WS_URL.to_string(), resp.unwrap())); // return Some((APP_NG_ONE_WS_URL.to_string(), resp.unwrap()));
} // }
} // }
if addrs.len() > 0 { if addrs.len() > 0 {
Some((APP_NG_ONE_WS_URL.to_string(), addrs.clone())) Some((APP_NG_ONE_WS_URL.to_string(), addrs.clone()))
} else { } else {
@ -503,13 +503,13 @@ impl BrokerServerV0 {
BrokerServerTypeV0::BoxPrivate(addrs) => Some((String::new(), addrs.clone())), BrokerServerTypeV0::BoxPrivate(addrs) => Some((String::new(), addrs.clone())),
BrokerServerTypeV0::BoxPublic(addrs) => Some((String::new(), addrs.clone())), BrokerServerTypeV0::BoxPublic(addrs) => Some((String::new(), addrs.clone())),
BrokerServerTypeV0::BoxPublicDyn(addrs) => { BrokerServerTypeV0::BoxPublicDyn(addrs) => {
let resp = reqwest::get(api_dyn_peer_url(&self.peer_id)).await; // let resp = reqwest::get(api_dyn_peer_url(&self.peer_id)).await;
if resp.is_ok() { // if resp.is_ok() {
let resp = resp.unwrap().json::<Vec<BindAddress>>().await; // let resp = resp.unwrap().json::<Vec<BindAddress>>().await;
if resp.is_ok() { // if resp.is_ok() {
return Some((String::new(), resp.unwrap())); // return Some((String::new(), resp.unwrap()));
} // }
} // }
if addrs.len() > 0 { if addrs.len() > 0 {
Some((String::new(), addrs.clone())) Some((String::new(), addrs.clone()))
} else { } else {

36
p2p-net/src/utils.rs
Unescape View File

@ -116,13 +116,13 @@ pub fn check_is_local_url(bootstrap: &BrokerServerV0, location: &String) -> Opti
pub async fn retrieve_local_url(location: String) -> Option<String> { pub async fn retrieve_local_url(location: String) -> Option<String> {
let bootstraps: BootstrapContent = { let bootstraps: BootstrapContent = {
let resp = reqwest::get(format!("{}{}", APP_PREFIX, NG_BOOTSTRAP_LOCAL_PATH)).await; // let resp = reqwest::get(format!("{}{}", APP_PREFIX, NG_BOOTSTRAP_LOCAL_PATH)).await;
if resp.is_ok() { // if resp.is_ok() {
let resp = resp.unwrap().json::<BootstrapContent>().await; // let resp = resp.unwrap().json::<BootstrapContent>().await;
resp.unwrap() // resp.unwrap()
} else { // } else {
return None; return None;
} // }
}; };
for bootstrap in bootstraps.servers() { for bootstrap in bootstraps.servers() {
let res = check_is_local_url(bootstrap, &location); let res = check_is_local_url(bootstrap, &location);
@ -148,19 +148,19 @@ pub async fn retrieve_local_bootstrap(
log_debug!("invite_String {:?} invite1{:?}", invite_string, invite1); log_debug!("invite_String {:?} invite1{:?}", invite_string, invite1);
let invite2: Option<Invitation> = { let invite2: Option<Invitation> = {
let resp = reqwest::get(format!("{}{}", APP_PREFIX, NG_BOOTSTRAP_LOCAL_PATH)).await; // let resp = reqwest::get(format!("{}{}", APP_PREFIX, NG_BOOTSTRAP_LOCAL_PATH)).await;
if resp.is_ok() { // if resp.is_ok() {
let resp = resp.unwrap().json::<BootstrapContent>().await; // let resp = resp.unwrap().json::<BootstrapContent>().await;
if resp.is_ok() { // if resp.is_ok() {
let mut inv: Invitation = resp.unwrap().into(); // let mut inv: Invitation = resp.unwrap().into();
inv.set_url(BROKER.read().await.get_registration_url()); // inv.set_url(BROKER.read().await.get_registration_url());
Some(inv) // Some(inv)
} else { // } else {
// None
// }
// } else {
None None
} //}
} else {
None
}
}; };
let res = if invite1.is_none() { let res = if invite1.is_none() {

Write Preview
Loading…
Cancel
Save