Skip to content

Update to lib node databox 0.10.7 #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cgreenhalgh wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update to lib node databox 0.10.7 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
13b3dcb
update to lib-node-databox 0.10.7
cgreenhalgh Sep 6, 2019
c0f3b46
use node-databox 0.10.7
cgreenhalgh Sep 9, 2019
a5a1286
revert to default docker image
cgreenhalgh Sep 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ EXPOSE 8080

USER databox
CMD ["npm","start"]
#CMD ["sleep","3000000"]
2 changes: 1 addition & 1 deletion databox-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]> (http://yousefamar.com/)",
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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"
}
Expand Down
23 changes: 9 additions & 14 deletions server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down Expand Up @@ -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);
Expand All @@ -61,8 +61,3 @@ databox.HypercatToSourceDataMetadata(DATASOURCE_DS_light)

console.log("Starting UI server .... ");
server.listen(PORT);

})
.catch((err)=>{
console.log("Error:: ", err);
});
2 changes: 1 addition & 1 deletion www/graph.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down