embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

move dashboard api into dashboard module

This commit is contained in:
Iuri Matias 2018-03-13 06:24:07 -04:00 committed by Pascal Precht
parent 8b261cbc04
commit 26d7e42218
No known key found for this signature in database
GPG Key ID: 0EE28D8D6FD85D7D
3 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
cmd/dashboard/dashboard.js
View File

@ -27,6 +27,35 @@ class Dashboard {
monitor = new Monitor({env: this.env, events: this.events}); monitor = new Monitor({env: this.env, events: this.events});
this.logger.logFunction = monitor.logEntry; this.logger.logFunction = monitor.logEntry;
let plugin = this.plugins.createPlugin('dashboard', {});
plugin.registerAPICall(
'ws',
'/embark/dashboard',
(ws, req) => {
let dashboardState = { contractsState: [], environment: "", status: "", availableServices: [] };
// TODO: doesn't feel quite right, should be refactored into a shared
// dashboard state
self.events.request('setDashboardState');
self.events.on('contractsState', (contracts) => {
dashboardState.contractsState = [];
contracts.forEach(function (row) {
dashboardState.contractsState.push({contractName: row[0], address: row[1], status: row[2]});
});
ws.send(JSON.stringify(dashboardState));
});
self.events.on('status', (status) => {
dashboardState.status = status;
ws.send(JSON.stringify(dashboardState));
});
self.events.on('servicesState', (servicesState) => {
dashboardState.availableServices = servicesState;
ws.send(JSON.stringify(dashboardState));
});
}
);
this.events.on('contractsState', monitor.setContracts); this.events.on('contractsState', monitor.setContracts);
this.events.on('status', monitor.setStatus.bind(monitor)); this.events.on('status', monitor.setStatus.bind(monitor));

28
lib/modules/webserver/server.js
View File

@ -73,30 +73,10 @@ class Server {
}); });
}); });
app.ws('/embark/dashboard', function(ws, req) { let apiCalls = self.plugins.getPluginsProperty("apiCalls", "apiCalls");
let dashboardState = { contractsState: [], environment: "", status: "", availableServices: [] }; for (let apiCall of apiCalls) {
app[apiCall.method].apply(app, [apiCall.endpoint, apiCall.cb]);
// TODO: doesn't feel quite right, should be refactored into a shared }
// dashboard state
self.events.request('setDashboardState');
self.events.on('contractsState', (contracts) => {
dashboardState.contractsState = [];
contracts.forEach(function (row) {
dashboardState.contractsState.push({contractName: row[0], address: row[1], status: row[2]});
});
ws.send(JSON.stringify(dashboardState));
});
self.events.on('status', (status) => {
dashboardState.status = status;
ws.send(JSON.stringify(dashboardState));
});
self.events.on('servicesState', (servicesState) => {
dashboardState.availableServices = servicesState;
ws.send(JSON.stringify(dashboardState));
});
});
this.app.ws('/', function(ws, _req) { this.app.ws('/', function(ws, _req) {
self.events.on('outputDone', () => { self.events.on('outputDone', () => {

1
test_apps/contracts_app/contracts/another_storage.sol
View File

@ -1,6 +1,5 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
contract AnotherStorage { contract AnotherStorage {
address public simpleStorageAddress; address public simpleStorageAddress;
address simpleStorageAddress2; address simpleStorageAddress2;
address ens; address ens;