fix(core): update

This commit is contained in:
2020-08-12 16:36:06 +00:00
parent 7277906851
commit a2cf86b62f
10 changed files with 8538 additions and 844 deletions

View File

@ -40,13 +40,13 @@ export class Cert extends plugins.smartdata.SmartDataDbDoc<Cert, plugins.tsclass
const shouldBeValidAtLeastUntil =
Date.now() +
plugins.smarttime.getMilliSecondsFromUnits({
days: 10
days: 10,
});
return !(this.validUntil >= shouldBeValidAtLeastUntil);
}
public update(certDataArg: plugins.tsclass.network.ICert) {
Object.keys(certDataArg).forEach(key => {
Object.keys(certDataArg).forEach((key) => {
this[key] = certDataArg[key];
});
}
@ -54,7 +54,7 @@ export class Cert extends plugins.smartdata.SmartDataDbDoc<Cert, plugins.tsclass
constructor(optionsArg: plugins.tsclass.network.ICert) {
super();
if (optionsArg) {
Object.keys(optionsArg).forEach(key => {
Object.keys(optionsArg).forEach((key) => {
this[key] = optionsArg[key];
});
}

View File

@ -34,7 +34,7 @@ export class CertManager {
CertManager.activeDB = this.smartdataDb;
// Pending Map
this.interestMap = new plugins.lik.InterestMap(certName => certName);
this.interestMap = new plugins.lik.InterestMap((certName) => certName);
}
/**
@ -44,7 +44,7 @@ export class CertManager {
*/
public async retrieveCertificate(certDomainNameArg: string): Promise<Cert> {
const existingCertificate: Cert = await Cert.getInstance({
domainName: certDomainNameArg
domainName: certDomainNameArg,
});
if (existingCertificate) {
@ -70,7 +70,7 @@ export class CertManager {
public async deleteCertificate(certDomainNameArg: string) {
const cert: Cert = await Cert.getInstance({
domainName: certDomainNameArg
domainName: certDomainNameArg,
});
await cert.delete();
}

View File

@ -66,7 +66,7 @@ export class SmartAcme {
// CertMangaer
this.certmanager = new CertManager(this, {
mongoDescriptor: this.options.mongoDescriptor
mongoDescriptor: this.options.mongoDescriptor,
});
await this.certmanager.init();
@ -82,13 +82,13 @@ export class SmartAcme {
return plugins.acme.directory.letsencrypt.staging;
}
})(),
accountKey: this.privateKey
accountKey: this.privateKey,
});
/* Register account */
await this.client.createAccount({
termsOfServiceAgreed: true,
contact: [`mailto:${this.options.accountEmail}`]
contact: [`mailto:${this.options.accountEmail}`],
});
}
@ -134,8 +134,8 @@ export class SmartAcme {
const order = await this.client.createOrder({
identifiers: [
{ type: 'dns', value: certDomainName },
{ type: 'dns', value: `*.${certDomainName}` }
]
{ type: 'dns', value: `*.${certDomainName}` },
],
});
/* Get authorizations and select challenges */
@ -144,7 +144,7 @@ export class SmartAcme {
for (const authz of authorizations) {
console.log(authz);
const fullHostName: string = `_acme-challenge.${authz.identifier.value}`;
const dnsChallenge: string = authz.challenges.find(challengeArg => {
const dnsChallenge: string = authz.challenges.find((challengeArg) => {
return challengeArg.type === 'dns-01';
});
// process.exit(1);
@ -154,7 +154,7 @@ export class SmartAcme {
/* Satisfy challenge */
await this.setChallenge({
hostName: fullHostName,
challenge: keyAuthorization
challenge: keyAuthorization,
});
await this.smartdns.checkUntilAvailable(fullHostName, 'TXT', keyAuthorization, 100, 5000);
console.log('Cool down an extra 60 second for region availability');
@ -173,7 +173,7 @@ export class SmartAcme {
try {
await this.removeChallenge({
hostName: fullHostName,
challenge: keyAuthorization
challenge: keyAuthorization,
});
} catch (e) {
console.log(e);
@ -184,7 +184,7 @@ export class SmartAcme {
/* Finalize order */
const [key, csr] = await plugins.acme.forge.createCsr({
commonName: `*.${certDomainName}`,
altNames: [certDomainName]
altNames: [certDomainName],
});
await this.client.finalizeOrder(order, csr);
@ -202,8 +202,8 @@ export class SmartAcme {
validUntil:
Date.now() +
plugins.smarttime.getMilliSecondsFromUnits({
days: 90
})
days: 90,
}),
});
const newCertificate = await this.certmanager.retrieveCertificate(certDomainName);

View File

@ -22,7 +22,7 @@ export {
smartrequest,
smartunique,
smartstring,
smarttime
smarttime,
};
// @tsclass scope