Merge pull request #118 from Terminal-Systems/feature/add-custom-sock…

…et-path

Feature - Add custom socket path

README.md

@@ -44,6 +44,7 @@ Default config:
 title: 'Express Status',  // Default title
 theme: 'default.css',     // Default styles
 path: '/status',
+socketPath: '/socket.io', // In case you use a custom path
 websocket: existingSocketIoInstance,
 spans: [{
   interval: 1,            // Every second

package.json

@@ -44,6 +44,11 @@
       "name": "Jiri Spac",
       "email": "[email protected]",
       "url": "https://github.com/capaj/"
+    },
+    {
+      "name": "Max Findel",
+      "email": "[email protected]",
+      "url": "https://github.com/maxfindel/"
     }
   ],
   "repository": {

src/helpers/default-config.js

@@ -2,6 +2,7 @@ module.exports = {
   title: 'Express Status',
   theme: 'default.css',
   path: '/status',
+  socketPath: '/socket.io',
   spans: [
     {
       interval: 1,

src/helpers/validate.js

@@ -16,8 +16,12 @@ module.exports = config => {
 
   config.title =
     typeof config.title === 'string' ? config.title : defaultConfig.title;
+  config.theme =
+    typeof config.theme === 'string' ? config.theme : defaultConfig.theme;
   config.path =
     typeof config.path === 'string' ? config.path : defaultConfig.path;
+  config.socketPath =
+    typeof config.socketPath === 'string' ? config.socketPath : defaultConfig.socketPath;
   config.spans =
     typeof config.spans === 'object' ? config.spans : defaultConfig.spans;
   config.port =

src/middleware-wrapper.js

@@ -22,6 +22,7 @@ const middlewareWrapper = config => {
   const data = {
     title: validatedConfig.title,
     port: validatedConfig.port,
+    socketPath: validatedConfig.socketPath,
     bodyClasses: bodyClasses,
     script: fs.readFileSync(path.join(__dirname, '/public/javascripts/app.js')),
     style: fs.readFileSync(path.join(__dirname, '/public/stylesheets/', validatedConfig.theme))

src/public/index.html

@@ -90,6 +90,7 @@ <h1>{{status}}</h1>
 </div>
 <script>
   var port = '{{port}}';
+  var socketPath = '{{socketPath}}';
   {{{script}}}
 </script>
 </body>

src/public/javascripts/app.js

@@ -2,7 +2,7 @@
   eslint-disable no-plusplus, no-var, strict, vars-on-top, prefer-template,
   func-names, prefer-arrow-callback, no-loop-func
 */
-/* global Chart, location, document, port, parseInt, io */
+/* global Chart, location, document, port, socketPath, parseInt, io */
 
 'use strict';
 
@@ -13,7 +13,7 @@ Chart.defaults.global.elements.line.backgroundColor = 'rgba(0,0,0,0)';
 Chart.defaults.global.elements.line.borderColor = 'rgba(0,0,0,0.9)';
 Chart.defaults.global.elements.line.borderWidth = 2;
 
-var socket = io(location.protocol + '//' + location.hostname + ':' + (port || location.port));
+var socket = io(location.protocol + '//' + location.hostname + ':' + (port || location.port), { path: socketPath });
 var defaultSpan = 0;
 var spans = [];
 var statusCodesColors = ['#75D701', '#47b8e0', '#ffc952', '#E53A40'];