feat: added http2, removed old deps

niftylettuce · niftylettuce · commit 45800cad4af7 · 2019-09-09T01:55:03.000-05:00
diff --git a/index.js b/index.js
@@ -1,5 +1,6 @@
 const http = require('http');
-const http2 = require('spdy');
+const http2 = require('http2');
+const util = require('util');
 
 const Cabin = require('cabin');
 const I18N = require('@ladjs/i18n');
@@ -18,7 +19,6 @@ const cors = require('kcors');
 const errorHandler = require('koa-better-error-handler');
 const etag = require('koa-etag');
 const helmet = require('koa-helmet');
-const ip = require('ip');
 const json = require('koa-json');
 const koa404Handler = require('koa-404-handler');
 const koaConnect = require('koa-connect');
@@ -160,38 +160,25 @@ class API {
 
     // start server on either http or https
     if (this.config.protocol === 'https')
-      server = http2.createServer(this.config.ssl, app.callback());
+      server = http2.createSecureServer(this.config.ssl, app.callback());
     else server = http.createServer(app.callback());
 
-    // expose app and server
+    // expose app, server, client
     this.app = app;
     this.server = server;
+    this.client = client;
 
     autoBind(this);
   }
 
-  listen(port, fn) {
-    if (_.isFunction(port)) {
-      fn = port;
-      port = null;
-    }
-
-    const { logger } = this.config;
-    if (!_.isFunction(fn))
-      fn = function() {
-        const { port } = this.address();
-        logger.info(
-          `Lad API server listening on ${port} (LAN: ${ip.address()}:${port})`
-        );
-      };
-
-    this.server = this.server.listen(port, fn);
-    return this.server;
+  async listen(port) {
+    const { server } = this;
+    this.server = await util.promisify(server.listen).bind(server)(port);
   }
 
-  close(fn) {
-    this.server.close(fn);
-    return this;
+  async close() {
+    const { server } = this;
+    this.server = await util.promisify(server.close).bind(server);
   }
 }
 
diff --git a/package.json b/package.json
@@ -22,13 +22,12 @@
   "dependencies": {
     "@koa/router": "^8.0.1",
     "@ladjs/i18n": "^1.2.1",
-    "@ladjs/redis": "^1.0.2",
-    "@ladjs/shared-config": "^0.0.7",
+    "@ladjs/redis": "^1.0.3",
+    "@ladjs/shared-config": "^0.0.8",
     "@ladjs/store-ip-address": "^0.0.6",
     "boolean": "^1.0.0",
-    "cabin": "^5.0.1",
+    "cabin": "^5.0.3",
     "express-request-id": "^1.4.1",
-    "ip": "^1.1.5",
     "kcors": "^2.2.2",
     "koa": "^2.8.1",
     "koa-404-handler": "^0.0.2",
@@ -46,8 +45,7 @@
     "koa-simple-ratelimit": "^3.1.0",
     "lodash": "^4.17.15",
     "request-received": "^0.0.2",
-    "response-time": "^2.3.2",
-    "spdy": "^4.0.1"
+    "response-time": "^2.3.2"
   },
   "devDependencies": {
     "@commitlint/cli": "^8.1.0",
diff --git a/yarn.lock b/yarn.lock
@@ -453,17 +453,17 @@
     qs "^6.8.0"
     titleize "^2.1.0"
 
-"@ladjs/redis@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@ladjs/redis/-/redis-1.0.2.tgz#04dcfcd96606375927e0a07f3b088e33da27d1bc"
-  integrity sha512-B7SYfjj0GRfQ8R7I+dvGY0Xk9NHoxEgoxC83vQUFHFWsWxIOh4R2bBKxopba+/7I+NX7GQxZVMYmAlrn7ajJNg==
+"@ladjs/redis@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@ladjs/redis/-/redis-1.0.3.tgz#4232bfea8af56c07a7b43e651c1f0762e888e917"
+  integrity sha512-oO/vSfhkMkxwtnx4oXZtE8zIhOz2sAC+AdoAsPtRBedO5qvUqARIffUcu5TMtK4ubI2Dq3wm+TA0cDN1euzY1g==
   dependencies:
     ioredis "^4.14.0"
 
-"@ladjs/shared-config@^0.0.7":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@ladjs/shared-config/-/shared-config-0.0.7.tgz#85cf61a38aebdbd57a8487edddc899e27baae1fc"
-  integrity sha512-FI2jEwLLx+ZhZ527R7/+UhxaICoC0a3faK9/ydlaBsj6UXq+0J9DvQwPzfUBsgXKc4LXtU/UYmIDW07pzRVXqg==
+"@ladjs/shared-config@^0.0.8":
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/@ladjs/shared-config/-/shared-config-0.0.8.tgz#d90d72dc7d7f685babf69dfda68806929afcab4c"
+  integrity sha512-+GptNuh16b2jJo6SWGqm6YVsnfVC9tzHRQ2P9pfdQGYPadWMHx/swL+u6/u8cQGBRGkpX/VzrpMo0txsfcGRpg==
   dependencies:
     boolean "^1.0.0"
 
@@ -982,10 +982,10 @@ ava@^2.3.0:
     update-notifier "^3.0.1"
     write-file-atomic "^3.0.0"
 
-axe@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/axe/-/axe-4.0.1.tgz#f89cd847c6edbec671ae5ee244326c499bb3e813"
-  integrity sha512-zrvqWZ/4xqxvwjoH4ogGJPCjpCBBv9kMtIf9erUv7WcE17nblBPaUrc/r7+wFyNemdQ15W5fz61hsPOJKvxaEQ==
+axe@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/axe/-/axe-4.0.3.tgz#b83d9cc37f04874958486a47b78cda798945f42a"
+  integrity sha512-DsnmuHoRoxet1BHOLxderq9DIh58T7pvKga2qWYcQuDWO25EcgH/Svc+AsPoZj65tm4D9V2sZI7v1b/qzutEWQ==
   dependencies:
     boolean "^1.0.0"
     console-polyfill "^0.3.0"
@@ -1184,13 +1184,13 @@ bytes@3.1.0, bytes@^3.0.0:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
   integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
 
-cabin@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/cabin/-/cabin-5.0.1.tgz#0bd2966f485be9112dd25ffcd7e55f63c9d78573"
-  integrity sha512-xjmBPTeE3EdIrdKI++gHHI38yJse5sXUT3QnYCsmtC48zVUSn9aBDO7Sa/9Ga0B++Wnrpn6rWzquOa5gYYB1Pw==
+cabin@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/cabin/-/cabin-5.0.3.tgz#86bd985de8ecf3342e6b9a5f02235aeecc073b97"
+  integrity sha512-czCHOvm6lkc1ag7MxvLH3cU0i7Ua4utczE99On0khiYup0gcFh7cEnjprgmw10bE/4QXyz/+/R2kIrnxE6hudw==
   dependencies:
     ansi-colors "^4.1.1"
-    axe "^4.0.1"
+    axe "^4.0.3"
     basic-auth "^2.0.1"
     clf-date "^0.1.0"
     iserror "^0.0.2"
@@ -2160,11 +2160,6 @@ detect-indent@^5.0.0:
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
   integrity sha1-OHHMCmoALow+Wzz38zYmRnXwa50=
 
-detect-node@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
-  integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
-
 dir-glob@^2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4"
@@ -3358,11 +3353,6 @@ graceful-fs@*, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, gra
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.2.tgz#6f0952605d0140c1cfdb138ed005775b92d67b02"
   integrity sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==
 
-handle-thing@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.0.tgz#0e039695ff50c93fc288557d696f3c1dc6776754"
-  integrity sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==
-
 handlebars@^4.1.2:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.2.0.tgz#57ce8d2175b9bbb3d8b3cf3e4217b1aec8ddcb2e"
@@ -3510,16 +3500,6 @@ hosted-git-info@^2.1.4, hosted-git-info@^2.5.0:
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.4.tgz#44119abaf4bc64692a16ace34700fed9c03e2546"
   integrity sha512-pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ==
 
-hpack.js@^2.1.6:
-  version "2.1.6"
-  resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
-  integrity sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=
-  dependencies:
-    inherits "^2.0.1"
-    obuf "^1.0.0"
-    readable-stream "^2.0.1"
-    wbuf "^1.1.0"
-
 hpkp@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/hpkp/-/hpkp-2.0.0.tgz#10e142264e76215a5d30c44ec43de64dee6d1672"
@@ -3545,11 +3525,6 @@ http-cache-semantics@^4.0.0:
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.0.3.tgz#495704773277eeef6e43f9ab2c2c7d259dda25c5"
   integrity sha512-TcIMG3qeVLgDr1TEd2XvHaTnMPwYQUQMIBLy+5pLSDKYFc7UIqj39w8EGzZkaxoLv/l2K8HaI0t5AVA+YYgUew==
 
-http-deceiver@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
-  integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=
-
 http-errors@1.7.3, http-errors@^1.3.1, http-errors@^1.6.3, http-errors@~1.7.2:
   version "1.7.3"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06"
@@ -3770,11 +3745,6 @@ ioredis@^4.14.0:
     redis-parser "^3.0.0"
     standard-as-callback "^2.0.1"
 
-ip@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
-  integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
-
 irregular-plurals@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/irregular-plurals/-/irregular-plurals-2.0.0.tgz#39d40f05b00f656d0b7fa471230dd3b714af2872"
@@ -5222,11 +5192,6 @@ mimic-response@^1.0.0, mimic-response@^1.0.1:
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
   integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
 
-minimalistic-assert@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
-  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
-
 "minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
@@ -5644,11 +5609,6 @@ observable-to-promise@^1.0.0:
     is-observable "^2.0.0"
     symbol-observable "^1.0.4"
 
-obuf@^1.0.0, obuf@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
-  integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
-
 omit.js@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/omit.js/-/omit.js-1.0.2.tgz#91a14f0eba84066dfa015bf30e474c47f30bc858"
@@ -6348,7 +6308,7 @@ read-pkg@^5.1.1:
     parse-json "^5.0.0"
     type-fest "^0.6.0"
 
-readable-stream@2, readable-stream@^2.0.1, readable-stream@^2.3.5, readable-stream@~2.3.6:
+readable-stream@2, readable-stream@^2.3.5, readable-stream@~2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
@@ -6361,7 +6321,7 @@ readable-stream@2, readable-stream@^2.0.1, readable-stream@^2.3.5, readable-stre
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@^3.0.2, readable-stream@^3.0.6, readable-stream@^3.4.0:
+readable-stream@^3.0.2, readable-stream@^3.4.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz#a51c26754658e0a3c21dbf59163bd45ba6f447fc"
   integrity sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==
@@ -7553,11 +7513,6 @@ scandirectory@^2.5.0:
     safefs "^3.1.2"
     taskgroup "^4.0.5"
 
-select-hose@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
-  integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
-
 semver-compare@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
@@ -7792,29 +7747,6 @@ spdx-license-list@^3.0.1:
   resolved "https://registry.yarnpkg.com/spdx-license-list/-/spdx-license-list-3.0.1.tgz#163d72123e00f4f8bd6e18125696b009f1248ff5"
   integrity sha1-Fj1yEj4A9Pi9bhgSVpawCfEkj/U=
 
-spdy-transport@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31"
-  integrity sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==
-  dependencies:
-    debug "^4.1.0"
-    detect-node "^2.0.4"
-    hpack.js "^2.1.6"
-    obuf "^1.1.2"
-    readable-stream "^3.0.6"
-    wbuf "^1.7.3"
-
-spdy@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.1.tgz#6f12ed1c5db7ea4f24ebb8b89ba58c87c08257f2"
-  integrity sha512-HeZS3PBdMA+sZSu0qwpCxl3DeALD5ASx8pAX0jZdKXSpPWbQ6SYGnlg3BBmYLx5LtiZrmkAZfErCm2oECBcioA==
-  dependencies:
-    debug "^4.1.0"
-    handle-thing "^2.0.0"
-    http-deceiver "^1.2.7"
-    select-hose "^2.0.0"
-    spdy-transport "^3.0.0"
-
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
@@ -8805,13 +8737,6 @@ watchr@~2.4.13:
     taskgroup "^4.2.0"
     typechecker "^2.0.8"
 
-wbuf@^1.1.0, wbuf@^1.7.3:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df"
-  integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==
-  dependencies:
-    minimalistic-assert "^1.0.0"
-
 wcwidth@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
