From e0d8922c04a4d6557e4c717488d8e37c91ea3fcf Mon Sep 17 00:00:00 2001 From: Martin Donnelly Date: Wed, 17 Feb 2016 13:52:48 +0000 Subject: [PATCH] websocket stuff --- .idea/workspace.xml | 26 +++++++++++++------------- routes/temp.js | 31 ++++++++++++------------------- 2 files changed, 25 insertions(+), 32 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index f1d2de0..7740bff 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -47,8 +47,8 @@ - - + + @@ -461,12 +461,6 @@ - - + + diff --git a/routes/temp.js b/routes/temp.js index f5d79f7..fee4009 100644 --- a/routes/temp.js +++ b/routes/temp.js @@ -1,4 +1,4 @@ -var express = require('express'), fs = require('fs'), sqlite3 = require('sqlite3').verbose(), http=require('http'); +var express = require('express'), fs = require('fs'), sqlite3 = require('sqlite3').verbose(), http = require('http'); var EventEmitter = require('events'); var log4js = require('log4js'); var logger = log4js.getLogger(); @@ -7,7 +7,7 @@ var router = express.Router(); var EventEmitter = require('events'); var busEmitter = new EventEmitter(); -var WebSocketServer = require('ws').Server, wss = new WebSocketServer({ port: 8031 }); +var WebSocketServer = require('websocket').server; var temp_db; var file = process.env.DB_HOME + '/' + "temp.db"; @@ -107,10 +107,10 @@ router.get('/all', function (req, res, next) { temp_db.all('SELECT * from temp', function (err, rows) { var out = []; - // logger.debug(err); - // logger.debug(rows); + // logger.debug(err); + // logger.debug(rows); rows.forEach(function (row) { - // logger.debug(row.date + ', ' + row.reading); + // logger.debug(row.date + ', ' + row.reading); // var t = ; // out.push({"date": Date(row.date), "reading":row.reading}); out.push({"date": row.date, "reading": row.reading}); @@ -129,24 +129,15 @@ module.exports = router; createDB(); -var doInsertEvent = (obj) =>{ +var doInsertEvent = (obj) => { // logger.info('sendSocket: ' + JSON.stringify(obj)); insertTempReading(obj.time, obj.value); } + busEmitter.on('saveTempData', doInsertEvent); -wss.on('connection', function connection(ws) { - ws.on('message', function incoming(message) { - console.log('received: %s', message); - }); - - ws.send('something'); -}); - - // Socket Stuff -/* logger.info('Configuring WebSocket Listener...'); logger.trace('Creating server...'); var server = http.createServer(function (request, response) { @@ -183,10 +174,11 @@ wsServer.on('request', function (request) { return; } - var connection = request.accept('stream', request.origin); + var connection = request.accept('', request.origin); logger.debug((new Date()) + ' Connection accepted.'); - var sendSocketHandler = (obj) => { + var sendSocketHandler = (obj) => + { logger.info('sendSocket: ' + JSON.stringify(obj)); connection.sendUTF(JSON.stringify(obj)); } @@ -208,4 +200,5 @@ wsServer.on('request', function (request) { logger.debug((new Date()) + ' Peer ' + connection.remoteAddress + ' disconnected.'); busEmitter.removeListener('sendSocket', sendSocketHandler); }); -});;;;*/ +});; +