v0.8.0

bin/local.cert

@@ -1,24 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIID+zCCAuOgAwIBAgIUSmxxlSP0iULa68cGdJGcOsqX9CAwDQYJKoZIhvcNAQEL
+MIID+zCCAuOgAwIBAgIUErbosxJMk0dLTsMRgm4TSeQXDAgwDQYJKoZIhvcNAQEL
 BQAwgYwxCzAJBgNVBAYTAkxOMREwDwYDVQQIDAhJbnRyYW5ldDEOMAwGA1UEBwwF
 TG9jYWwxFjAUBgNVBAoMDUxvY2FsIE5ldHdvcmsxEDAOBgNVBAsMB05ldHdvcmsx
 EjAQBgNVBAMMCWxvY2FsaG9zdDEcMBoGCSqGSIb3DQEJARYNbG9jYWxAbmV0d29y
-azAeFw0xOTA1MTkwODI2MTBaFw0yMDA1MTgwODI2MTBaMIGMMQswCQYDVQQGEwJM
+azAeFw0xOTA1MjIxNjUwNTNaFw0yMDA1MjExNjUwNTNaMIGMMQswCQYDVQQGEwJM
 TjERMA8GA1UECAwISW50cmFuZXQxDjAMBgNVBAcMBUxvY2FsMRYwFAYDVQQKDA1M
 b2NhbCBOZXR3b3JrMRAwDgYDVQQLDAdOZXR3b3JrMRIwEAYDVQQDDAlsb2NhbGhv
 c3QxHDAaBgkqhkiG9w0BCQEWDWxvY2FsQG5ldHdvcmswggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC6drN1kF098wLJRMyBx/uzs8Guj/MNmpbzE/6RvGdP
-BG/uF/fWOKCY0/ZQ0wuIYNwnMOGuXDLhTwAA7LxwWsb4z//XRsPQX0P5YKW6v5W+
-TVm09BJPyyAoA3vcVdKFfa1X1zI56kClbWhY7K7FQQKamaMeMit5aMtQ9RrUHlvg
-/dWG/2o7/onpLdsHp4VsMupuueMFS+DJVLg1CLFuIfecE5+LTIx2xYAHTzMoM9Uo
-OZ/uEvwqjX5UOaJwNQH6xoSXODM9Ma0xPldiAjMmuiMaVYe+inDHWC4RhHo3w9Qp
-96z+9RjEKgMtZG5PUKHwG7I0p3pniRvySdWpeiAMapUJAgMBAAGjUzBRMB0GA1Ud
-DgQWBBR+13TuOhmziouf4urKizXYeHPRfzAfBgNVHSMEGDAWgBR+13TuOhmziouf
-4urKizXYeHPRfzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQB8
-fDoG1Zm1NaeT1xFSgzS1GWaE5U+No4xgG/8WtLrq3dL45VlOOLquLVk6U1COkceY
-E2VTJHthCmTGAasmXlQwsTN8K+j08A1CnTpq9xHR/HAmidlVO6wquiFmWCDTS04j
-uR6zxLXxkGbCf6ano2jf5Hhlkfovb8WGZPfSkk5HCNjdkbQAehdlgMLS4L/EohIA
-CH/lVoI2OwvE0EoOvKbyTwbq5rObllj733sxE2tBBf+PDnrLfq8C60NhyofiSB2f
-2+VuH2WwcS4LrlonF9JvgO16YS2I1ZXtOJI8RLpcUkyRk8PLUsZXo/OjyQeGwLVI
-84iYPnF5GZHJriBhTxtV
+AQUAA4IBDwAwggEKAoIBAQDrGMzOuAzIc1kx6dMisVDotKMQ5C4AFc8Wzn6ZsMQ/
+UqsViIwb8dr1vlVzPBIMtdOQVsn8l840fGtloCF5T9LXc6x1+EnLANHOrEeNO8n8
+uxhPCSx/bJg2AearGcSKKRcBU6WtJ3ig49YEaqX03y/ehuAALWVJpUJXTeLcAx+Z
+FfiHYiAS+K1kdmYf4wG7EGRoCj3RVo1OClPIB1GkF8rbydoTuugvFipTAOIfvA/H
+tlUPxChqJaOFOZZp27YwYYtZOEDstyPQCUNCjgch/bq+IRD1K3MWGxtDeAUibQoA
+IV5SvkZjN1Xh+zt1wX7f3Rn7bjPYVRQbOBqzHwrwvXb/AgMBAAGjUzBRMB0GA1Ud
+DgQWBBRNl+0cibHdv9PSY2R26/AD/eXcqTAfBgNVHSMEGDAWgBRNl+0cibHdv9PS
+Y2R26/AD/eXcqTAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBt
+SXofJo/ML6sxJwOpxv5cPrP7YMhGx2UuUR7YkMQezKxUgPbaaXMDmuVFBRhVpYHL
+2qCDhu+YGsUuqOSZsoIT6qnC769TdGrNBURZ2CYtCMJVYaJBLfBe4wWVsAKQ3MYg
+XZprO8tcgn6fwDp5X6KUUBrIiGpueRU7ACqpF0JOFM1etA67vYxSl98a3tnfsHCG
+FdoH429cvtyNufIF0pHcO8bHVeQQeq/Ccj69QV+XMkMgQeALxTVcj2GynZf3rqZY
+LkXBCCCj1rjeEoxrQhLTTrKKCxlLk51KXABZ50ssiUTaIeEv3vZjeyZnEwxM7CcC
+mkFqL2faESHvRGpgEk36
 -----END CERTIFICATE-----

bin/local.key

@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC6drN1kF098wLJ
-RMyBx/uzs8Guj/MNmpbzE/6RvGdPBG/uF/fWOKCY0/ZQ0wuIYNwnMOGuXDLhTwAA
-7LxwWsb4z//XRsPQX0P5YKW6v5W+TVm09BJPyyAoA3vcVdKFfa1X1zI56kClbWhY
-7K7FQQKamaMeMit5aMtQ9RrUHlvg/dWG/2o7/onpLdsHp4VsMupuueMFS+DJVLg1
-CLFuIfecE5+LTIx2xYAHTzMoM9UoOZ/uEvwqjX5UOaJwNQH6xoSXODM9Ma0xPldi
-AjMmuiMaVYe+inDHWC4RhHo3w9Qp96z+9RjEKgMtZG5PUKHwG7I0p3pniRvySdWp
-eiAMapUJAgMBAAECggEBAKQD64Fa9hma23WM9dKmxUlhsdlJt8LcmzDAAqnQrpK7
-1XT6Uj912hX0RHL94OQaRyyV+72yTfMP2XH2yx6NSv3rgCCtl2p/kbwW/lCRWzdk
-tKbOFhloFCX+QoIiX6aaUNK2cPCulCSvYxztPCI4OAEjaW8TNFh8DHNu1iWFes4h
-GFwsSK+yhb5HKJMMmrrU/SagHeaEbrVHkUWv655Y5oGqrMwS0W/yIARLBw2fK48I
-mgMHDIQKMlFdP5bJDeV1aWFaKLxfG3R1RsmQFjdUDfRs1b+I27/iQAfNOAgAhIhK
-dL8jt+8W5pDdmb64aL/C5tdCe694KC5wWWIiBT/Wya0CgYEA5Os1Ryd7AL09sKKN
-In7TOgYUuQypF1o2Lp/wBUvlwWrrsgk9hWJ/EPVMxUqPqMzsaxnJufBzIT8Pr+r/
-FO9JZG9pfc0HSLY655zSmuEMBpDlI7DXRc48P0EaC/B5KVLR/aO4wSr78fXoe7NE
-qzJs51Gnd6LXrspm3ATF+SBMVncCgYEA0IW+FLEkAMAg92iwwg+eQqWPCHL4WySi
-+TyhQwXTMP1CfZ5EvLNwxvqels6pUuXK1SGWVw3US3ReO9jXfknc+PmlrNfB38Xg
-wvceexpgYMpHx1yoz4P5PLOSTj7ww9axvUshmEQ1w8UVXK1Y9Oo+WAUNAmQdY4Q+
-lMpJ/hXN0H8CgYA0jiNvMIs2wjuVf9wzHTbVTWwYh+WSLO3fimyKasBWxXtTJnfv
-VYuikw6LBPEyacmlVQhRHfjwmw+47ZSec8k/u6xWa2nOsbeYURKw6BXgtAdHSGRD
-7HM8em/GafEHIbKALsRN5NZu2GwFakTLoQoLmV1/Q+2MfX9b5+Sjq1ybRQKBgHHs
-L74kTVQvo5Mn2jIb0E3/H5bxISjCaluauUvhudEw/Iue1VT3AC1lrREdVTraGqe4
-kud6wbp7mCRAQvNXLWfFFLPKqLw14qcB1eBRt8gJm4+a2wuMwbVdMhiXoHiOKksN
-6gvDcFBFs3cPqeMcuvThxYrB4aCGFp65qhUsGmbHAoGAWTdHu6BekXvVKTE/85g5
-/l1DkvGxba5NZVRuIskhktMtDS2CWtJSnRJ/ScmYzSACd175ZbsYWBn0NsEU8H0J
-Y9tKPz4DgVhGYK5uRKvPQ8huC/11K/8PgskmdJIAANIC7Co2nSGiA8ts5Mm6pVzF
-aJMXxk2Anprfx/XBynB/Ry8=
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDrGMzOuAzIc1kx
+6dMisVDotKMQ5C4AFc8Wzn6ZsMQ/UqsViIwb8dr1vlVzPBIMtdOQVsn8l840fGtl
+oCF5T9LXc6x1+EnLANHOrEeNO8n8uxhPCSx/bJg2AearGcSKKRcBU6WtJ3ig49YE
+aqX03y/ehuAALWVJpUJXTeLcAx+ZFfiHYiAS+K1kdmYf4wG7EGRoCj3RVo1OClPI
+B1GkF8rbydoTuugvFipTAOIfvA/HtlUPxChqJaOFOZZp27YwYYtZOEDstyPQCUNC
+jgch/bq+IRD1K3MWGxtDeAUibQoAIV5SvkZjN1Xh+zt1wX7f3Rn7bjPYVRQbOBqz
+HwrwvXb/AgMBAAECggEBAJ4/WU0kkmYzTqzMafSGSqH5RXJPRa+E/pqpcIpfdBnz
+uXmLKlR9HhgggEBLBRNNKRWVdezy+jhWL6x+d0nDM3cXQ9U8xd9Bs/hb+uXUgwf9
+oEVDNZKoNGTWLsCpXaRqODQKbBD76rTR5/OdHgyQVxaAzzMPW4iRFvDRWo0iBRjz
+aMnVwRp5bKsLK+56qLZE8yUf5STP/hsYt6ofHWPVAaUnhYJU86H7WxBeUppLxjtY
+cWwNcZ4JRpABrEnPYo/6dsGcjYWIl7n6KhVzMO9BDhE2X+oYpGoOjX55DC991B9+
+nVQetf/LwnVzDfmfHQjscDxv8zwA9kfgtoiNj4cra6ECgYEA9wpFwc54HhPPwlBK
+1BW6GDFP9IEpBROoHAFHnzbGt2NXimkfYDR9a1rf6jGw66+7tv9OjLBobu234EqP
+/EaCo/Q/RDmWfdLMq3Z1C336fiuvCuRMJ48ei0yPI3kkhHcfjRRZwgSPSEuxHy6P
+GFvvaBfKVM5Bl+3+4+HIzdm+bTcCgYEA85+i6h9BKN0Tjy1M27A8xGty89oZtwG3
+iv0Vv7XyU0fs6o2itD1oifn9RgNuhcn4GyR2sInkjBuA8ZWT0oXIoIyWwahy9uqk
+4Al8y3vMAZZaqlDAA1r1UpiYBEGph30tDsC4L6cI4gWJ4+/vOCvUA9kH6GTwzcaP
+YHoaejRO6HkCgYA8BIDiDvlbxVBqUvt6/zRRAFn+ewquMxJai20NH0+z6iywcc2v
+n9EArflMenoTKISgdvJsd8dHe/V6RmMo1TCUCJj+SEdpljcnSQYyno6m7JIAQWrH
+CZxQF2+HHL1keVRvAAy2eEkfNVR40OTu9Bb74RvE8r843Bda4dXZPRdojQKBgQCG
+fG9gstQzjKcJeMZe2BETlQUmHBXp8qaxsThaVkRpOOFOMdXJjcSxtjDcf3R5op61
+zRFALz7dISmzMxEhO/0es71dNnIQYEOX8WTUp4hcr/Vo4567u3CFofr5Do5ZXv6K
+kFSc6aZ7rvcJvx/dcERfw2UcIuzTi3MGnSEUqN+OcQKBgFmAObec3ZehXBsPrPR3
+LbuXyRLNQdvXuu8gSTUzab087Vhlnexc/rW7ViFqvKeffQSXFPNxeg8ZCCkulP89
+PlsVmjFNcuzuS1n1cuEPAWEYhuWHmhlJCBtNV+mUQj7vdHoZWK2kocqZQRg0X5eQ
+Fu0ksBTvwCGVDVzh6+6c6x9U
 -----END PRIVATE KEY-----

lib/serv-utils.js

@@ -10,7 +10,6 @@ const staticHandler = require('./static-serv.js');
 
 const compressionHandler = promisify(compression());
 
-const binPath = path.resolve('./bin/');
 
 /**
  * Return the type of http server required
@@ -75,11 +74,11 @@ module.exports.createServer = async opts => {
     // use certificate files
     cert = fs.readFileSync(args['ssl-cert']);
     key = fs.readFileSync(args['ssl-key']);
-  } else {
+  } else if (opts.ssl) {
     // use fallback certs
     // opts.ssl might be enabled due to http2
-    cert = fs.readFileSync(path.join(binPath, 'local.cert'));
-    key = fs.readFileSync(path.join(binPath, 'local.key'));
+    cert = fs.readFileSync(path.join(__dirname, '../bin/local.cert'));
+    key = fs.readFileSync(path.join(__dirname, '../bin/local.key'));
   }
 
   const handler = getHandler(opts);

lib/static-serv.js

@@ -44,7 +44,7 @@ const send500 = (req, res) => {
  * @return {Function}
  */
 const staticHandler = opts => {
-  const staticDir = opts.dir;
+  const staticDir = opts.dir || './';
   const listing = opts.listing;
 
   // return handler

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ramlmn/serv",
-  "version": "0.6.0",
+  "version": "0.8.0",
   "author": "@r0mflip",
   "description": "Static file server with https and http2",
   "license": "MIT",