Skip to content

Commit c51257b

Browse files
committed
fix(client/http/wasm): don't panic on no port
1 parent 7ea89b6 commit c51257b

File tree

1 file changed

+10
-11
lines changed
  • crates/hrpc/src/client/transport/http

1 file changed

+10
-11
lines changed

crates/hrpc/src/client/transport/http/wasm.rs

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -109,17 +109,16 @@ impl Service<BoxRequest> for Wasm {
109109
let scheme =
110110
map_scheme_to_ws(self.server.scheme_str().expect_throw("must have scheme"))
111111
.expect_throw("scheme can't be anything other than https or http");
112-
let url = format!(
113-
"{}://{}:{}/{}",
114-
scheme,
115-
self.server
116-
.host()
117-
.expect_throw("expected host on server URI, this is a bug"),
118-
self.server
119-
.port_u16()
120-
.expect_throw("expected port on server URI, this is a bug"),
121-
endpoint.trim_start_matches('/'),
122-
);
112+
let port = self
113+
.server
114+
.port()
115+
.map_or_else(String::new, |port| format!(":{}", port.as_str()));
116+
let host = self
117+
.server
118+
.host()
119+
.expect_throw("expected host on server URI, this is a bug");
120+
let path = endpoint.trim_start_matches('/');
121+
let url = format!("{}://{}{}/{}", scheme, host, port, path);
123122

124123
let sock_protocols = extensions
125124
.remove::<SocketProtocols>()

0 commit comments

Comments
 (0)