Fix connection to neo4j when port is specified (#62)

* Fix connection to neo4j when port is specified

* Fix replacement of ipv6 in host

---------

Co-authored-by: hackolade-bot <[email protected]>

Author: Vitalii4as

reverse_engineering/escapeV6IPForURL.js

@@ -30,7 +30,9 @@ function escapeV6IpForURL({ host }) {
 		return host;
 	}
 
-	const urlWithIpV6HostRegExp = new RegExp(/^http(s)?:\/\/(?<unescapedIpWithPort>([a-z0-9]{0,4}:?)+)/gim);
+	const urlWithIpV6HostRegExp = new RegExp(
+		/^(http(s)?|(neo4j(\+s|s|)(\+ssc|ssc|))|bolt):\/\/(?<unescapedIpWithPort>([a-z0-9]{0,4}:?)+)/gim,
+	);
 	const { unescapedIpWithPort } = urlWithIpV6HostRegExp.exec(host)?.groups ?? {};
 
 	if (!unescapedIpWithPort) {
@@ -42,7 +44,13 @@ function escapeV6IpForURL({ host }) {
 	const port = separatedIpPortionsAndPort.at(-1);
 	const escapedIpWithPort = `[${ipPortions.join(':')}]:${port}`;
 
-	return host.replace(unescapedIpWithPort, escapedIpWithPort);
+	const replacedHost = host.replace(unescapedIpWithPort, escapedIpWithPort);
+
+	if (isValidURL(replacedHost)) {
+		return replacedHost;
+	}
+
+	return host.replace(unescapedIpWithPort, `[${unescapedIpWithPort}]`);
 }
 
 /**
@@ -54,7 +62,8 @@ function isValidURL(url) {
 		new URL(url);
 
 		return true;
-	} catch {
+	} catch (error) {
+		console.error(error);
 		return false;
 	}
 }

reverse_engineering/neo4jHelper.js

@@ -431,13 +431,13 @@ const getConnectionURI = info => {
 	if (neo4jProtocolRegex.test(info.host)) {
 		host = info.host;
 	} else {
-		host = `bolt://${escapeV6IpForURL({ host: info.host })}`;
+		host = `bolt://${info.host}`;
 	}
 	if (info.port) {
-		host = `${escapeV6IpForURL({ host: info.host })}:${info.port}`;
+		host = `${host}:${info.port}`;
 	}
 
-	return host;
+	return escapeV6IpForURL({ host });
 };
 
 module.exports = {