Merge pull request #1 from jamesbarnett91/websockets

Switch from http polling to websockets

Author: jamesbarnett91

README.md

@@ -51,10 +51,10 @@ If you hit this issue you can try disabling the VirtualBox adapter in `Control P
 - [x] Show historical data
 - [x] Build dists
 - [x] Docker image
-- [ ] Support switching between multiple plugs (currently only works for the fist plug discovered)
+- [x] Support switching between multiple plugs
+- [x] Switch to websockets
 - [ ] Rescan for devices on the fly
 - [ ] Add daily cost metrics
-- [ ] Configurable poll rates
-- [ ] Switch to websockets
+
 
 

app.js

@@ -1,14 +1,14 @@
-var createError = require('http-errors');
-var express = require('express');
-var path = require('path');
-var cookieParser = require('cookie-parser');
-var logger = require('morgan');
+const createError = require('http-errors');
+const express = require('express');
+const path = require('path');
+const cookieParser = require('cookie-parser');
+const logger = require('morgan');
 
-var indexRouter = require('./routes/index');
-var energyUsageRouter = require('./routes/energy-usage');
-var powerStateRouter = require('./routes/power-state');
+const app = express();
+const expressWs =  require('express-ws')(app);
 
-var app = express();
+const indexRouter = require('./routes/index');
+const wsRouter = require('./routes/ws');
 
 // view engine setup
 app.set('views', path.join(__dirname, 'views'));
@@ -21,8 +21,7 @@ app.use(cookieParser());
 app.use(express.static(path.join(__dirname, 'public')));
 
 app.use('/', indexRouter);
-app.use('/energy-usage', energyUsageRouter);
-app.use('/power-state', powerStateRouter);
+app.use('/ws', wsRouter);
 
 // catch 404 and forward to error handler
 app.use(function(req, res, next) {
@@ -40,4 +39,12 @@ app.use(function(err, req, res, next) {
   res.render('error');
 });
 
-module.exports = app;
+app.listen(process.env.PORT || '3000');
+
+module.exports.getWsClientCount = function() {
+  return expressWs.getWss().clients.size;
+};
+
+module.exports.getWsClients = function() {
+  return expressWs.getWss().clients;
+};

bin/www

@@ -8,7 +8,7 @@
     "name": "James Barnett"
   },
   "scripts": {
-    "start": "node ./bin/www",
+    "start": "node ./app.js",
     "dist": "pkg . --out-path ./dist"
   },
   "dependencies": {
@@ -19,13 +19,14 @@
     "http-errors": "~1.6.2",
     "morgan": "~1.9.0",
     "tplink-smarthome-api": "0.22.0",
-    "moment": "2.22.0"
+    "moment": "2.22.0",
+    "express-ws": "3.0.0"
   },
   "devDependencies": {
     "pkg": "4.3.1"
   },
   "bin" : {
-    "tplink-monitor": "./bin/www"
+    "tplink-monitor": "./app.js"
   },
   "pkg": {
     "scripts": "node_modules/hbs/lib/hbs.js",