coolaj86
/
walnut.js
1
1
Fork 1
Code Issues Pull Requests Releases Activity

better error check / debug

This commit is contained in:
AJ ONeal 2015-11-23 09:31:17 +00:00
parent 9399c4893a
commit d4d663e3dd
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ddns-client.js
View File

@ -8,7 +8,7 @@ var cli = require('cli');
cli.parse({ cli.parse({
service: [ 's', 'The service to use for updates i.e. ns1.example.org', 'string' ] service: [ 's', 'The service to use for updates i.e. ns1.example.org', 'string' ]
, hostname: [ 'h', 'The hostname you wish to update i.e. example.com', 'string' ] , hostname: [ 'h', 'The hostname you wish to update i.e. example.com', 'string' ]
, pathname: [ 'h', 'The api route to which to POST i.e. /api/ddns', 'string', '/api/com.daplie.dns/ddns' ] , pathname: [ false, 'The api route to which to POST i.e. /api/ddns', 'string', '/api/com.daplie.dns/ddns' ]
, type: [ 't', 'The record type i.e. A, AAAA, MX, CNAME, ANAME, FWD, etc', 'string', 'A' ] , type: [ 't', 'The record type i.e. A, AAAA, MX, CNAME, ANAME, FWD, etc', 'string', 'A' ]
, priority: [ 'p', 'The priority (for MX and other records)', 'string' ] , priority: [ 'p', 'The priority (for MX and other records)', 'string' ]
, port: [ false, 'The port (default https/443)', 'number', 443 ] , port: [ false, 'The port (default https/443)', 'number', 443 ]
@ -52,7 +52,9 @@ cli.main(function (args, options) {
, "value": options.answer , "value": options.answer
, "type": options.type , "type": options.type
, "priority": options.priority , "priority": options.priority
, "token": options.token , "token": options.token // device should go here?
//, "ttl": options.ttl
//, "device": ''
} }
] ]
}).then(function (data) { }).then(function (data) {
@ -67,5 +69,9 @@ cli.main(function (args, options) {
console.log(JSON.stringify(data, null, ' ')); console.log(JSON.stringify(data, null, ' '));
console.log('Test with'); console.log('Test with');
console.log('dig ' + options.hostname + ' ' + options.type); console.log('dig ' + options.hostname + ' ' + options.type);
}, function (err) {
console.error('[DDNS CLIENT]');
console.error(err.stack);
console.error(err.data);
}); });
}); });

14
holepunch/helpers/update-ip.js
View File

@ -38,13 +38,6 @@ module.exports.update = function (opts) {
options.ca = opts.cacert; options.ca = opts.cacert;
} }
options.ca = (options.ca||[]).map(function (str) {
if ('string' === typeof str && str.length < 1000) {
str = fs.readFileAsync(str);
}
return str;
});
if (opts.token || opts.jwt) { if (opts.token || opts.jwt) {
options.headers.Authorization = 'Bearer ' + (opts.token || opts.jwt); options.headers.Authorization = 'Bearer ' + (opts.token || opts.jwt);
} }
@ -53,6 +46,13 @@ module.exports.update = function (opts) {
options.rejectUnauthorized = false; options.rejectUnauthorized = false;
} }
options.ca = (options.ca||[]).map(function (str) {
if ('string' === typeof str && str.length < 1000) {
str = fs.readFileAsync(str);
}
return str;
});
return PromiseA.all(options.ca).then(function (cas) { return PromiseA.all(options.ca).then(function (cas) {
options.ca = cas; options.ca = cas;
options.agent = new https.Agent(options); options.agent = new https.Agent(options);