@small-tech/auto-encrypt 2.1.0 → 2.3.0

package/lib/HttpServer.js

@@ -25,12 +25,12 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-import http from 'http'
-import encodeUrl from 'encodeurl'
-import enableDestroy from 'server-destroy'
-import log from './util/log.js'
+const http          = require('http')
+const encodeUrl     = require('encodeurl')
+const enableDestroy = require('server-destroy')
+const log           = require('./util/log')
 
-export default class HttpServer {
+class HttpServer {
   //
   // Singleton access (async).
   //
@@ -169,3 +169,5 @@ export default class HttpServer {
     })
   }
 }
+
+module.exports = HttpServer

package/lib/Identity.js

@@ -14,17 +14,17 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-import util from 'util'
-import fs from 'fs'
-import jose from 'jose'
-import Throws from './util/Throws.js'
-import log from './util/log.js'
+const util          = require('util')
+const fs            = require('fs-extra')
+const jose          = require('jose')
+const Throws        = require('./util/Throws')
+const log           = require('./util/log')
 
 const throws = new Throws({
   [Symbol.for('UnsupportedIdentityType')]: identityFilePath => `The identity file path passed (${identityFilePath}) is for an unsupported identity type.`
 })
 
-export default class Identity {
+class Identity {
 
   constructor (configuration = throws.ifMissing(), identityFilePathKey = throws.ifMissing()) {
     const identityFilePath = configuration[identityFilePathKey]
@@ -109,3 +109,5 @@ export default class Identity {
   //
   #identityFilePath = null
 }
+
+module.exports = Identity

package/lib/LetsEncryptServer.js

@@ -1,6 +1,6 @@
-import util from 'util'
+const util = require('util')
 
-export default class LetsEncryptServer {
+class LetsEncryptServer {
   /**
    * Enumeration.
    *
@@ -54,3 +54,5 @@ export default class LetsEncryptServer {
     'http://localhost:9829/directory'
   ]
 }
+
+module.exports = LetsEncryptServer

package/lib/Nonce.js

@@ -20,13 +20,13 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-import prepareRequest from 'bent'
-import log from './util/log.js'
-import Throws from './util/Throws.js'
+const prepareRequest = require('bent')
+const log            = require('./util/log')
+const Throws         = require('./util/Throws')
 
 const throws = new Throws()
 
-export default class Nonce {
+class Nonce {
   constructor (directory = throws.ifMissing()) {
     this.#directory = directory
   }
@@ -73,3 +73,5 @@ export default class Nonce {
   #directory = null
   #freshNonce = null
 }
+
+module.exports = Nonce

package/lib/Order.js

@@ -12,23 +12,23 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-import fsPromises from 'fs/promises'
-import Authorisation from './Authorisation.js'
-import HttpServer from './HttpServer.js'
-import CertificateIdentity from './identities/CertificateIdentity.js'
-import acmeCsr from './acmeCsr.js'
-import asyncForEach from './util/async-foreach.js'
-import log from './util/log.js'
-import NewOrderRequest from './acme-requests/NewOrderRequest.js'
-import FinaliseOrderRequest from './acme-requests/FinaliseOrderRequest.js'
-import CheckOrderStatusRequest from './acme-requests/CheckOrderStatusRequest.js'
-import CertificateRequest from './acme-requests/CertificateRequest.js'
-import Throws from './util/Throws.js'
-import waitFor from './util/waitFor.js'
+const fs                      = require('fs-extra')
+const Authorisation           = require('./Authorisation')
+const HttpServer              = require('./HttpServer')
+const CertificateIdentity     = require('./identities/CertificateIdentity')
+const acmeCsr                 = require('./acmeCsr')
+const asyncForEach            = require('./util/async-foreach')
+const log                     = require('./util/log')
+const NewOrderRequest         = require('./acme-requests/NewOrderRequest')
+const FinaliseOrderRequest    = require('./acme-requests/FinaliseOrderRequest')
+const CheckOrderStatusRequest = require('./acme-requests/CheckOrderStatusRequest')
+const CertificateRequest      = require('./acme-requests/CertificateRequest')
+const Throws                  = require('./util/Throws')
+const waitFor                 = require('./util/waitFor')
 
 const throws = new Throws()
 
-export default class Order {
+class Order {
   #data                = null
   #headers             = null
   #order               = null
@@ -193,7 +193,7 @@ export default class Order {
 
         // Save the certificate.
         try {
-          await fsPromises.writeFile(this.configuration.certificatePath, this.certificate, 'utf-8')
+          await fs.writeFile(this.configuration.certificatePath, this.certificate, 'utf-8')
         } catch (error) {
           throw new Error(error)
         }
@@ -214,3 +214,5 @@ export default class Order {
     }
   }
 }
+
+module.exports = Order

package/lib/acme-requests/AuthorisationRequest.js

@@ -11,12 +11,12 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-import AcmeRequest from '../AcmeRequest.js'
-import Throws from '../util/Throws.js'
+const AcmeRequest = require('../AcmeRequest')
+const Throws = require('../util/Throws')
 
 const throws = new Throws()
 
-export default class AuthorisationRequest extends AcmeRequest {
+class AuthorisationRequest extends AcmeRequest {
   async execute (authorisationUrl = throws.ifMissing()) {
     // This is a POST-as-GET request so it doesn’t have a payload.
     // See RFC 8555 § 6.3 (GET and POST-as-GET requests).
@@ -34,3 +34,5 @@ export default class AuthorisationRequest extends AcmeRequest {
     return response
   }
 }
+
+module.exports = AuthorisationRequest

package/lib/acme-requests/CertificateRequest.js

@@ -12,12 +12,12 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-import AcmeRequest from '../AcmeRequest.js'
-import Throws from '../util/Throws.js'
+const AcmeRequest = require('../AcmeRequest')
+const Throws      = require('../util/Throws')
 
 const throws = new Throws()
 
-export default class CertificateRequest extends AcmeRequest {
+class CertificateRequest extends AcmeRequest {
   async execute (certificateUrl = throws.ifMissing()) {
     // This is a POST-as-GET request so it doesn’t have a payload.
     // See RFC 8555 § 6.3 (GET and POST-as-GET requests).
@@ -37,3 +37,5 @@ export default class CertificateRequest extends AcmeRequest {
     return response
   }
 }
+
+module.exports = CertificateRequest

package/lib/acme-requests/CheckOrderStatusRequest.js

@@ -14,12 +14,12 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-import AcmeRequest from '../AcmeRequest.js'
-import Throws from '../util/Throws.js'
+const AcmeRequest = require('../AcmeRequest')
+const Throws      = require('../util/Throws')
 
 const throws = new Throws()
 
-export default class CheckOrderStatusRequest extends AcmeRequest {
+class CheckOrderStatusRequest extends AcmeRequest {
   async execute (orderUrl = throws.ifMissing()) {
 
     const payload = '' // POST-as-GET
@@ -35,3 +35,5 @@ export default class CheckOrderStatusRequest extends AcmeRequest {
     return response
   }
 }
+
+module.exports = CheckOrderStatusRequest

package/lib/acme-requests/FinaliseOrderRequest.js

@@ -11,12 +11,12 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-import AcmeRequest from '../AcmeRequest.js'
-import Throws from '../util/Throws.js'
+const AcmeRequest = require('../AcmeRequest')
+const Throws = require('../util/Throws')
 
 const throws = new Throws()
 
-export default class FinaliseOrderRequest extends AcmeRequest {
+class FinaliseOrderRequest extends AcmeRequest {
   async execute (finaliseUrl = throws.ifMissing(), csr = throws.ifMissing()) {
 
     const payload = { csr }
@@ -32,3 +32,5 @@ export default class FinaliseOrderRequest extends AcmeRequest {
     return response
   }
 }
+
+module.exports = FinaliseOrderRequest

package/lib/acme-requests/NewAccountRequest.js

@@ -12,9 +12,9 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-import AcmeRequest from '../AcmeRequest.js'
+const AcmeRequest = require('../AcmeRequest')
 
-export default class NewAccountRequest extends AcmeRequest {
+class NewAccountRequest extends AcmeRequest {
   async execute () {
     // Set the only required element.
     const payload = { termsOfServiceAgreed: true }
@@ -30,3 +30,5 @@ export default class NewAccountRequest extends AcmeRequest {
     return account
   }
 }
+
+module.exports = NewAccountRequest

package/lib/acme-requests/NewOrderRequest.js

@@ -12,11 +12,11 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-import AcmeRequest from '../AcmeRequest.js'
-import Throws from '../util/Throws.js'
+const AcmeRequest = require('../AcmeRequest')
+const Throws = require('../util/Throws')
 const throws = new Throws()
 
-export default class NewOrderRequest extends AcmeRequest {
+class NewOrderRequest extends AcmeRequest {
   async execute (configuration = throws.ifMissing()) {
     const identifiers = configuration.domains.map(domain => { return { type: 'dns', value: domain} })
     const payload = { identifiers }
@@ -25,3 +25,5 @@ export default class NewOrderRequest extends AcmeRequest {
     return response
   }
 }
+
+module.exports = NewOrderRequest

package/lib/acme-requests/ReadyForChallengeValidationRequest.js

@@ -13,12 +13,12 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-import AcmeRequest from '../AcmeRequest.js'
-import Throws from '../util/Throws.js'
+const AcmeRequest = require('../AcmeRequest')
+const Throws = require('../util/Throws')
 
 const throws = new Throws()
 
-export default class ReadyForChallengeValidationRequest extends AcmeRequest {
+class ReadyForChallengeValidationRequest extends AcmeRequest {
   async execute (challengeUrl = throws.ifMissing()) {
     const emptyPayload = {}
 
@@ -33,3 +33,5 @@ export default class ReadyForChallengeValidationRequest extends AcmeRequest {
     return response
   }
 }
+
+module.exports = ReadyForChallengeValidationRequest

package/lib/acmeCsr.js

@@ -12,7 +12,7 @@
 // License: AGPLv3 or later.
 //
 ////////////////////////////////////////////////////////////////////////////////
-import forge from 'node-forge'
+const forge = require('node-forge')
 const DNS = 2 // The ANS.1 type for DNS name.
 
 // Returns a valid ACME-formatted (RFC 8555) CSR.
@@ -24,7 +24,7 @@ const DNS = 2 // The ANS.1 type for DNS name.
  * @param {JWK.rsaKey} key
  * @returns {String} An ACME-formatted CSR in PEM format.
  */
-export default function (domains, key) { return pemToAcmeCsr(csrAsPem(domains, key)) }
+module.exports = function (domains, key) { return pemToAcmeCsr(csrAsPem(domains, key)) }
 
 /**
  * Create a CSR given a list of domains and a Jose JWK.rsaKey.
@@ -62,7 +62,7 @@ function csrAsPem (domains, key) {
     }]
   }])
 
-  csr.sign(keys.private)
+  csr.sign(keys.private, forge.md.sha256.create())
 
   const pem = forge.pki.certificationRequestToPem(csr)
   return pem

package/lib/identities/AccountIdentity.js

@@ -12,12 +12,14 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-import Identity from '../Identity.js'
-import Throws from '../util/Throws.js'
+const Identity = require('../Identity')
+const Throws = require('../util/Throws')
 const throws = new Throws()
 
-export default class AccountIdentity extends Identity {
+class AccountIdentity extends Identity {
   constructor (configuration = throws.ifMissing()) {
     super(configuration, 'accountIdentityPath')
   }
 }
+
+module.exports = AccountIdentity

package/lib/identities/CertificateIdentity.js

@@ -1,5 +1,5 @@
-import Identity from '../Identity.js'
-import Throws from '../util/Throws.js'
+const Identity = require('../Identity')
+const Throws = require('../util/Throws')
 const throws = new Throws()
 
 /**
@@ -13,7 +13,7 @@ const throws = new Throws()
  * @copyright Aral Balkan, Small Technology Foundation
  * @license AGPLv3 or later
  */
-export default class CertificateIdentity extends Identity {
+class CertificateIdentity extends Identity {
   /**
    * Creates an instance of CertificateIdentity.
    *
@@ -24,3 +24,5 @@ export default class CertificateIdentity extends Identity {
     super(configuration, 'certificateIdentityPath')
   }
 }
+
+module.exports = CertificateIdentity

package/lib/staging/fakelerootx1.pem

@@ -1,29 +1,32 @@
 -----BEGIN CERTIFICATE-----
-MIIFATCCAumgAwIBAgIRAKc9ZKBASymy5TLOEp57N98wDQYJKoZIhvcNAQELBQAw
-GjEYMBYGA1UEAwwPRmFrZSBMRSBSb290IFgxMB4XDTE2MDMyMzIyNTM0NloXDTM2
-MDMyMzIyNTM0NlowGjEYMBYGA1UEAwwPRmFrZSBMRSBSb290IFgxMIICIjANBgkq
-hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA+pYHvQw5iU3v2b3iNuYNKYgsWD6KU7aJ
-diddtZQxSWYzUI3U0I1UsRPTxnhTifs/M9NW4ZlV13ZfB7APwC8oqKOIiwo7IwlP
-xg0VKgyz+kT8RJfYr66PPIYP0fpTeu42LpMJ+CKo9sbpgVNDZN2z/qiXrRNX/VtG
-TkPV7a44fZ5bHHVruAxvDnylpQxJobtCBWlJSsbIRGFHMc2z88eUz9NmIOWUKGGj
-EmP76x8OfRHpIpuxRSCjn0+i9+hR2siIOpcMOGd+40uVJxbRRP5ZXnUFa2fF5FWd
-O0u0RPI8HON0ovhrwPJY+4eWKkQzyC611oLPYGQ4EbifRsTsCxUZqyUuStGyp8oa
-aoSKfF6X0+KzGgwwnrjRTUpIl19A92KR0Noo6h622OX+4sZiO/JQdkuX5w/HupK0
-A0M0WSMCvU6GOhjGotmh2VTEJwHHY4+TUk0iQYRtv1crONklyZoAQPD76hCrC8Cr
-IbgsZLfTMC8TWUoMbyUDgvgYkHKMoPm0VGVVuwpRKJxv7+2wXO+pivrrUl2Q9fPe
-Kk055nJLMV9yPUdig8othUKrRfSxli946AEV1eEOhxddfEwBE3Lt2xn0hhiIedbb
-Ftf/5kEWFZkXyUmMJK8Ra76Kus2ABueUVEcZ48hrRr1Hf1N9n59VbTUaXgeiZA50
-qXf2bymE6F8CAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMB
-Af8wHQYDVR0OBBYEFMEmdKSKRKDm+iAo2FwjmkWIGHngMA0GCSqGSIb3DQEBCwUA
-A4ICAQBCPw74M9X/Xx04K1VAES3ypgQYH5bf9FXVDrwhRFSVckria/7dMzoF5wln
-uq9NGsjkkkDg17AohcQdr8alH4LvPdxpKr3BjpvEcmbqF8xH+MbbeUEnmbSfLI8H
-sefuhXF9AF/9iYvpVNC8FmJ0OhiVv13VgMQw0CRKkbtjZBf8xaEhq/YqxWVsgOjm
-dm5CAQ2X0aX7502x8wYRgMnZhA5goC1zVWBVAi8yhhmlhhoDUfg17cXkmaJC5pDd
-oenZ9NVhW8eDb03MFCrWNvIh89DDeCGWuWfDltDq0n3owyL0IeSn7RfpSclpxVmV
-/53jkYjwIgxIG7Gsv0LKMbsf6QdBcTjhvfZyMIpBRkTe3zuHd2feKzY9lEkbRvRQ
-zbh4Ps5YBnG6CKJPTbe2hfi3nhnw/MyEmF3zb0hzvLWNrR9XW3ibb2oL3424XOwc
-VjrTSCLzO9Rv6s5wi03qoWvKAQQAElqTYRHhynJ3w6wuvKYF5zcZF3MDnrVGLbh1
-Q9ePRFBCiXOQ6wPLoUhrrbZ8LpFUFYDXHMtYM7P9sc9IAWoONXREJaO08zgFtMp4
-8iyIYUyQAbsvx8oD2M8kRvrIRSrRJSl6L957b4AFiLIQ/GgV2curs0jje7Edx34c
-idWw1VrejtwclobqNMVtG3EiPUIpJGpbMcJgbiLSmKkrvQtGng==
+MIIFmDCCA4CgAwIBAgIQU9C87nMpOIFKYpfvOHFHFDANBgkqhkiG9w0BAQsFADBm
+MQswCQYDVQQGEwJVUzEzMDEGA1UEChMqKFNUQUdJTkcpIEludGVybmV0IFNlY3Vy
+aXR5IFJlc2VhcmNoIEdyb3VwMSIwIAYDVQQDExkoU1RBR0lORykgUHJldGVuZCBQ
+ZWFyIFgxMB4XDTE1MDYwNDExMDQzOFoXDTM1MDYwNDExMDQzOFowZjELMAkGA1UE
+BhMCVVMxMzAxBgNVBAoTKihTVEFHSU5HKSBJbnRlcm5ldCBTZWN1cml0eSBSZXNl
+YXJjaCBHcm91cDEiMCAGA1UEAxMZKFNUQUdJTkcpIFByZXRlbmQgUGVhciBYMTCC
+AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALbagEdDTa1QgGBWSYkyMhsc
+ZXENOBaVRTMX1hceJENgsL0Ma49D3MilI4KS38mtkmdF6cPWnL++fgehT0FbRHZg
+jOEr8UAN4jH6omjrbTD++VZneTsMVaGamQmDdFl5g1gYaigkkmx8OiCO68a4QXg4
+wSyn6iDipKP8utsE+x1E28SA75HOYqpdrk4HGxuULvlr03wZGTIf/oRt2/c+dYmD
+oaJhge+GOrLAEQByO7+8+vzOwpNAPEx6LW+crEEZ7eBXih6VP19sTGy3yfqK5tPt
+TdXXCOQMKAp+gCj/VByhmIr+0iNDC540gtvV303WpcbwnkkLYC0Ft2cYUyHtkstO
+fRcRO+K2cZozoSwVPyB8/J9RpcRK3jgnX9lujfwA/pAbP0J2UPQFxmWFRQnFjaq6
+rkqbNEBgLy+kFL1NEsRbvFbKrRi5bYy2lNms2NJPZvdNQbT/2dBZKmJqxHkxCuOQ
+FjhJQNeO+Njm1Z1iATS/3rts2yZlqXKsxQUzN6vNbD8KnXRMEeOXUYvbV4lqfCf8
+mS14WEbSiMy87GB5S9ucSV1XUrlTG5UGcMSZOBcEUpisRPEmQWUOTWIoDQ5FOia/
+GI+Ki523r2ruEmbmG37EBSBXdxIdndqrjy+QVAmCebyDx9eVEGOIpn26bW5LKeru
+mJxa/CFBaKi4bRvmdJRLAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMB
+Af8EBTADAQH/MB0GA1UdDgQWBBS182Xy/rAKkh/7PH3zRKCsYyXDFDANBgkqhkiG
+9w0BAQsFAAOCAgEAncDZNytDbrrVe68UT6py1lfF2h6Tm2p8ro42i87WWyP2LK8Y
+nLHC0hvNfWeWmjZQYBQfGC5c7aQRezak+tHLdmrNKHkn5kn+9E9LCjCaEsyIIn2j
+qdHlAkepu/C3KnNtVx5tW07e5bvIjJScwkCDbP3akWQixPpRFAsnP+ULx7k0aO1x
+qAeaAhQ2rgo1F58hcflgqKTXnpPM02intVfiVVkX5GXpJjK5EoQtLceyGOrkxlM/
+sTPq4UrnypmsqSagWV3HcUlYtDinc+nukFk6eR4XkzXBbwKajl0YjztfrCIHOn5Q
+CJL6TERVDbM/aAPly8kJ1sWGLuvvWYzMYgLzDul//rUF10gEMWaXVZV51KpS9DY/
+5CunuvCXmEQJHo7kGcViT7sETn6Jz9KOhvYcXkJ7po6d93A/jy4GKPIPnsKKNEmR
+xUuXY4xRdh45tMJnLTUDdC9FIU0flTeO9/vNpVA8OPU1i14vCz+MU8KX1bV3GXm/
+fxlB7VBBjX9v5oUep0o/j68R/iDlCOM4VVfRa8gX6T2FU7fNdatvGro7uQzIvWof
+gN9WUwCbEMBy/YhBSrXycKA8crgGg3x1mIsopn88JKwmMBa68oS7EHM9w7C4y71M
+7DiA+/9Qdp9RBWJpTS9i/mDnJg1xvo8Xz49mrrgfmcAXTCJqXi24NatI3Oc=
 -----END CERTIFICATE-----

package/lib/staging/monkeyPatchTls.js

@@ -7,18 +7,16 @@
  * @copyright Copyright © 2020 Aral Balkan, Small Technology Foundation.
  * @license AGPLv3 or later.
  */
-import fs from 'fs'
-import tls from 'tls'
-import path from 'path'
-
-const __dirname = new URL('.', import.meta.url).pathname
+const fs   = require('fs')
+const tls  = require('tls')
+const path = require('path')
 
 /**
  * Monkey patches the TLS module to accept the Let’s Encrypt staging certificate.
  *
  * @alias module:lib/MonkeyPatchTls
  */
-export default function monkeyPatchTLS () {
+function monkeyPatchTLS () {
   const originalCreateSecureContext = tls.createSecureContext
 
   let pem = fs
@@ -37,3 +35,5 @@ export default function monkeyPatchTLS () {
     return context
   }
 }
+
+module.exports = monkeyPatchTLS

package/lib/test-helpers/index.js

@@ -4,15 +4,15 @@
 //
 //////////////////////////////////////////////////////////////////////
 
-import fs from 'fs'
-import os from 'os'
-import path from 'path'
-import http from 'http'
-import enableServerDestroy from 'server-destroy'
-import Configuration from '../Configuration.js'
-import LetsEncryptServer from '../LetsEncryptServer.js'
-import Throws from '../util/Throws.js'
-import log from '../util/log.js'
+const fs                  = require('fs-extra')
+const os                  = require('os')
+const path                = require('path')
+const http                = require('http')
+const enableServerDestroy = require('server-destroy')
+const Configuration       = require('../Configuration')
+const LetsEncryptServer   = require('../LetsEncryptServer')
+const Throws              = require('../util/Throws')
+const log                 = require('../util/log')
 
 //
 // Server mocks.
@@ -22,7 +22,7 @@ const throws = new Throws({
   [Symbol.for('MockServerCouldNotBeStartedError')]: details => `Mock server could not be started (${error})`
 })
 
-export class MockServer {
+class MockServer {
   static #isBeingInstantiatedViaAsyncFactoryMethod = false
 
   static async getInstanceAsync (responseHandler = throws.ifMissing()) {
@@ -64,7 +64,7 @@ export class MockServer {
   }
 }
 
-export async function httpServerWithResponse (mockResponse) {
+async function httpServerWithResponse (mockResponse) {
   return new Promise((resolve, reject) => {
     const server = http.createServer((request, response) => {
       response.statusCode = mockResponse.statusCode
@@ -76,26 +76,18 @@ export async function httpServerWithResponse (mockResponse) {
   })
 }
 
-//
-// Pebble setup and teardown.
-//
-
-export class TestContext {
-
-}
-
 //
 // Timing.
 //
 
-export function timeIt(func) {
+function timeIt(func) {
   const startTime = new Date()
   const returnValue = func()
   const endTime = new Date()
   return { returnValue, duration: endTime - startTime }
 }
 
-export async function timeItAsync(func) {
+async function timeItAsync(func) {
   const startTime = new Date()
   const returnValue = await func()
   const endTime = new Date()
@@ -106,7 +98,7 @@ export async function timeItAsync(func) {
 // Error validation.
 //
 
-export function symbolOfErrorThrownBy(func) {
+function symbolOfErrorThrownBy(func) {
   try {
     func()
     return false
@@ -116,7 +108,7 @@ export function symbolOfErrorThrownBy(func) {
   }
 }
 
-export async function symbolOfErrorThrownByAsync(func) {
+async function symbolOfErrorThrownByAsync(func) {
   try {
     await func()
     return false
@@ -126,7 +118,7 @@ export async function symbolOfErrorThrownByAsync(func) {
   }
 }
 
-export function throwsErrorOfType (func, errorSymbol) {
+function throwsErrorOfType (func, errorSymbol) {
   try {
     func()
   } catch (error) {
@@ -137,7 +129,7 @@ export function throwsErrorOfType (func, errorSymbol) {
   return false
 }
 
-export async function throwsErrorOfTypeAsync (asyncFunc, errorSymbol) {
+async function throwsErrorOfTypeAsync (asyncFunc, errorSymbol) {
   try {
     await asyncFunc()
   } catch (error) {
@@ -148,17 +140,18 @@ export async function throwsErrorOfTypeAsync (asyncFunc, errorSymbol) {
   return false
 }
 
-export function dehydrate (string) {
+
+function dehydrate (string) {
   return string.replace(/\s/g, '')
 }
 
-export function createTestSettingsPath () {
-  const testSettingsPath = path.join(os.homedir(), '.small-tech.org', 'auto-encrypt', 'test')
-  fs.rmSync(testSettingsPath, { recursive: true, force: true })
+function createTestSettingsPath () {
+  testSettingsPath = path.join(os.homedir(), '.small-tech.org', 'auto-encrypt', 'test')
+  fs.removeSync(testSettingsPath)
   return testSettingsPath
 }
 
-export function initialiseStagingConfigurationWithOneDomainAtTestSettingsPath () {
+function initialiseStagingConfigurationWithOneDomainAtTestSettingsPath () {
   Configuration.reset()
   Configuration.initialise({
     domains: ['dev.ar.al'],
@@ -167,6 +160,21 @@ export function initialiseStagingConfigurationWithOneDomainAtTestSettingsPath ()
   })
 }
 
-export function setupStagingConfigurationWithOneDomainAtTestSettingsPath () {
+function setupStagingConfigurationWithOneDomainAtTestSettingsPath () {
   initialiseStagingConfigurationWithOneDomainAtTestSettingsPath()
 }
+
+module.exports = {
+  MockServer,
+  timeIt,
+  timeItAsync,
+  symbolOfErrorThrownByAsync,
+  symbolOfErrorThrownBy,
+  throwsErrorOfType,
+  throwsErrorOfTypeAsync,
+  dehydrate,
+  createTestSettingsPath,
+  initialiseStagingConfigurationWithOneDomainAtTestSettingsPath,
+  setupStagingConfigurationWithOneDomainAtTestSettingsPath,
+  httpServerWithResponse
+}

package/lib/util/Pluralise.js

@@ -1,4 +1,4 @@
-export default class Pluralise {
+class Pluralise {
 
   static requiresEs (word) {
     // Note: this is not meant to be comprehensive. It doesn’t take into consideration
@@ -17,3 +17,5 @@ export default class Pluralise {
     return array.length === 1 ? word : `${word}${this.requiresEs(word) ? 'es' : 's'}`
   }
 }
+
+module.exports = Pluralise