Compare commits

...

1 Commits

Author SHA1 Message Date
AJ ONeal fd06582813 v2.1.8: make bluebird truly optional 2019-03-30 13:26:24 -06:00
2 changed files with 13 additions and 5 deletions

View File

@ -13,11 +13,19 @@ var defaults = {
// just to account for clock skew really // just to account for clock skew really
, _dropDead: 5 * MIN , _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 } // autoSni = { renewWithin, renewBy, getCertificates, tlsOptions, _dbg_now }
module.exports.create = function (autoSni) { module.exports.create = function (autoSni) {
if (!autoSni.getCertificatesAsync) { autoSni.getCertificatesAsync = require('bluebird').promisify(autoSni.getCertificates); } if (!autoSni.getCertificatesAsync) { autoSni.getCertificatesAsync = promisify(autoSni.getCertificates); }
if (!autoSni.renewWithin) { autoSni.renewWithin = autoSni.notBefore || defaults.renewWithin; } if (!autoSni.renewWithin) { autoSni.renewWithin = autoSni.notBefore || defaults.renewWithin; }
if (autoSni.renewWithin < defaults._renewWithinMin) { if (autoSni.renewWithin < defaults._renewWithinMin) {
throw new Error("options.renewWithin should be at least " + (defaults._renewWithinMin / DAY) + " days"); throw new Error("options.renewWithin should be at least " + (defaults._renewWithinMin / DAY) + " days");
@ -123,7 +131,7 @@ module.exports.create = function (autoSni) {
else if (certMeta.then) { else if (certMeta.then) {
//log(autoSni.debug, "PROMISED CERT", domain); //log(autoSni.debug, "PROMISED CERT", domain);
// we are already getting a cert // we are already getting a cert
promise = certMeta promise = certMeta;
} }
else if (now >= certMeta.expiresNear) { else if (now >= certMeta.expiresNear) {
//log(autoSni.debug, "EXPIRED CERT"); //log(autoSni.debug, "EXPIRED CERT");

View File

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