-
-
Notifications
You must be signed in to change notification settings - Fork 131
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
perf(PostgreSQL): ⚡ Postgres connection update, better error handling…
… and connection string accommodation. Used the pg package parser function to handle connection strings to lowering chances of errors. All other connection string will work here an example for ssl ```const args = "postgres://user:password@localhost:5432/db?&sslrootcert=./myCaCertificate.pem&sslcert=./myClientCertificate.pem&sslkey=./myPrivateClientKey.pem&ciphers=mytestcipher&ssl=true"``` for ssh these can be used ```ssh: false, sshHost: '', sshUser: '', sshPass: '', sshKey: '', sshPort: 22,``` no breaking changes
- Loading branch information
Showing
4 changed files
with
37 additions
and
136 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,110 +1,48 @@ | ||
import formatter from 'pg-connection-string'; // parses a connection string | ||
|
||
const getUrlScheme = pgString => { | ||
const scheme = pgString ? pgString.split('://')[0] : ''; | ||
|
||
return scheme === 'postgresql' ? 'postgres' : scheme; | ||
}; | ||
|
||
const passAndHost = part => { | ||
const host = part.split('@')[1] === 'localhost' ? '127.0.0.1' : part.split('@')[1]; | ||
return [part.split('@')[0], host]; | ||
}; | ||
|
||
const portAndDb = part => { | ||
return part.split('/'); | ||
}; | ||
|
||
const pass = (part) => { | ||
return part.split('@'); | ||
}; | ||
|
||
const hostAndDb = (part) => { | ||
return part.split('/'); | ||
}; | ||
|
||
const localConnectionString = (stringArgs, args) => { | ||
let scheme = ''; | ||
if (getUrlScheme(stringArgs) === 'postgres' || getUrlScheme(stringArgs) === 'postgresql') | ||
scheme = 'pg'; | ||
|
||
const values = stringArgs.split('://')[1]; | ||
const parts = values.split(':'); | ||
|
||
const userName = parts[0]; | ||
|
||
const password = passAndHost(parts[1])[0]; | ||
const host = passAndHost(parts[1])[1]; | ||
|
||
const port = portAndDb(parts[2])[0]; | ||
const dbName = portAndDb(parts[2])[1]; | ||
|
||
const client = args.client ? args.client : scheme; | ||
|
||
args.client = client; | ||
args.host = host; | ||
args.database = dbName; | ||
args.port = port; | ||
args.user = userName; | ||
args.password = password; | ||
|
||
return args; | ||
}; | ||
|
||
const onlineConnectionString = (stringArgs, args) => { | ||
let scheme = ''; | ||
const defaultPort = '5432'; | ||
if (getUrlScheme(stringArgs) === 'postgres' || getUrlScheme(stringArgs) === 'postgresql') | ||
scheme = 'pg'; | ||
|
||
const values = stringArgs.split('://')[1]; | ||
const parts = values.split(':'); | ||
|
||
const userName = parts[0]; | ||
|
||
const password = pass(parts[1])[0]; | ||
|
||
const host = hostAndDb(pass(parts[1])[1])[0]; | ||
const dbName = hostAndDb(pass(parts[1])[1])[1]; | ||
|
||
const port = defaultPort; | ||
|
||
const client = args.client ? args.client : scheme; | ||
|
||
args.client = client; | ||
args.host = host; | ||
args.database = dbName; | ||
args.port = port; | ||
args.user = userName; | ||
args.password = password; | ||
|
||
return args; | ||
const formatHost = host => { | ||
const results = host === 'localhost' ? '127.0.0.1' : host; | ||
return results; | ||
}; | ||
|
||
const connectionType = part => { | ||
return part.split('=')[1]; | ||
const checkForSSl = conn => { | ||
return conn.includes('ssl=true'); | ||
}; | ||
|
||
const connStringConstruct = args => { | ||
const connStringConstruct = (args) => { | ||
if (!args.pgConnString) | ||
return args; | ||
|
||
const pgConnString = args.pgConnString; | ||
|
||
if (!pgConnString.includes('?')) | ||
return localConnectionString(pgConnString, args); | ||
if (typeof args.pgConnString !== 'string') | ||
return args; | ||
|
||
const pgConnStringPrepared = pgConnString.split('?')[0]; | ||
const stringArgs = formatter.parse(args.pgConnString); | ||
|
||
switch (connectionType(pgConnString.split('?')[1])) { | ||
case 'local': | ||
return localConnectionString(pgConnStringPrepared, args); | ||
const client = args.client || 'pg'; | ||
|
||
case 'server': | ||
return onlineConnectionString(pgConnStringPrepared, args); | ||
args.client = client; | ||
args.host = formatHost(stringArgs.host); | ||
args.database = stringArgs.database; | ||
args.port = stringArgs.port || '5432'; | ||
args.user = stringArgs.user; | ||
args.password = stringArgs.password; | ||
|
||
// ssh | ||
args.ssh = stringArgs.ssh || args.ssh; | ||
args.sshHost = stringArgs.sshHost; | ||
args.sshUser = stringArgs.sshUser; | ||
args.sshPass = stringArgs.sshPass; | ||
args.sshKey = stringArgs.sshKey; | ||
args.sshPort = stringArgs.sshPort; | ||
|
||
// ssl mode | ||
args.ssl = checkForSSl(args.pgConnString); | ||
args.cert = stringArgs.sslcert; | ||
args.key = stringArgs.sslkey; | ||
args.ca = stringArgs.sslrootcert; | ||
args.ciphers = stringArgs.ciphers; | ||
|
||
default: | ||
return args; | ||
}; | ||
return args; | ||
}; | ||
|
||
export default connStringConstruct; |
This file was deleted.
Oops, something went wrong.