quick fix to gateway prober #153
Conversation
accept non-standard gateway json
| format!("http://{}", monitor_api_address) | ||
| }; | ||
|
|
||
| let u = monitor_api_address.parse::<http::Uri>() |
There was a problem hiding this comment.
Does this whole construction work? I don't remember if the path_and_query in the original was important... probably to strip any path components already present? But should be fine like this.
| @@ -199,6 +202,18 @@ async fn do_probing() -> Result<()> { | |||
| ))) | |||
| } | |||
| }; | |||
|
|
|||
| gateway_list = gateway_list | |||
| .into_iter() | |||
There was a problem hiding this comment.
You can merge this with the part above by just appending everything from .map to the closing curly brace of the match expression. That avoids the mutable binding, which is always nice.
Alternatively, if that doesn't look nice, something like this also works:
let a: Vec<String> = {
let mut a_mut = foo();
a_mut.into_iter().do_stuff().collect()
}This keeps the mutability inside the block.
| @@ -554,8 +569,11 @@ async fn probe_gateway( | |||
| num_tries: u32, | |||
| timeout: Duration, | |||
| ) -> Result<()> { | |||
| let mut url = Url::parse(gateway_url.replace(":hash", &cid).as_str())?; | |||
| let formatted_url = format!("{}/ipfs/{}", gateway_url, cid); | |||
There was a problem hiding this comment.
Oh, I see, they removed the placeholders in the official list.
For backwards compatibility, could you check if the placeholder is there and only append this if it's not? I have a bunch of code relying on the old format...
Changes (I think):
• Updated the gateway-list argument to support URLs for the JSON gateway list.
• Improved parsing of the monitor_api_address to ensure compatibility with addresses both with and without the http:// prefix.
• Automatically prepends http:// to the monitor_api_address if it’s missing.
• improved the logic for loading the gateway list by normalizing entries without an http or https scheme, automatically converting them to https by default.
• Fixed an issue where the :hash placeholder in the gateway URL was not properly replaced with the actual CID (content identifier). Now, the CID is correctly inserted into the URL.
There are probably more "Rusty" ways to do these things.