fix bad api calls copied original

Makefile

@@ -2,7 +2,6 @@ export CAROOT ?= $(shell cd dev ; go run filippo.io/mkcert -CAROOT)
 
 .PHONY: run
 run: dev/localhost.crt
-	@./gen_compose.sh
 	@docker-compose up --build --remove-orphans
 
 dev/localhost.crt:

moq-api/src/client.rs

@@ -18,20 +18,24 @@ impl Client {
 	pub fn new(url: Url, node:Url, original: bool) -> Self {
 		let client = reqwest::Client::new();
 		let parts:Vec<&str> = node.host_str().unwrap().split('.').collect();
-		log::debug!("{:?}",parts);
 
-		if parts.len() > 3 {
+		if parts.len() == 4 && !original {
 			Self { url: url.clone(), client, relayid:parts[3].to_string() , original }
 		} else {
-			log::info!("The hostname is not an IPv4 address. The specified API won't work.");
-			Self { url: url.clone(), client, relayid:"".to_string() , original:false }
+			log::info!("The hostname is not an IPv4 address. The specified API will not work.");
+			if original {
+				Self { url: url.clone(), client, relayid:"".to_string() , original:true }
+			}
+			else {
+					panic!("The hostname is an IPv4 address. But trying to use the specified API.");
+			}
 		}
 	}
 
 	pub async fn get_origin(&self, namespace: &str) -> Result<Option<Origin>, ApiError> {
 		let url;
 		if self.original {
-			url = self.url.join("origin/")?.join(namespace)?;
+			url = self.url.join(&format!("origin/{}", namespace))?;
 		}
 		else {
 			url = self.url.join(&format!("origin/{}/{}", self.relayid.to_string(), namespace))?;
@@ -48,11 +52,10 @@ impl Client {
 	pub async fn set_origin(&self, namespace: &str, origin: Origin) -> Result<(), ApiError> {
 		let url: Url;
 		if self.original {
-			 url = self.url.join("origin/")?.join(namespace)?;
+			url = self.url.join(&format!("origin/{}", namespace))?;
 		}
 		else {
-			let rest=self.relayid.clone().to_string()+"/"+namespace;
-			 url = self.url.join("origin/")?.join(&rest)?;
+			url = self.url.join(&format!("origin/{}/{}", self.relayid,namespace))?;
 		}
 
 
@@ -63,7 +66,7 @@ impl Client {
 	}
 
 	pub async fn delete_origin(&self, namespace: &str) -> Result<(), ApiError> {
-		let url = self.url.join("origin/")?.join(namespace)?;
+		let url = self.url.join(&format!("origin/{}", namespace))?;
 
 		let resp = self.client.delete(url).send().await?;
 		resp.error_for_status()?;
@@ -72,7 +75,7 @@ impl Client {
 	}
 
 	pub async fn patch_origin(&self, namespace: &str, origin: Origin) -> Result<(), ApiError> {
-		let url = self.url.join("origin/")?.join(namespace)?;
+		let url = self.url.join(&format!("origin/{}", namespace))?;
 
 		let resp = self.client.patch(url).json(&origin).send().await?;
 		resp.error_for_status()?;