2.0.20

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartacme",
-  "version": "2.0.13",
+  "version": "2.0.20",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -1614,9 +1614,9 @@
       "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU="
     },
     "luxon": {
-      "version": "1.9.0",
+      "version": "1.10.0",
-      "resolved": "https://verdaccio.lossless.one/luxon/-/luxon-1.9.0.tgz",
+      "resolved": "https://verdaccio.lossless.one/luxon/-/luxon-1.10.0.tgz",
-      "integrity": "sha512-N1kSwtIEhM/gIRGASXPgi1CwfQZX5VTjndYFjOsZdEEtWij2uSoRrgDGWwViZCUNY9Rwh4UVG/TLcUinHM20cA=="
+      "integrity": "sha512-ry3GKh//v3isD6oJN5pFWmdh+3GiScwv9q8VgG6fZ2j1guGOol2vVVdo4GBAWCrcq5RHOqSeipqHBnOu/u024Q=="
     },
     "make-error": {
       "version": "1.3.5",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartacme",
-  "version": "2.0.13",
+  "version": "2.0.20",
   "private": false,
   "description": "acme implementation in TypeScript",
   "main": "dist/index.js",

test/test.ts

@@ -30,4 +30,8 @@ tap.test('should create a valid instance of SmartAcme', async () => {
   // await smartAcmeInstance.getCertificateForDomain('bleu.de');
 });
 
+tap.test('should stop correctly', async () => {
+  await smartAcmeInstance.stop();
+});
+
 tap.start();

ts/smartacme.classes.cert.ts

@@ -5,6 +5,7 @@ import * as interfaces from './interfaces';
 import { CertManager } from './smartacme.classes.certmanager';
 
 import { Collection, svDb, unI } from '@pushrocks/smartdata';
+import { ICert } from './interfaces';
 
 @plugins.smartdata.Collection(() => {
   return CertManager.activeDB;
@@ -28,10 +29,10 @@ export class Cert extends plugins.smartdata.SmartDataDbDoc<Cert> implements inte
   @svDb()
   public csr: string;
 
-  constructor(privateKeyArg: string, publicKeyArg: string, csrArg: string) {
+  constructor(optionsArg: ICert) {
     super();
-    this.privateKey = privateKeyArg;
+    Object.keys(optionsArg).forEach(key => {
-    this.publicKey = publicKeyArg;
+      this[key] = optionsArg[key];
-    this.csr = csrArg;
+    });
   }
 }

ts/smartacme.classes.certmanager.ts

@@ -3,6 +3,7 @@ import { Cert } from './smartacme.classes.cert';
 import { SmartAcme } from './smartacme.classes.smartacme';
 
 import * as interfaces from './interfaces';
+import { ICert } from './interfaces';
 
 
 export class CertManager {
@@ -44,7 +45,7 @@ export class CertManager {
   public async retrieveCertificate(domainName: string): Promise<Cert> {
     await this.checkCerts();
     const existingCertificate: Cert = await Cert.getInstance({
-      name: domainName
+      domainName
     });
 
     if(existingCertificate) {
@@ -61,8 +62,8 @@ export class CertManager {
    * @param privateKeyArg 
    * @param csrArg 
    */
-  public async storeCertificate(privateKeyArg: string, publicKeyArg: string, csrArg: string) {
+  public async storeCertificate(optionsArg: ICert) {
-    const cert = new Cert(privateKeyArg, publicKeyArg, csrArg);
+    const cert = new Cert(optionsArg);
     cert.save();
   };
 

ts/smartacme.classes.smartacme.ts

@@ -1,11 +1,12 @@
 import * as plugins from './smartacme.plugins';
+import { Cert } from './smartacme.classes.cert';
 import { CertManager } from './smartacme.classes.certmanager';
 
 import * as interfaces from './interfaces';
 import { request } from 'http';
 
 /**
- *
+ * the options for the class @see SmartAcme
  */
 export interface ISmartAcmeOptions {
   accountPrivateKey?: string;
@@ -16,6 +17,16 @@ export interface ISmartAcmeOptions {
   validateRemoteRequest: () => Promise<boolean>;
 }
 
+/**
+ * class SmartAcme
+ * can be used for setting up communication with an ACME authority
+ * 
+ * ```ts
+ * const mySmartAcmeInstance = new SmartAcme({
+ *  // see ISmartAcmeOptions for options
+ * })
+ * ```
+ */
 export class SmartAcme {
   private options: ISmartAcmeOptions;
 
@@ -41,6 +52,9 @@ export class SmartAcme {
 
   /**
    * inits the instance
+   * ```ts
+   * await myCloudlyInstance.init() // does not support options
+   * ```
    */
   public async init() {
     this.privateKey =
@@ -99,7 +113,11 @@ export class SmartAcme {
     });
   }
 
-  public async getCertificateForDomain(domainArg: string) {
+  public async stop() {
+    await this.certmanager.smartdataDb.close();
+  }
+
+  public async getCertificateForDomain(domainArg: string): Promise<Cert> {
     const domain = domainArg;
 
     const retrievedCertificate = await this.certmanager.retrieveCertificate(domain);
@@ -162,6 +180,15 @@ export class SmartAcme {
     console.log(`Private key:\n${key.toString()}`);
     console.log(`Certificate:\n${cert.toString()}`);
 
-    this.certmanager.storeCertificate(key.toString(), cert.toString(), csr.toString());
+    await this.certmanager.storeCertificate({
+      domainName: domainArg,
+      privateKey: key.toString(),
+      publicKey: cert.toString(),
+      csr: csr.toString(),
+      created: Date.now()
+    });
+
+    const newCertificate = await this.certmanager.retrieveCertificate(domainArg);
+    return newCertificate;
   }
 }