From 5c5f73fd6bdf13e203fbacf89c04b7411c804719 Mon Sep 17 00:00:00 2001 From: Martin Donnelly Date: Fri, 23 Sep 2016 16:45:05 +0100 Subject: [PATCH] =?UTF-8?q?=E2=80=9D2016-09-23=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mDotServer.censis/.cfignore | 6 +- .../mDotServer.censis/.vs/HIE/v14/.suo | Bin 64000 -> 56832 bytes .../mDotServer.censis/HIE.sln | 2 +- .../mDotServer.censis/app.js | 66 ++------- .../mDotServer.censis/app/css/custom.css | 2 +- .../mDotServer.censis/app/css/test.css | 17 ++- .../mDotServer.censis/app/js/clock.js | 3 +- .../mDotServer.censis/gulpfile.js | 3 +- .../mDotServer.censis/lib/sockethandler.js | 5 - .../mDotServer.censis/lib/wshandlerv2.js | 6 +- .../mDotServer.censis/package.json | 6 +- .../mDotServer.censis/views/graph-release.ejs | 98 +++++++------- .../mDotServer.censis/views/test2.ejs | 51 ++++--- mdot/simpleMQTT/simpleMQTT/.cfignore | 2 + mdot/simpleMQTT/simpleMQTT/README.md | 127 ++++++++++++++++++ mdot/simpleMQTT/simpleMQTT/config.js | 13 +- .../simpleMQTT/lib/historian/emulator.js | 56 ++++---- .../simpleMQTT/lib/server/db-connector.js | 12 +- .../simpleMQTT/lib/server/db-historian.js | 2 - 19 files changed, 296 insertions(+), 181 deletions(-) diff --git a/mdot/mDotServer.censis/mDotServer.censis/.cfignore b/mdot/mDotServer.censis/mDotServer.censis/.cfignore index 6bcbcef..9424a0e 100644 --- a/mdot/mDotServer.censis/mDotServer.censis/.cfignore +++ b/mdot/mDotServer.censis/mDotServer.censis/.cfignore @@ -1,3 +1,7 @@ node_modules /sql/ -/dist/ +/app/ +/.vs/ +/old_html/ +/server/ +/src/ diff --git a/mdot/mDotServer.censis/mDotServer.censis/.vs/HIE/v14/.suo b/mdot/mDotServer.censis/mDotServer.censis/.vs/HIE/v14/.suo index 40615a7f86ef3891b57f41fa574580a5e999fa4c..8c8e1f5be1a2fefbab7957fc66951758ea7a15b9 100644 GIT binary patch literal 56832 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 diff --git a/mdot/mDotServer.censis/mDotServer.censis/HIE.sln b/mdot/mDotServer.censis/mDotServer.censis/HIE.sln index cac7c9e..bb603ac 100644 --- a/mdot/mDotServer.censis/mDotServer.censis/HIE.sln +++ b/mdot/mDotServer.censis/mDotServer.censis/HIE.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "HIE(1)", "..\HIE", "{272EFB2D-871A-406F-8462-AF9CFE10C6A7}" +Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "HIE(1)", ".", "{272EFB2D-871A-406F-8462-AF9CFE10C6A7}" ProjectSection(WebsiteProperties) = preProject TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0" Debug.AspNetCompiler.VirtualPath = "/localhost_49439" diff --git a/mdot/mDotServer.censis/mDotServer.censis/app.js b/mdot/mDotServer.censis/mDotServer.censis/app.js index ddd8ad9..d53cc76 100644 --- a/mdot/mDotServer.censis/mDotServer.censis/app.js +++ b/mdot/mDotServer.censis/mDotServer.censis/app.js @@ -5,11 +5,11 @@ var express = require('express'); var path = require('path'); var server = require('http').createServer(); -var url = require('url'); var ejs = require('ejs'); var morgan = require('morgan'); var cookieparser = require('cookie-parser'); var session = require('express-session'); +var sessionLW = require('express-session-lw'); var methodoverride = require('method-override'); var bodyparser = require('body-parser'); var errorhandler = require('errorhandler'); @@ -23,31 +23,10 @@ var busEmitter = new Events.EventEmitter(); var WebSocketServer = require('ws').Server; var wss = new WebSocketServer({ server: server }); -//var SocketHandler = require('./lib/sockethandler'); var SocketHandler = require('./lib/wshandlerv2'); -console.log('Pre New SocketHandler'); var webSocket = new SocketHandler(busEmitter, wss); -/* -wss.on('connection', function connection(ws) { - var location = url.parse(ws.upgradeReq.url, true); - // you might use location.query.access_token to authenticate or share sessions - // or ws.upgradeReq.headers.cookie (see http://stackoverflow.com/a/16395220/151312) - - ws.on('message', function incoming(message) { - console.log('received: %s', message); - }); - - ws.send('something'); -}); - -*/ - -console.log('Post New SocketHandler'); - -// Var apn = require('apn'); - require('sugar-date'); var isProduction = false; @@ -70,7 +49,7 @@ logger.warn('isProduction:', isProduction); var heartBeat = function() { this.pingTimer = 0; this.count = 0; - this.rate = 20000; + this.rate = 90000; this.setupPing = function() { logger.warn('Starting heartbeat...'); @@ -90,7 +69,7 @@ var heartBeat = function() { _newDots[this.count - 1] = 'O'; logger.info(_newDots.join('')); - busEmitter.emit('sendSocket',{tick:new Date().getTime()}); + busEmitter.emit('sendSocket',{tick: new Date().getTime()}); this.pingTimer = setTimeout(function() {this.ping();}.bind(this), mod); }; @@ -98,25 +77,17 @@ var heartBeat = function() { this.setupPing(); }; - var app = express(); -/*App.use(authentication(({ - hash: 'sha1', // type of hash - file: 'htpasswd', // path of file - suppress: true // suppress throwing Error if wrong user -})));*/ - - app.set('port', process.env.PORT || 4545); app.set('views', __dirname + '/views'); app.set('view engine', 'ejs'); app.use(morgan('combined')); app.use(cookieparser('your secret here')); -app.use(session({ +/*app.use(session({ secret: '1234567890QWERTY', resave: false, saveUninitialized: false -})); -/* 'default', 'short', 'tiny', 'dev' */ +}));*/ +app.use(sessionLW()); app.use(methodoverride()); app.use(bodyparser.urlencoded({extended: false})); @@ -130,7 +101,7 @@ app.use(function(req, res, next) { next(); }); -// Run npm start --production to use dist +// Run 'npm run production' to use dist var staticDir = isProduction ? 'dist' : 'app'; var graphFile = isProduction ? 'graph-release' : 'test2'; @@ -145,26 +116,18 @@ function originIsAllowed(origin) { return true; } - - app.get('/graph', authentication(({ hash: 'sha1', // Type of hash file: 'htpasswd', // Path of file suppress: true // Suppress throwing Error if wrong user })), function(req, res) { - res.render(graphFile,{delimiter: '^', port:(process.env.VCAP_APP_PORT || 3011)}); + res.render(graphFile,{delimiter: '^', port: (process.env.VCAP_APP_PORT || 3011)}); }); app.get('/meeting', function(req, res) { res.render('meeting',{delimiter: '^'}); }); -// **** - - - - - // Glue routes mdotApi(app); mdotApiV2(app); @@ -173,7 +136,9 @@ meetingApi(app); messageApi(app, busEmitter); -//heartBeat(); +if (isProduction) { + heartBeat(); +} var port = (process.env.VCAP_APP_PORT || 3011); var host = (process.env.VCAP_APP_HOST || 'localhost'); @@ -182,15 +147,8 @@ app.get('*', function(req, res) { res.status(404).render('404',{delimiter: '^'}); }); -/* -var server = app.listen(port, function() { - logger.info('Express listening on ',host, port); - -}); -*/ - server.on('request', app); -server.listen(port, function () { console.log('New server listening on ' + server.address().port) }); +server.listen(port, function() { logger.info('New server listening on ' + server.address().port) }); diff --git a/mdot/mDotServer.censis/mDotServer.censis/app/css/custom.css b/mdot/mDotServer.censis/mDotServer.censis/app/css/custom.css index 82f0a14..e82f5c9 100644 --- a/mdot/mDotServer.censis/mDotServer.censis/app/css/custom.css +++ b/mdot/mDotServer.censis/mDotServer.censis/app/css/custom.css @@ -1622,7 +1622,7 @@ th { color: #F50057; } .mui--text-accent-secondary { - color: rgba(186, 214, 73, 0.54); } + color: #32ffad; } .mui--text-accent-hint { color: rgba(186, 214, 73, 0.38); } diff --git a/mdot/mDotServer.censis/mDotServer.censis/app/css/test.css b/mdot/mDotServer.censis/mDotServer.censis/app/css/test.css index a2dd4f1..6ebafaf 100644 --- a/mdot/mDotServer.censis/mDotServer.censis/app/css/test.css +++ b/mdot/mDotServer.censis/mDotServer.censis/app/css/test.css @@ -30,7 +30,7 @@ html, body { height: 100%; width: 100%; color: white; } /*color: #FD5F00;*/ /*color: #ff0063;*/ - font-family: 'Ubuntu Condensed';; + font-family: 'Ubuntu Condensed'; font-style: normal; font-weight: normal; font-size: 70px; @@ -38,6 +38,18 @@ html, body { height: 100%; width: 100%; color: white; } text-align: center; } + .mui-select > select { + color:#32ffad; + border-bottom :none; + } + + .mui-select__menu { + background-color:#212121 + + } + + + #example { position: relative; color: #ff0063; @@ -132,10 +144,13 @@ html, body { height: 100%; width: 100%; color: white; } padding-left: 0px; margin-left:-20px; color:#00ffb6; + margin-top:-10px; } .widgetLogo { font-family: 'Ubuntu Condensed', sans-serif; font-size: 16px;padding-left:20px; padding-right:0px; color:#00ffb6; + font-size: 160% !important; + margin-top: -10px; } diff --git a/mdot/mDotServer.censis/mDotServer.censis/app/js/clock.js b/mdot/mDotServer.censis/mDotServer.censis/app/js/clock.js index 7ffb6f9..385f9dd 100644 --- a/mdot/mDotServer.censis/mDotServer.censis/app/js/clock.js +++ b/mdot/mDotServer.censis/mDotServer.censis/app/js/clock.js @@ -99,7 +99,8 @@ var Clock = Backbone.View.extend({ if (this.prevDate !== curDate) { this.$date.html(now.format( //'{Weekday}
{Month} {dd}
{yyyy}')); - '{Weekday}
{Month} {dd}')); + //'{Weekday}
{Month} {dd}')); + '{Weekday} {Month} {dd}')); this.prevDate = curDate; } } diff --git a/mdot/mDotServer.censis/mDotServer.censis/gulpfile.js b/mdot/mDotServer.censis/mDotServer.censis/gulpfile.js index d927071..dd9255e 100644 --- a/mdot/mDotServer.censis/mDotServer.censis/gulpfile.js +++ b/mdot/mDotServer.censis/mDotServer.censis/gulpfile.js @@ -79,7 +79,8 @@ gulp.task('styles', function() { 'app/css/custom.css', 'app/css/test.css', 'app/css/style.css', - 'app/css/weather-icons.css']) + 'app/css/weather-icons.css', + 'app/css/material-icons.css']) .pipe(autoprefixer('last 2 version', 'safari 5', 'ie 8', 'ie 9', 'opera 12.1', 'ios 6', 'android 4')) .pipe(cssnano()) .pipe(concat('app.css')) diff --git a/mdot/mDotServer.censis/mDotServer.censis/lib/sockethandler.js b/mdot/mDotServer.censis/mDotServer.censis/lib/sockethandler.js index 39bd26a..081d5b0 100644 --- a/mdot/mDotServer.censis/mDotServer.censis/lib/sockethandler.js +++ b/mdot/mDotServer.censis/mDotServer.censis/lib/sockethandler.js @@ -83,11 +83,6 @@ module.exports = function(events, server) { }; events.on('sendSocket', sendSocketHandler); - /* - Events.on('sendSocket', function(o){ - logger.debug('sendSocket!!', o); - }); -*/ connection.on('message', function(message) { if (message.type === 'utf8') { diff --git a/mdot/mDotServer.censis/mDotServer.censis/lib/wshandlerv2.js b/mdot/mDotServer.censis/mDotServer.censis/lib/wshandlerv2.js index 135d40f..b69db67 100644 --- a/mdot/mDotServer.censis/mDotServer.censis/lib/wshandlerv2.js +++ b/mdot/mDotServer.censis/mDotServer.censis/lib/wshandlerv2.js @@ -13,8 +13,6 @@ var logger = require('log4js').getLogger(); module.exports = function(events, wsServer) { 'use strict'; - logger.debug(wsServer); - wsServer.on('connection', function connection(ws) { var location = url.parse(ws.upgradeReq.url, true); @@ -35,9 +33,11 @@ module.exports = function(events, wsServer) { events.on('sendSocket', sendSocketHandler); +/* ws.on('message', function(message) { - console.log('received:', message); + console.log('received:', message); }); +*/ ws.on('close', function(reasonCode, description) { logger.info((new Date()) + ' Peer ' + connection.remoteAddress + ' disconnected.'); diff --git a/mdot/mDotServer.censis/mDotServer.censis/package.json b/mdot/mDotServer.censis/mDotServer.censis/package.json index 4572174..6daae3e 100644 --- a/mdot/mDotServer.censis/mDotServer.censis/package.json +++ b/mdot/mDotServer.censis/mDotServer.censis/package.json @@ -19,6 +19,7 @@ "events": "^1.1.1", "express": "^4.13.4", "express-session": "*", + "express-session-lw": "^1.0.9", "gulp-babel": "^6.1.2", "gulp-banner": "^0.1.3", "htmlparser": "^1.7.7", @@ -82,7 +83,10 @@ }, "scripts": { "test": "mocha --recursive --reporter spec --bail --check-leaks --timeout 3000", - "start": "node app.js" + "start": "node app.js", + "build": "gulp default", + "production": "NODE_ENV=production node app.js", + "release": "cf push 'mdotserver'" }, "author": "Martin Donnelly", "license": "ISC", diff --git a/mdot/mDotServer.censis/mDotServer.censis/views/graph-release.ejs b/mdot/mDotServer.censis/mDotServer.censis/views/graph-release.ejs index 0d19c38..a162cf2 100644 --- a/mdot/mDotServer.censis/mDotServer.censis/views/graph-release.ejs +++ b/mdot/mDotServer.censis/mDotServer.censis/views/graph-release.ejs @@ -45,32 +45,38 @@
-
-
- +
+
+
+ +
+
+ SMART
Building +
-
+ +
+
-
+
-
+
+ class="mui--text-center time mui--text-accent-secondary">
-
+
-
+
Glasgow
+ class="mui-col-xs-6 mui--bg-primary-dark" >
-
+
@@ -113,69 +119,59 @@
- -
-
- -
- -
+
- -
- -
- -
- -
diff --git a/mdot/mDotServer.censis/mDotServer.censis/views/test2.ejs b/mdot/mDotServer.censis/mDotServer.censis/views/test2.ejs index 59f9409..6cd4832 100644 --- a/mdot/mDotServer.censis/mDotServer.censis/views/test2.ejs +++ b/mdot/mDotServer.censis/mDotServer.censis/views/test2.ejs @@ -1,4 +1,4 @@ - + @@ -43,6 +43,7 @@ +