martin/SilvrAPI
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

websocket stuff

Browse Source
This commit is contained in:
Martin Donnelly 2016-02-17 13:52:48 +00:00
parent 4e18f96286
commit e0d8922c04
2 changed files with 25 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
.idea/workspace.xml
View File

@ -47,8 +47,8 @@
<file leaf-file-name="temp.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/routes/temp.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-0.31578946">
<caret line="109" column="28" selection-start-line="109" selection-start-column="28" selection-end-line="109" selection-end-column="28" />
<state vertical-scroll-proportion="0.68421054">
<caret line="185" column="0" selection-start-line="185" selection-start-column="0" selection-end-line="185" selection-end-column="0" />
<folding />
</state>
</provider>
@ -461,12 +461,6 @@
<option name="number" value="Default" />
<updated>1447021065296</updated>
</task>
<task id="LOCAL-00006" summary="trying to persist the db again">
<created>1447068685007</created>
<option name="number" value="00006" />
<option name="project" value="LOCAL" />
<updated>1447068685007</updated>
</task>
<task id="LOCAL-00007" summary="trying to persist the db again">
<created>1447077123179</created>
<option name="number" value="00007" />
@ -755,7 +749,13 @@
<option name="project" value="LOCAL" />
<updated>1455711027038</updated>
</task>
<option name="localTasksCounter" value="55" />
<task id="LOCAL-00055" summary="websocket stuff">
<created>1455711342213</created>
<option name="number" value="00055" />
<option name="project" value="LOCAL" />
<updated>1455711342213</updated>
</task>
<option name="localTasksCounter" value="56" />
<servers />
</component>
<component name="ToolWindowManager">
@ -768,8 +768,8 @@
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="npm" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2614108" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.47095436" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2614108" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24377593" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32780084" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
@ -1220,8 +1220,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/routes/temp.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-0.31578946">
<caret line="109" column="28" selection-start-line="109" selection-start-column="28" selection-end-line="109" selection-end-column="28" />
<state vertical-scroll-proportion="0.68421054">
<caret line="185" column="0" selection-start-line="185" selection-start-column="0" selection-end-line="185" selection-end-column="0" />
<folding />
</state>
</provider>

31
routes/temp.js
View File

@ -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);
});
});;;;*/
});;