hiro/autossh
1
0
Fork 0
mirror of https://github.com/vale981/autossh synced 2025-03-04 17:01:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

allows port configs to be in number or string form

Browse source
This commit is contained in:
samueleaton 2016-05-06 22:28:03 -06:00
parent e94af46fd8
commit 104f6728bc
2 changed files with 37 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
index.js
View file

@ -49,8 +49,7 @@ var AutoSSH = function (_EventEmitter) {
_this.serverAliveCountMax = typeof conf.serverAliveCountMax === 'number' ? conf.serverAliveCountMax : 1;
_this.sshPort = typeof conf.sshPort === 'number' ? conf.sshPort : null;
_this.sshPort = conf.sshPort || 22;
_this.privateKey = conf.privateKey || null;
setImmediate(function () {
@ -154,14 +153,23 @@ var AutoSSH = function (_EventEmitter) {
key: 'getConfErrors',
value: function getConfErrors(conf) {
var errors = [];
if (!conf.localPort) errors.push('Missing localPort');else if (isNaN(parseInt(conf.localPort)) && conf.localPort !== 'auto') errors.push('Invalid localPort');
if (!conf.localPort) errors.push('Missing localPort');else if (typeof conf.localPort !== 'number' && conf.localPort !== 'auto') errors.push('Invalid localPort');
if (!conf.host) errors.push('Missing host');else if (typeof conf.host !== 'string') {
errors.push('host must be type "string". was given "' + _typeof(conf.host) + '"');
}
if (!conf.host) errors.push('Missing host');else if (typeof conf.host !== 'string') errors.push('host must be type "string". was given ' + _typeof(conf.host));
if (!conf.username) errors.push('Missing username');else if (typeof conf.username !== 'string') {
errors.push('username must be type "string". was given "' + _typeof(conf.username) + '"');
}
if (!conf.username) errors.push('Missing username');else if (typeof conf.username !== 'string') errors.push('username must be type "string". was given ' + _typeof(conf.username));
if (!conf.remotePort) errors.push('Missing remotePort');else if (isNaN(parseInt(conf.remotePort))) {
errors.push('remotePort must be type "number". was given "' + _typeof(conf.remotePort) + '"');
}
if (!conf.remotePort) errors.push('Missing remotePort');else if (typeof conf.remotePort !== 'number') errors.push('remotePort must be type "number". was given ' + _typeof(conf.remotePort));
if (conf.sshPort && isNaN(parseInt(conf.sshPort))) {
errors.push('sshPort must be type "number". was given "' + _typeof(conf.sshPort) + '"');
}
return errors;
}

33
src/index.js
View file

@ -25,8 +25,7 @@ class AutoSSH extends EventEmitter {
this.serverAliveCountMax = typeof conf.serverAliveCountMax === 'number' ?
conf.serverAliveCountMax : 1;
this.sshPort = typeof conf.sshPort === 'number' ? conf.sshPort : null;
this.sshPort = conf.sshPort || 22;
this.privateKey = conf.privateKey || null;
setImmediate(() => {
@ -116,26 +115,40 @@ class AutoSSH extends EventEmitter {
*/
getConfErrors(conf) {
const errors = [];
if (!conf.localPort)
errors.push('Missing localPort');
else if (typeof conf.localPort !== 'number' && conf.localPort !== 'auto')
else if (isNaN(parseInt(conf.localPort)) && conf.localPort !== 'auto')
errors.push('Invalid localPort');
if (!conf.host)
errors.push('Missing host');
else if (typeof conf.host !== 'string')
errors.push('host must be type "string". was given ' + typeof conf.host);
else if (typeof conf.host !== 'string') {
errors.push(
'host must be type "string". was given "' + typeof conf.host + '"'
);
}
if (!conf.username)
errors.push('Missing username');
else if (typeof conf.username !== 'string')
errors.push('username must be type "string". was given ' + typeof conf.username);
else if (typeof conf.username !== 'string') {
errors.push(
'username must be type "string". was given "' + typeof conf.username + '"'
);
}
if (!conf.remotePort)
errors.push('Missing remotePort');
else if (typeof conf.remotePort !== 'number')
errors.push('remotePort must be type "number". was given ' + typeof conf.remotePort);
else if (isNaN(parseInt(conf.remotePort))) {
errors.push(
'remotePort must be type "number". was given "' + typeof conf.remotePort + '"'
);
}
if (conf.sshPort && isNaN(parseInt(conf.sshPort))) {
errors.push(
'sshPort must be type "number". was given "' + typeof conf.sshPort + '"'
);
}
return errors;
}