From 6015849e4b7e86311ae64ce1c41f24c7e71b0f49 Mon Sep 17 00:00:00 2001
From: "Taro L. Saito" <leo@xerial.org>
Date: Thu, 7 May 2020 17:40:53 -0700
Subject: [PATCH] airframe-http: Handle when port number is empty string
 (#1060)

---
 .../src/main/scala/wvlet/airframe/http/js/JSHttpClient.scala  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/airframe-http/.js/src/main/scala/wvlet/airframe/http/js/JSHttpClient.scala b/airframe-http/.js/src/main/scala/wvlet/airframe/http/js/JSHttpClient.scala
index b52ca4f2c5..085cd8914d 100644
--- a/airframe-http/.js/src/main/scala/wvlet/airframe/http/js/JSHttpClient.scala
+++ b/airframe-http/.js/src/main/scala/wvlet/airframe/http/js/JSHttpClient.scala
@@ -47,8 +47,8 @@ object JSHttpClient {
       // Use local client for testing
       localClient
     } else {
-      val port    = window.location.port.toInt
-      val address = ServerAddress(hostname, port, protocol)
+      val port    = Option(window.location.port).map(x => if (x.isEmpty) "" else s":${x}").getOrElse("")
+      val address = ServerAddress(s"${protocol}://${hostname}${port}")
       JSHttpClient(JSHttpClientConfig(serverAddress = Some(address)))
     }
   }