[OZ-0003] fix for http/1 fallback and access logs

Add workaround for http/1 fallback. Reference: molnarg/node-http2#220 Add logging support
zaknuces · Mar 26, 2017 · 8ad9c73 · 8ad9c73
1 parent e4c785c
commit 8ad9c73
Show file tree

Hide file tree

Showing 9 changed files with 58 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 node_modules
+logs
diff --git a/index.js b/index.js
@@ -1,21 +1,43 @@
 var express = require('express');
 var fs = require('fs');
+var http = require('http');
 var http2 = require('http2');
+var morgan = require('morgan');
+var path = require('path');
+
+// Create Express Application
 var app = express();
 
-express.request.__proto__ = http2.IncomingMessage.prototype;
-express.response.__proto__ = http2.ServerResponse.prototype;
+// Make HTTP2 work with Express (this must be before any other middleware)
+require('express-http2-workaround')({ express: express, http2: http2, app: app });
+
+// create a write stream (in append mode)
+var logDirectory = './logs';
+if (!fs.existsSync(logDirectory)){
+    fs.mkdirSync(logDirectory);
+}
+var accessLogStream = fs.createWriteStream(path.join(logDirectory, 'access.log'), {flags: 'a'})
 
 var options = {
   key: fs.readFileSync('./node_modules/http2/example/localhost.key'),
   cert: fs.readFileSync('./node_modules/http2/example/localhost.crt')
 };
 
-app.use(express.static('public'));
+http2
+  .createServer(options, app)
+  .listen(443, function() {
+    console.log("Express HTTP 2 server up and running.");
+  });
 
-app.get('/', function (req, res) {
-  //res.send('Hello World');
-  res.redirect('/main.html');
-});
+http
+  .Server(app)
+  .listen(80, function() {
+    console.log("Express HTTP 1 server up and running.");
+  });
 
-http2.createServer(options, app).listen(3001);
+app
+  .use(morgan('combined', {stream: accessLogStream}))
+  .use(express.static('public'))
+  .get('/', function (req, res) {
+    res.redirect('/main.html');
+  });
diff --git a/package.json b/package.json
@@ -10,6 +10,8 @@
   "license": "ISC",
   "dependencies": {
     "express": "^5.0.0-alpha.5",
-    "http2": "^3.3.6"
+    "express-http2-workaround": "^1.1.2",
+    "http2": "^3.3.6",
+    "morgan": "^1.8.1"
   }
 }
diff --git a/public/devSessionList.html b/public/devSessionList.html
@@ -0,0 +1,11 @@
+<html>
+  <head>
+    <link rel="stylesheet" type="text/css" href="css/theme.css">
+    <script type="text/javascript" src="js/Application.js"></script>
+    <script type="text/javascript" src="js/DevSession.js"></script>
+  </head>
+  <body>
+    <div class="vox-header"> List of Dev Sessions </div>
+    <a class="option home" href="main.html">Home</a>
+  </body>
+</html>
diff --git a/public/images/singapore.jpeg b/public/images/singapore.jpeg
diff --git a/public/js/Application.js b/public/js/Application.js
@@ -0,0 +1,3 @@
+class Application {
+  constructor() {}
+};
diff --git a/public/js/Configuration.js b/public/js/Configuration.js
@@ -0,0 +1,3 @@
+class Configuration {
+  constructor () {}
+}
diff --git a/public/js/DevSession.js b/public/js/DevSession.js
@@ -0,0 +1,3 @@
+class DevSession {
+  constructor () {}
+}
diff --git a/public/main.html b/public/main.html
@@ -1,8 +1,12 @@
 <html>
   <head>
     <link rel="stylesheet" type="text/css" href="css/theme.css">
+    <script type="text/javascript" src="js/Application.js"></script>
+    <script type="text/javascript" src="js/Configuration.js"></script>
   </head>
   <body>
     <div class="vox-header"> Hello World. </div>
+    <img src="images/singapore.jpeg" alt="SG" width="400" height="300"/>
+    <a class="option dev-session" href="devSessionList.html">List of Topics</a>
   </body>
 </html>