fix(core): update

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

View File

@ -19,23 +19,35 @@ mirror:
stage: security stage: security
script: script:
- npmci git mirror - npmci git mirror
only:
- tags
tags: tags:
- lossless - lossless
- docker - docker
- notpriv - notpriv
audit: auditProductionDependencies:
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
stage: security
script:
- npmci npm prepare
- npmci command npm install --production --ignore-scripts
- npmci command npm config set registry https://registry.npmjs.org
- npmci command npm audit --audit-level=high --only=prod --production
tags:
- docker
auditDevDependencies:
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
stage: security stage: security
script: script:
- npmci npm prepare - npmci npm prepare
- npmci command npm install --ignore-scripts - npmci command npm install --ignore-scripts
- npmci command npm config set registry https://registry.npmjs.org - npmci command npm config set registry https://registry.npmjs.org
- npmci command npm audit --audit-level=high - npmci command npm audit --audit-level=high --only=dev
tags: tags:
- lossless
- docker - docker
- notpriv allow_failure: true
# ==================== # ====================
# test stage # test stage
@ -50,9 +62,7 @@ testStable:
- npmci npm test - npmci npm test
coverage: /\d+.?\d+?\%\s*coverage/ coverage: /\d+.?\d+?\%\s*coverage/
tags: tags:
- lossless
- docker - docker
- priv
testBuild: testBuild:
stage: test stage: test
@ -63,9 +73,7 @@ testBuild:
- npmci command npm run build - npmci command npm run build
coverage: /\d+.?\d+?\%\s*coverage/ coverage: /\d+.?\d+?\%\s*coverage/
tags: tags:
- lossless
- docker - docker
- notpriv
release: release:
stage: release stage: release
@ -85,6 +93,8 @@ release:
codequality: codequality:
stage: metadata stage: metadata
allow_failure: true allow_failure: true
only:
- tags
script: script:
- npmci command npm install -g tslint typescript - npmci command npm install -g tslint typescript
- npmci npm prepare - npmci npm prepare

View File

@ -15,7 +15,7 @@
"properties": { "properties": {
"projectType": { "projectType": {
"type": "string", "type": "string",
"enum": ["website", "element", "service", "npm"] "enum": ["website", "element", "service", "npm", "wcc"]
} }
} }
} }

9236
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -7,7 +7,7 @@
"typings": "dist_ts/index.d.ts", "typings": "dist_ts/index.d.ts",
"scripts": { "scripts": {
"test": "(tstest test/)", "test": "(tstest test/)",
"build": "(tsbuild)" "build": "(tsbuild --web)"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
@ -25,29 +25,29 @@
}, },
"homepage": "https://gitlab.com/umbrellazone/smartacme#README", "homepage": "https://gitlab.com/umbrellazone/smartacme#README",
"dependencies": { "dependencies": {
"@pushrocks/lik": "^3.0.19", "@pushrocks/lik": "^4.0.17",
"@pushrocks/smartdata": "^3.1.26", "@pushrocks/smartdata": "^3.1.29",
"@pushrocks/smartdelay": "^2.0.6", "@pushrocks/smartdelay": "^2.0.10",
"@pushrocks/smartdns": "^4.0.2", "@pushrocks/smartdns": "^4.0.4",
"@pushrocks/smartexpress": "^3.0.57", "@pushrocks/smartexpress": "^3.0.76",
"@pushrocks/smartlog": "^2.0.21", "@pushrocks/smartlog": "^2.0.36",
"@pushrocks/smartpromise": "^3.0.6", "@pushrocks/smartpromise": "^3.0.6",
"@pushrocks/smartrequest": "^1.1.47", "@pushrocks/smartrequest": "^1.1.47",
"@pushrocks/smartstring": "^3.0.18", "@pushrocks/smartstring": "^3.0.18",
"@pushrocks/smarttime": "^3.0.12", "@pushrocks/smarttime": "^3.0.24",
"@pushrocks/smartunique": "^3.0.1", "@pushrocks/smartunique": "^3.0.3",
"@tsclass/tsclass": "^3.0.7", "@tsclass/tsclass": "^3.0.21",
"acme-client": "^3.3.1" "acme-client": "^3.3.1"
}, },
"devDependencies": { "devDependencies": {
"@gitzone/tsbuild": "^2.1.17", "@gitzone/tsbuild": "^2.1.24",
"@gitzone/tsrun": "^1.2.8", "@gitzone/tsrun": "^1.2.12",
"@gitzone/tstest": "^1.0.28", "@gitzone/tstest": "^1.0.43",
"@mojoio/cloudflare": "^4.0.3", "@mojoio/cloudflare": "^5.0.6",
"@pushrocks/qenv": "^4.0.6", "@pushrocks/qenv": "^4.0.10",
"@pushrocks/tapbundle": "^3.2.0", "@pushrocks/tapbundle": "^3.2.9",
"@types/node": "^13.7.4", "@types/node": "^14.0.27",
"tslint": "^6.0.0", "tslint": "^6.1.3",
"tslint-config-prettier": "^1.18.0" "tslint-config-prettier": "^1.18.0"
}, },
"files": [ "files": [
@ -61,5 +61,8 @@
"cli.js", "cli.js",
"npmextra.json", "npmextra.json",
"readme.md" "readme.md"
],
"browserslist": [
"last 1 chrome versions"
] ]
} }

View File

@ -8,13 +8,20 @@ acme with an easy yet powerful interface in TypeScript
* [docs (typedoc)](https://pushrocks.gitlab.io/smartuniverse/) * [docs (typedoc)](https://pushrocks.gitlab.io/smartuniverse/)
## Status for master ## Status for master
[![pipeline status](https://gitlab.com/pushrocks/smartuniverse/badges/master/pipeline.svg)](https://gitlab.com/pushrocks/smartuniverse/commits/master)
[![coverage report](https://gitlab.com/pushrocks/smartuniverse/badges/master/coverage.svg)](https://gitlab.com/pushrocks/smartuniverse/commits/master) Status Category | Status Badge
[![npm downloads per month](https://img.shields.io/npm/dm/@pushrocks/smartuniverse.svg)](https://www.npmjs.com/package/@pushrocks/smartuniverse) -- | --
[![Known Vulnerabilities](https://snyk.io/test/npm/@pushrocks/smartuniverse/badge.svg)](https://snyk.io/test/npm/@pushrocks/smartuniverse) GitLab Pipelines | [![pipeline status](https://gitlab.com/pushrocks/smartuniverse/badges/master/pipeline.svg)](https://lossless.cloud)
[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/) GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/pushrocks/smartuniverse/badges/master/coverage.svg)](https://lossless.cloud)
[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/) npm | [![npm downloads per month](https://badgen.net/npm/dy/@pushrocks/smartuniverse)](https://lossless.cloud)
[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/) Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/pushrocks/smartuniverse)](https://lossless.cloud)
TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x/blue?icon=typescript)](https://lossless.cloud)
node Support | [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](https://lossless.cloud)
PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@pushrocks/smartuniverse)](https://lossless.cloud)
PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@pushrocks/smartuniverse)](https://lossless.cloud)
BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@pushrocks/smartuniverse)](https://lossless.cloud)
Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20Windows%2010/yes/green?icon=windows)](https://lossless.cloud) [![Supports Mac OS X](https://badgen.net/badge/supports%20Mac%20OS%20X/yes/green?icon=apple)](https://lossless.cloud)
## Usage ## Usage
@ -30,15 +37,15 @@ const run = async () => {
mongoDescriptor: { mongoDescriptor: {
mongoDbName: testQenv.getEnvVarRequired('MONGODB_DATABASE'), mongoDbName: testQenv.getEnvVarRequired('MONGODB_DATABASE'),
mongoDbPass: testQenv.getEnvVarRequired('MONGODB_PASSWORD'), mongoDbPass: testQenv.getEnvVarRequired('MONGODB_PASSWORD'),
mongoDbUrl: testQenv.getEnvVarRequired('MONGODB_URL') mongoDbUrl: testQenv.getEnvVarRequired('MONGODB_URL'),
}, },
removeChallenge: async dnsChallenge => { removeChallenge: async (dnsChallenge) => {
// somehow provide a function that is able to remove the dns challenge // somehow provide a function that is able to remove the dns challenge
}, },
setChallenge: async dnsChallenge => { setChallenge: async (dnsChallenge) => {
// somehow provide a function that is able to the dns challenge // somehow provide a function that is able to the dns challenge
}, },
environment: 'integration' environment: 'integration',
}); });
await smartAcmeInstance.init(); await smartAcmeInstance.init();

View File

@ -5,7 +5,7 @@ import * as cloudflare from '@mojoio/cloudflare';
const testQenv = new Qenv('./', './.nogit/'); const testQenv = new Qenv('./', './.nogit/');
const testCloudflare = new cloudflare.CloudflareAccount({ const testCloudflare = new cloudflare.CloudflareAccount({
email: testQenv.getEnvVarOnDemand('CF_EMAIL'), email: testQenv.getEnvVarOnDemand('CF_EMAIL'),
key: testQenv.getEnvVarOnDemand('CF_KEY') key: testQenv.getEnvVarOnDemand('CF_KEY'),
}); });
import * as smartacme from '../ts/index'; import * as smartacme from '../ts/index';
@ -19,15 +19,15 @@ tap.test('should create a valid instance of SmartAcme', async () => {
mongoDescriptor: { mongoDescriptor: {
mongoDbName: testQenv.getEnvVarRequired('MONGODB_DATABASE'), mongoDbName: testQenv.getEnvVarRequired('MONGODB_DATABASE'),
mongoDbPass: testQenv.getEnvVarRequired('MONGODB_PASSWORD'), mongoDbPass: testQenv.getEnvVarRequired('MONGODB_PASSWORD'),
mongoDbUrl: testQenv.getEnvVarRequired('MONGODB_URL') mongoDbUrl: testQenv.getEnvVarRequired('MONGODB_URL'),
}, },
removeChallenge: async dnsChallenge => { removeChallenge: async (dnsChallenge) => {
testCloudflare.convenience.acmeRemoveDnsChallenge(dnsChallenge); testCloudflare.convenience.acmeRemoveDnsChallenge(dnsChallenge);
}, },
setChallenge: async dnsChallenge => { setChallenge: async (dnsChallenge) => {
testCloudflare.convenience.acmeSetDnsChallenge(dnsChallenge); testCloudflare.convenience.acmeSetDnsChallenge(dnsChallenge);
}, },
environment: 'integration' environment: 'integration',
}); });
await smartAcmeInstance.init(); await smartAcmeInstance.init();
}); });

View File

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

View File

@ -34,7 +34,7 @@ export class CertManager {
CertManager.activeDB = this.smartdataDb; CertManager.activeDB = this.smartdataDb;
// Pending Map // 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> { public async retrieveCertificate(certDomainNameArg: string): Promise<Cert> {
const existingCertificate: Cert = await Cert.getInstance({ const existingCertificate: Cert = await Cert.getInstance({
domainName: certDomainNameArg domainName: certDomainNameArg,
}); });
if (existingCertificate) { if (existingCertificate) {
@ -70,7 +70,7 @@ export class CertManager {
public async deleteCertificate(certDomainNameArg: string) { public async deleteCertificate(certDomainNameArg: string) {
const cert: Cert = await Cert.getInstance({ const cert: Cert = await Cert.getInstance({
domainName: certDomainNameArg domainName: certDomainNameArg,
}); });
await cert.delete(); await cert.delete();
} }

View File

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

View File

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