Compare commits

..

No commits in common. "master" and "v2.1.6" have entirely different histories.

3 changed files with 6 additions and 22 deletions

View File

@ -13,19 +13,11 @@ var defaults = {
// just to account for clock skew really
, _dropDead: 5 * MIN
};
var promisify = require('util').promisify;
if (!promisify) {
try {
promisify = require('bluebird').promisify;
} catch(e) {
console.error("You're running an older version of node that doesn't have 'promisify'. Please run 'npm install bluebird --save'.");
}
}
// autoSni = { renewWithin, renewBy, getCertificates, tlsOptions, _dbg_now }
module.exports.create = function (autoSni) {
if (!autoSni.getCertificatesAsync) { autoSni.getCertificatesAsync = promisify(autoSni.getCertificates); }
if (!autoSni.getCertificatesAsync) { autoSni.getCertificatesAsync = require('bluebird').promisify(autoSni.getCertificates); }
if (!autoSni.renewWithin) { autoSni.renewWithin = autoSni.notBefore || defaults.renewWithin; }
if (autoSni.renewWithin < defaults._renewWithinMin) {
throw new Error("options.renewWithin should be at least " + (defaults._renewWithinMin / DAY) + " days");
@ -131,7 +123,7 @@ module.exports.create = function (autoSni) {
else if (certMeta.then) {
//log(autoSni.debug, "PROMISED CERT", domain);
// we are already getting a cert
promise = certMeta;
promise = certMeta
}
else if (now >= certMeta.expiresNear) {
//log(autoSni.debug, "EXPIRED CERT");
@ -146,10 +138,7 @@ module.exports.create = function (autoSni) {
// give the cert some time (2-5 min) to be validated and replaced before trying again
certMeta.renewAt = (autoSni._dbg_now || Date.now()) + (2 * MIN) + (3 * MIN * Math.random());
// let the update happen in the background
autoSni.getCertificatesAsync(domain, certMeta.certs).then(autoSni.cacheCerts, function (error) {
// console.error('ERROR in le-sni-auto:');
// console.error(err.stack || err);
})
autoSni.getCertificatesAsync(domain, certMeta.certs).then(autoSni.cacheCerts);
}
// return the valid cert right away

5
package-lock.json generated
View File

@ -1,5 +0,0 @@
{
"name": "le-sni-auto",
"version": "2.1.9",
"lockfileVersion": 1
}

View File

@ -1,10 +1,10 @@
{
"name": "le-sni-auto",
"version": "2.1.9",
"version": "2.1.6",
"description": "An auto-sni strategy for registering and renewing letsencrypt certificates using SNICallback",
"homepage": "https://git.coolaj86.com/coolaj86/le-sni-auto.js",
"main": "index.js",
"trulyOptionalDependencies": {
"dependencies": {
"bluebird": "^3.5.1"
},
"devDependencies": {},
@ -13,7 +13,7 @@
},
"repository": {
"type": "git",
"url": "https://git.coolaj86.com/coolaj86/le-sni-auto.js.git"
"url": "git+https://git.coolaj86.com/coolaj86/le-sni-auto.js.git"
},
"keywords": [
"le-sni",