Skip to content

refactor: Use new URL for connection string parsing #1127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+46 −17
Open

refactor: Use new URL for connection string parsing #1127

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c3b168
refactor: Use new URL for connection string parsing
denghongcai Oct 12, 2025
5b6e7c7
fix: Correctly parse multi-host connection URLs
denghongcai Oct 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 46 additions & 17 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,9 +462,9 @@ function parseOptions(a, b) {
}

return {
host : Array.isArray(host) ? host : host.split(',').map(x => x.split(':')[0]),
port : Array.isArray(port) ? port : host.split(',').map(x => parseInt(x.split(':')[1] || port)),
path : o.path || host.indexOf('/') > -1 && host + '/.s.PGSQL.' + port,
host : Array.isArray(host) ? host : host.split(',').map(x => parseHost(x)),
port : Array.isArray(port) ? port : host.split(',').map(x => parsePort(x, port)),
path : o.path || (host.indexOf('/') > -1 && host + '/.s.PGSQL.' + port),
database : o.database || o.db || (url.pathname || '').slice(1) || env.PGDATABASE || user,
user : user,
pass : o.pass || o.password || url.password || env.PGPASSWORD || '',
Expand Down Expand Up @@ -533,27 +533,36 @@ function parseTransform(x) {
}
}

function parseUrl(url) {
if (!url || typeof url !== 'string')
function parseUrl(x) {
if (!x || typeof x !== 'string')
return { url: { searchParams: new Map() } }

let host = url
host = host.slice(host.indexOf('://') + 3).split(/[?/]/)[0]
host = decodeURIComponent(host.slice(host.indexOf('@') + 1))
let str = x.replace(/^postgres(ql)?:/, 'http:')
if (str.startsWith('http:') && !str.startsWith('http://')) {
str = 'http://' + str.substring(5);
}
let multihost = false

const hostPartMatch = str.match(/\/\/([^@/?#]*@)?([^/?#]+)/)
if (hostPartMatch && hostPartMatch[2].includes(',')) {
const hosts = hostPartMatch[2]
multihost = decodeURIComponent(hosts)
str = str.replace(hosts, hosts.split(',')[0])
}

const urlObj = new URL(url.replace(host, host.split(',')[0]))
const url = new URL(str)

return {
url: {
username: decodeURIComponent(urlObj.username),
password: decodeURIComponent(urlObj.password),
host: urlObj.host,
hostname: urlObj.hostname,
port: urlObj.port,
pathname: urlObj.pathname,
searchParams: urlObj.searchParams
username: decodeURIComponent(url.username),
password: decodeURIComponent(url.password),
host: url.host,
hostname: multihost ? multihost.split(',')[0] : url.hostname,
port: url.port,
pathname: url.pathname,
searchParams: url.searchParams
},
multihost: host.indexOf(',') > -1 && host
multihost: multihost
}
}

Expand All @@ -564,3 +573,23 @@ function osUsername() {
return process.env.USERNAME || process.env.USER || process.env.LOGNAME // eslint-disable-line
}
}

function parseHost(host) {
if (host.charAt(0) === '[')
return host.slice(1, -1)

if (host.includes(':') && host.split(':').length > 2)
return ''

return host.split(':')[0]
}

function parsePort(host, port) {
if (host.charAt(0) === '[' && host.includes(']:'))
return parseInt(host.split(']:')[1])

if (host.includes(':') && host.split(':').length === 2)
return parseInt(host.split(':')[1])

return parseInt(port)
}