Compare commits

...

6 Commits

4 changed files with 28 additions and 14 deletions

View File

@ -92,11 +92,9 @@ var leSni = require('le-sni-auto').create({
// some default certificates that work with localhost
// (because default certificates are required as a fallback)
var tlsOptions = require('localhost.daplie.me-certificates').merge({
var tlsOptions = {
SNICallback: leSni.sniCallback
});
};
https.createServer(tlsOptions, app);
```
@ -148,9 +146,9 @@ var leSni = require('le-sni-auto').create({
renewWithin: 14 * 24 * 60 * 60 1000
});
var tlsOptions = require('localhost.daplie.com-certificates').merge({
var tlsOptions = {
SNICallback: leSni.sniCallback
});
};
function app(req, res) {
res.end("Hello, World!");

View File

@ -5,19 +5,27 @@ var HOUR = 60 * 60 * 1000;
var MIN = 60 * 1000;
var defaults = {
// don't renew before the renewWithin period
renewWithin: 14 * DAY
renewWithin: 30 * DAY
, _renewWithinMin: 3 * DAY
// renew before the renewBy period
, renewBy: 10 * DAY
, renewBy: 21 * DAY
, _renewByMin: Math.floor(DAY / 2)
// 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 = 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 < defaults._renewWithinMin) {
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) {
//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");
@ -138,7 +146,10 @@ 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);
autoSni.getCertificatesAsync(domain, certMeta.certs).then(autoSni.cacheCerts, function (error) {
// console.error('ERROR in le-sni-auto:');
// console.error(err.stack || err);
})
}
// return the valid cert right away

5
package-lock.json generated Normal file
View File

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

View File

@ -1,10 +1,10 @@
{
"name": "le-sni-auto",
"version": "2.1.5",
"version": "2.1.9",
"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",
"dependencies": {
"trulyOptionalDependencies": {
"bluebird": "^3.5.1"
},
"devDependencies": {},
@ -13,7 +13,7 @@
},
"repository": {
"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": [
"le-sni",