Skip to content

Commit 50d3f98

Browse files
committed
1 parent 10fd79a commit 50d3f98

File tree

3 files changed

+14
-12
lines changed

3 files changed

+14
-12
lines changed

package-lock.json

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "server-ssl",
33
"author": "FirstTimeEZ",
4-
"version": "44.0.3",
4+
"version": "50.0.1",
55
"description": "Node.js server that is SSL by default that can be used for development or production and can create and renew Lets Encrypt Certificates automatically using ACME, including wildcard certificates",
66
"main": "template; do not import; read the Getting Started of the README, maybe you want to use: lets-encrypt-acme-client",
77
"type": "module",
@@ -27,7 +27,7 @@
2727
"license": "Apache-2.0",
2828
"dependencies": {
2929
"base-acme-client": "^30.0.3",
30-
"lets-encrypt-acme-client": "^40.0.2",
30+
"lets-encrypt-acme-client": "^50.0.1",
3131
"simple-api-router": "^1.1.1",
3232
"simple-open-ssl": "^1.0.7"
3333
},

ssl/state.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,16 @@
1818
import { join, extname as _extname } from 'path';
1919
import { createServer as createServerHTTP } from 'http';
2020
import { readFile, existsSync, readFileSync, mkdirSync } from 'fs';
21-
import { checkChallengesMixin, startLetsEncryptDaemon } from 'lets-encrypt-acme-client';
2221
import { fetchAndRetryUntilOk } from 'base-acme-client';
2322
import { runCommandSync } from 'simple-open-ssl';
23+
import LetsEncryptDaemon from 'lets-encrypt-acme-client';
2424

2525
/**
2626
* **SSL-Server** configuration state
2727
*/
2828
export const STATE = {
29+
// LetsEncrypt! Daemon
30+
__daemon: new LetsEncryptDaemon(),
2931
// Config
3032
__rootDir: null,
3133
__websiteDir: null,
@@ -315,9 +317,9 @@ export const STATE = {
315317
console.log("Could not determine if Node.js version is recent");
316318
}
317319
},
318-
loadLetsEncryptAcmeDaemon: (certificateCallback) => {
320+
loadLetsEncryptAcmeDaemon: async (certificateCallback) => {
319321
STATE.optLetsEncrypt && STATE.optDomains !== null && (STATE.urlsArray = STATE.extractDomainsAnyFormat(STATE.optDomains));
320-
STATE.optLetsEncrypt && startLetsEncryptDaemon(STATE.urlsArray, STATE.__sslFolder, certificateCallback,
322+
STATE.optLetsEncrypt && await STATE.__daemon.startLetsEncryptDaemon(STATE.urlsArray, STATE.__sslFolder, certificateCallback,
321323
STATE.optGenerateAnyway,
322324
STATE.optStaging,
323325
STATE.optUseDnsProvider ? { name: STATE.optProviderName, token: STATE.optProviderToken, zone: STATE.optProviderZone } : null);
@@ -328,7 +330,7 @@ export const STATE = {
328330
},
329331
startHttpChallengeListener: () => {
330332
createServerHTTP(async (req, res) => {
331-
if (STATE.optLetsEncrypt && await checkChallengesMixin(req, res)) { return; }
333+
if (STATE.optLetsEncrypt && STATE.__daemon.checkChallengesMixin(req, res)) { return; }
332334

333335
STATE.redirect(res, req);
334336
}).on('error', (e) => e.code === STATE.ADDR_IN_USE && console.error(`${STATE.optPortHttp}${STATE.IN_USE}`)).listen(STATE.optPortHttp, () => console.log(`${STATE.STARTED_HTTP}${STATE.optPort}`)); // Lets Encrypt! HTTP-01 ACME Challenge Mixin - Always Redirect HTTP to HTTPS unless doing a ACME Challenge

0 commit comments

Comments
 (0)