diff --git a/Dockerfile b/Dockerfile index 562fc28..b0936d1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,3 +19,4 @@ EXPOSE 8080 USER databox CMD ["npm","start"] +#CMD ["sleep","3000000"] diff --git a/databox-manifest.json b/databox-manifest.json index 1e0972f..c9ddc6b 100644 --- a/databox-manifest.json +++ b/databox-manifest.json @@ -2,7 +2,7 @@ "manifest-version": 1, "name": "app-light-graph", - "version": "0.3.0", + "version": "0.3.1", "description": "A simple Databox app that plots mobile phone light sensor data", "author": "Yousef Amar (http://yousefamar.com/)", diff --git a/package.json b/package.json index 903f272..4147142 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "app-light-graph", - "version": "0.3.0", + "version": "0.3.1", "description": "A simple Databox app that plots mobile phone light sensor data", "config": { "databox-registry": "localhost:5000" @@ -36,7 +36,7 @@ "dependencies": { "body-parser": "^1.17.1", "express": "^4.15.2", - "node-databox": "^0.9.0", + "node-databox": "^0.10.7", "pug": "^2.0.0-beta11", "ws": "^2.2.1" } diff --git a/server.js b/server.js index 17857ee..6dfe9fe 100644 --- a/server.js +++ b/server.js @@ -5,17 +5,15 @@ const express = require('express'); const bodyParser = require('body-parser'); const databox = require('node-databox'); -var credentials = databox.getHttpsCredentials(); +var credentials = databox.GetHttpsCredentials(); const PORT = process.env.PORT || 8080; +const DATABOX_ARBITER_ENDPOINT = process.env.DATABOX_ARBITER_ENDPOINT; const DATASOURCE_DS_light = process.env.DATASOURCE_DS_light ; -databox.HypercatToSourceDataMetadata(DATASOURCE_DS_light) -.then((data)=>{ - - let DS_light_Metadata = data.DataSourceMetadata; - let store_url = data.DataSourceURL; + let DS_light_Metadata = databox.HypercatToDataSourceMetadata(DATASOURCE_DS_light) + let store_url = databox.GetStoreURLFromHypercat(DATASOURCE_DS_light) const app = express(); @@ -43,14 +41,16 @@ databox.HypercatToSourceDataMetadata(DATASOURCE_DS_light) app.get('/ui/data', function(req, res) { subscription.once('data', (data) => { - res.json(data); + console.log("relay value", data) + res.json(data.data); }); }); - let tsc = databox.NewTimeSeriesBlobClient(store_url, false); + let sc = databox.NewStoreClient(store_url, DATABOX_ARBITER_ENDPOINT, false); - tsc.Observe(DS_light_Metadata.DataSourceID) + sc.TSBlob.Observe(DS_light_Metadata.DataSourceID) .then((subs) => { + console.log("observing " + DS_light_Metadata.DataSourceID) subscription = subs; subscription.on('error',(err)=>{ console.warn(err); @@ -61,8 +61,3 @@ databox.HypercatToSourceDataMetadata(DATASOURCE_DS_light) console.log("Starting UI server .... "); server.listen(PORT); - -}) -.catch((err)=>{ - console.log("Error:: ", err); -}); diff --git a/www/graph.js b/www/graph.js index 101c29d..bb9682c 100644 --- a/www/graph.js +++ b/www/graph.js @@ -78,7 +78,7 @@ document.addEventListener('DOMContentLoaded', () => { (function getDatum() { $.get('ui/data', {}, (data) => { - data = JSON.parse(data); + console.log('data', data);//data = JSON.parse(data); let datum = { timestamp: +data[0], value: +data[1]