From 3d9671552aa44c2a46db34d2561e9df218a93a27 Mon Sep 17 00:00:00 2001
From: Mike van Rossum <mike@mikevanrossum.nl>
Date: Sun, 27 Nov 2016 14:32:35 +0000
Subject: [PATCH 01/25] use ListManager for state

---
 web/cache.js             | 14 ----------
 web/routes/import.js     | 57 +++++++++++++++-------------------------
 web/routes/imports.js    |  5 ----
 web/routes/list.js       |  7 +++++
 web/routes/livegekkos.js |  5 ----
 web/routes/startGekko.js |  2 +-
 web/routes/strategies.js |  2 +-
 web/server.js            | 45 ++++++++++++++++++++-----------
 8 files changed, 60 insertions(+), 77 deletions(-)
 delete mode 100644 web/cache.js
 delete mode 100644 web/routes/imports.js
 create mode 100644 web/routes/list.js
 delete mode 100644 web/routes/livegekkos.js

diff --git a/web/cache.js b/web/cache.js
deleted file mode 100644
index 092105151..000000000
--- a/web/cache.js
+++ /dev/null
@@ -1,14 +0,0 @@
-const _ = require('lodash');
-
-const cache = {};
-
-module.exports = {
-  set: (name, val) => {
-    cache[name] = val;
-    return true;
-  },
-  get: name => {
-    if(_.has(cache, name))
-      return cache[name];
-  }
-}
\ No newline at end of file
diff --git a/web/routes/import.js b/web/routes/import.js
index 202c7992d..e68c09eee 100644
--- a/web/routes/import.js
+++ b/web/routes/import.js
@@ -2,30 +2,12 @@ const _ = require('lodash');
 const promisify = require('tiny-promisify');
 const pipelineRunner = promisify(require('../../core/workers/pipeline/parent'));
 
-const cache = require('../cache');
+const cache = require('../state/cache');
 const broadcast = cache.get('broadcast');
+const importManager = cache.get('imports');
 
 const base = require('./baseConfig');
 
-// everything is in memory at the moment:
-// If Gekko UI crashes the import (in child process)
-// will stop anyway
-const addImportToCache = _import => {
-  let list = cache.get('running_imports');
-  list.push(_.clone(_import));
-  cache.set('running_imports', list);
-}
-const updateImportInCache = (id, latest) => {
-  let list = cache.get('running_imports');
-  let _import = _.find(list, {id: id});
-  _import.latest = latest;
-  cache.set('running_imports', list);
-}
-const removeImportFromCache = (id) => {
-  let list = cache.get('running_imports');
-  cache.set('running_imports', list.filter(im => id !== im.id));
-}
-
 // starts an import
 // requires a post body with a config object
 module.exports = function *() {
@@ -42,14 +24,14 @@ module.exports = function *() {
   console.log('Import started');
 
   pipelineRunner(mode, config, (err, event) => {
-    if(err) {
-      if(errored)
-        return;
+    if(errored)
+      return;
 
+    if(err) {
       errored = true;
-      console.error('RECEIVED ERROR IN ROUTE', importId);
+      console.error('RECEIVED ERROR IN IMPORT', importId);
       console.error(err);
-      removeImportFromCache(importId);
+      importManager.delete(importId);
       return broadcast({
         type: 'import_error',
         import_id: importId,
@@ -58,14 +40,20 @@ module.exports = function *() {
     }
 
     if(event && event.done)
-      removeImportFromCache(importId)
+      importManager.delete(importId)
     else
-      updateImportInCache(importId, event.latest)
-
-    event.type = 'import_update';
-    event.import_id = importId;
+      importManager.update(importId, {latest: event.latest})
+
+    let wsEvent = {
+      type: 'import_update',
+      import_id: importId,
+      updates: {
+        latest: event.latest,
+        done: event.done
+      }
+    }
 
-    broadcast(event);
+    broadcast(wsEvent);
   });
 
   let daterange = this.request.body.importer.daterange;
@@ -78,9 +66,6 @@ module.exports = function *() {
     to: daterange.to
   }
 
-  addImportToCache(_import);
-
-  this.body = {
-    id: importId
-  }
+  importManager.add(_import);
+  this.body = _import;
 }
\ No newline at end of file
diff --git a/web/routes/imports.js b/web/routes/imports.js
deleted file mode 100644
index bf146f9ca..000000000
--- a/web/routes/imports.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const cache = require('../cache');
-
-module.exports = function *() {
-  this.body = cache.get('running_imports');
-}
\ No newline at end of file
diff --git a/web/routes/list.js b/web/routes/list.js
new file mode 100644
index 000000000..3e76b886e
--- /dev/null
+++ b/web/routes/list.js
@@ -0,0 +1,7 @@
+const cache = require('../state/cache');
+
+module.exports = function(name) {
+  return function *() {
+    this.body = cache.get(name).list();
+  }
+}
\ No newline at end of file
diff --git a/web/routes/livegekkos.js b/web/routes/livegekkos.js
deleted file mode 100644
index 47ea8bf0c..000000000
--- a/web/routes/livegekkos.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const cache = require('../cache');
-
-module.exports = function *() {
-  this.body = cache.get('live_gekkos');
-}
\ No newline at end of file
diff --git a/web/routes/startGekko.js b/web/routes/startGekko.js
index df21c0068..9c8660a5c 100644
--- a/web/routes/startGekko.js
+++ b/web/routes/startGekko.js
@@ -3,7 +3,7 @@ const promisify = require('tiny-promisify');
 const moment = require('moment');
 
 const pipelineRunner = promisify(require('../../core/workers/pipeline/parent'));
-const cache = require('../cache');
+const cache = require('../state/cache');
 const broadcast = cache.get('broadcast');
 
 const base = require('./baseConfig');
diff --git a/web/routes/strategies.js b/web/routes/strategies.js
index 896aa4e41..d9c604f44 100644
--- a/web/routes/strategies.js
+++ b/web/routes/strategies.js
@@ -12,7 +12,7 @@ module.exports = function *() {
     });
 
 
-  // for every strat, check if there is a config file and it
+  // for every strat, check if there is a config file and add it
   const stratConfigPath = gekkoRoot + 'config/strategies';
   const strategyParamsDir = yield fs.readdir(stratConfigPath);
 
diff --git a/web/server.js b/web/server.js
index b16673d43..39fb153c1 100644
--- a/web/server.js
+++ b/web/server.js
@@ -15,7 +15,8 @@ const app = koa();
 const WebSocketServer = require('ws').Server;
 const wss = new WebSocketServer({ server: server });
 
-const cache = require('./cache');
+const cache = require('./state/cache');
+const ListManager = require('./state/listManager');
 
 // broadcast function
 const broadcast = data => {
@@ -28,30 +29,39 @@ const broadcast = data => {
   );
 }
 cache.set('broadcast', broadcast);
-cache.set('running_imports', []);
-cache.set('live_gekkos', []);
 
-const WEBROOT = __dirname + '/';
+// initialize lists and dump into cache
+cache.set('imports', new ListManager);
+cache.set('watchers', new ListManager);
+cache.set('gekkos', new ListManager);
+
+// setup API routes
 
-app.use(cors());
+const WEBROOT = __dirname + '/';
+const ROUTE = n => WEBROOT + 'routes/' + n;
 
 // attach routes
-router.get('/api/strategies', require(WEBROOT + 'routes/strategies'));
-router.get('/api/imports', require(WEBROOT + 'routes/imports'));
-router.get('/api/livegekkos', require(WEBROOT + 'routes/liveGekkos'));
-router.get('/api/configPart/:part', require(WEBROOT + 'routes/configPart'));
+router.get('/api/strategies', require(ROUTE('strategies')));
+router.get('/api/configPart/:part', require(ROUTE('configPart')));
 
-router.post('/api/scan', require(WEBROOT + 'routes/scanDateRange'));
-router.post('/api/scansets', require(WEBROOT + 'routes/scanDatasets'));
-router.post('/api/backtest', require(WEBROOT + 'routes/backtest'));
-router.post('/api/import', require(WEBROOT + 'routes/import'));
-router.post('/api/startGekko', require(WEBROOT + 'routes/startGekko'));
+const listWraper = require(ROUTE('list'));
+router.get('/api/imports', listWraper('imports'));
+router.get('/api/gekkos', listWraper('gekkos'));
+router.get('/api/watchers', listWraper('watchers'));
 
+router.post('/api/scan', require(ROUTE('scanDateRange')));
+router.post('/api/scansets', require(ROUTE('scanDatasets')));
+router.post('/api/backtest', require(ROUTE('backtest')));
+router.post('/api/import', require(ROUTE('import')));
+router.post('/api/startGekko', require(ROUTE('startGekko')));
+
+// incoming WS:
 // wss.on('connection', ws => {
 //   ws.on('message', _.noop);
 // });
 
 app
+  .use(cors())
   .use(serve(WEBROOT + 'vue'))
   .use(bodyParser())
   .use(require('koa-logger')())
@@ -69,5 +79,10 @@ server.listen(config.port, () => {
   }
 
   console.log('Serving Gekko UI on ' + location +  '\n');
-  opn(location);
+
+  // only open a browser when running `node gekko`
+  // this prevents opening the browser during development
+  let nodeCommand = _.last(process.argv[1].split('/'));
+  if(nodeCommand === 'gekko')
+    opn(location);
 });
\ No newline at end of file

From a64f7313824076dd4a0edd6bb2f531831c9265b3 Mon Sep 17 00:00:00 2001
From: Mike van Rossum <mike@mikevanrossum.nl>
Date: Sun, 27 Nov 2016 14:32:56 +0000
Subject: [PATCH 02/25] run UI server seperately in dev

---
 docs/internals/gekko_ui/frontend.md | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/docs/internals/gekko_ui/frontend.md b/docs/internals/gekko_ui/frontend.md
index 3569fa5e5..f1e4cdbc3 100644
--- a/docs/internals/gekko_ui/frontend.md
+++ b/docs/internals/gekko_ui/frontend.md
@@ -38,17 +38,16 @@ You first need to install all developer dependencies so the frontend app can be
 
 After this you can launch a hot reload version of the app which will automatically recompile the frontend and reload your browser:
 
-    # path to gekko
-    cd gekko
-    # launch normal gekko UI - we use this API
-    node gekko --ui
-    # now click away the browser tab (`http://localhost:3000`)
+    # path to webserver
+    cd gekko/web
+    # launch the server - we use this API
+    node server
 
     # path to vue app
-    cd gekko/web/vue
+    cd vue
     npm run dev
 
-Gekko UI is now served from port 8080, the webpack dev server will compile the vue app (in memory) and intercept all calls to the app itself (`/dist/build.js`) and serve the in memory app. It is important to note that this UI still talks to the API served from the `node gekko --ui` commmand (on default http://localhost:3000/api) 
+Gekko UI is now served from port 8080, the webpack dev server will compile the vue app (in memory) and intercept all calls to the app itself (`/dist/build.js`) and serve the in memory app. It is important to note that this UI still talks to the API served from the `node server` commmand (on default http://localhost:3000/api) 
 
 ### Recompiling the Gekko UI frontend
 

From 18712ac03a4144c4efda24e8fe1db42b65f201e3 Mon Sep 17 00:00:00 2001
From: Mike van Rossum <mike@mikevanrossum.nl>
Date: Sun, 27 Nov 2016 15:16:08 +0000
Subject: [PATCH 03/25] moving frontend stuff around

---
 package.json                                  |  3 +-
 web/state/cache.js                            | 14 ++++++
 web/state/listManager.js                      | 45 +++++++++++++++++++
 web/vue/src/App.vue                           |  4 +-
 .../backtester/backtestConfigBuilder.vue      |  0
 .../backtester/backtester.vue                 |  2 +-
 .../backtester/result/chartWrapper.vue        |  2 +-
 .../backtester/result/result.vue              |  0
 .../backtester/result/summary.vue             |  0
 web/vue/src/{ => components}/data/data.vue    |  2 +-
 .../data/import/importConfigBuilder.vue       |  0
 .../src/components/data/import/importState.js |  0
 .../{ => components}/data/import/importer.vue |  4 +-
 .../{ => components}/data/import/single.vue   |  4 +-
 .../gekko/gekkoConfigBuilder.vue              |  2 +-
 web/vue/src/{ => components}/gekko/list.vue   |  4 +-
 web/vue/src/{ => components}/gekko/new.vue    |  2 +-
 web/vue/src/{ => components}/gekko/single.vue |  4 +-
 .../{ => components}/global/blockSpinner.vue  |  0
 .../global/configbuilder/datasetpicker.vue    |  2 +-
 .../global/configbuilder/marketpicker.vue     |  0
 .../global/configbuilder/markets.js           |  2 +-
 .../global/configbuilder/papertrader.vue      |  2 +-
 .../global/configbuilder/rangecreator.vue     |  2 +-
 .../global/configbuilder/rangepicker.vue      |  2 +-
 .../global/configbuilder/stratpicker.vue      |  2 +-
 .../global/configbuilder/typepicker.vue       |  0
 .../{ => components}/global/mixins/dataset.js |  2 +-
 .../src/{tools => components/global}/ws.js    |  2 +-
 .../src/{ => components}/layout/footer.vue    |  4 +-
 .../src/{ => components}/layout/header.vue    |  0
 web/vue/src/{ => components}/layout/home.vue  |  2 +-
 web/vue/src/main.js                           | 20 +++++----
 33 files changed, 98 insertions(+), 36 deletions(-)
 create mode 100644 web/state/cache.js
 create mode 100644 web/state/listManager.js
 rename web/vue/src/{ => components}/backtester/backtestConfigBuilder.vue (100%)
 rename web/vue/src/{ => components}/backtester/backtester.vue (97%)
 rename web/vue/src/{ => components}/backtester/result/chartWrapper.vue (95%)
 rename web/vue/src/{ => components}/backtester/result/result.vue (100%)
 rename web/vue/src/{ => components}/backtester/result/summary.vue (100%)
 rename web/vue/src/{ => components}/data/data.vue (98%)
 rename web/vue/src/{ => components}/data/import/importConfigBuilder.vue (100%)
 create mode 100644 web/vue/src/components/data/import/importState.js
 rename web/vue/src/{ => components}/data/import/importer.vue (95%)
 rename web/vue/src/{ => components}/data/import/single.vue (96%)
 rename web/vue/src/{ => components}/gekko/gekkoConfigBuilder.vue (98%)
 rename web/vue/src/{ => components}/gekko/list.vue (95%)
 rename web/vue/src/{ => components}/gekko/new.vue (94%)
 rename web/vue/src/{ => components}/gekko/single.vue (95%)
 rename web/vue/src/{ => components}/global/blockSpinner.vue (100%)
 rename web/vue/src/{ => components}/global/configbuilder/datasetpicker.vue (97%)
 rename web/vue/src/{ => components}/global/configbuilder/marketpicker.vue (100%)
 rename web/vue/src/{ => components}/global/configbuilder/markets.js (75%)
 rename web/vue/src/{ => components}/global/configbuilder/papertrader.vue (97%)
 rename web/vue/src/{ => components}/global/configbuilder/rangecreator.vue (97%)
 rename web/vue/src/{ => components}/global/configbuilder/rangepicker.vue (98%)
 rename web/vue/src/{ => components}/global/configbuilder/stratpicker.vue (98%)
 rename web/vue/src/{ => components}/global/configbuilder/typepicker.vue (100%)
 rename web/vue/src/{ => components}/global/mixins/dataset.js (96%)
 rename web/vue/src/{tools => components/global}/ws.js (94%)
 rename web/vue/src/{ => components}/layout/footer.vue (76%)
 rename web/vue/src/{ => components}/layout/header.vue (100%)
 rename web/vue/src/{ => components}/layout/home.vue (93%)

diff --git a/package.json b/package.json
index 22383d3d5..41427708f 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,8 @@
     "chai": "^2.0.0",
     "mocha": "^2.1.1",
     "proxyquire": "^1.7.10",
-    "sinon": "^1.12.2"
+    "sinon": "^1.12.2",
+    "vuex": "^2.0.0"
   },
   "engines": {
     "node": ">=6.0"
diff --git a/web/state/cache.js b/web/state/cache.js
new file mode 100644
index 000000000..092105151
--- /dev/null
+++ b/web/state/cache.js
@@ -0,0 +1,14 @@
+const _ = require('lodash');
+
+const cache = {};
+
+module.exports = {
+  set: (name, val) => {
+    cache[name] = val;
+    return true;
+  },
+  get: name => {
+    if(_.has(cache, name))
+      return cache[name];
+  }
+}
\ No newline at end of file
diff --git a/web/state/listManager.js b/web/state/listManager.js
new file mode 100644
index 000000000..874752abf
--- /dev/null
+++ b/web/state/listManager.js
@@ -0,0 +1,45 @@
+// manages a list of things that change over time
+// used for:
+// - The currently running imports
+// - The currently running gekko watchers
+// - The live gekkos
+// - etc..
+
+// this is used in both the frontend
+// as well as the backend!
+
+const _ = require('lodash');
+
+var ListManager = function() {
+  this._list = [];
+}
+
+// add an item to the list
+ListManager.prototype.add = function(obj) {
+  if(!obj.id)
+    return false;
+  this._list.push(_.clone(obj));
+  return true;
+}
+
+// update some properties on an item
+ListManager.prototype.update = function(id, updates) {
+  let item = this._list.find(i => i.id === id);
+  if(!item)
+    return false;
+  _.merge(item, updates);
+  return true;
+}
+
+// delete an item from the list
+ListManager.prototype.delete = function(id) {
+  this._list = this._list.filter(i => i.id !== id);
+  return true;
+}
+
+// getter
+ListManager.prototype.list = function() {
+  return this._list;
+}
+
+module.exports = ListManager;
\ No newline at end of file
diff --git a/web/vue/src/App.vue b/web/vue/src/App.vue
index f18157567..50870ef45 100644
--- a/web/vue/src/App.vue
+++ b/web/vue/src/App.vue
@@ -1,7 +1,7 @@
 <script>
 
-import top from './layout/header.vue'
-import bottom from './layout/footer.vue'
+import top from './components/layout/header.vue'
+import bottom from './components/layout/footer.vue'
 
 export default {
   name: 'app',
diff --git a/web/vue/src/backtester/backtestConfigBuilder.vue b/web/vue/src/components/backtester/backtestConfigBuilder.vue
similarity index 100%
rename from web/vue/src/backtester/backtestConfigBuilder.vue
rename to web/vue/src/components/backtester/backtestConfigBuilder.vue
diff --git a/web/vue/src/backtester/backtester.vue b/web/vue/src/components/backtester/backtester.vue
similarity index 97%
rename from web/vue/src/backtester/backtester.vue
rename to web/vue/src/components/backtester/backtester.vue
index d69230fc6..c3f48b250 100644
--- a/web/vue/src/backtester/backtester.vue
+++ b/web/vue/src/components/backtester/backtester.vue
@@ -16,7 +16,7 @@
 <script>
 import configBuilder from './backtestConfigBuilder.vue'
 import result from './result/result.vue'
-import { post } from '../tools/ajax'
+import { post } from '../../tools/ajax'
 import spinner from '../global/blockSpinner.vue'
 
 export default {
diff --git a/web/vue/src/backtester/result/chartWrapper.vue b/web/vue/src/components/backtester/result/chartWrapper.vue
similarity index 95%
rename from web/vue/src/backtester/result/chartWrapper.vue
rename to web/vue/src/components/backtester/result/chartWrapper.vue
index 22635952d..a645fd699 100644
--- a/web/vue/src/backtester/result/chartWrapper.vue
+++ b/web/vue/src/components/backtester/result/chartWrapper.vue
@@ -6,7 +6,7 @@ div
 
 <script>
 
-import chart from '../../d3/chart4'
+import chart from '../../../d3/chart4'
 
 export default {
   props: ['data'],
diff --git a/web/vue/src/backtester/result/result.vue b/web/vue/src/components/backtester/result/result.vue
similarity index 100%
rename from web/vue/src/backtester/result/result.vue
rename to web/vue/src/components/backtester/result/result.vue
diff --git a/web/vue/src/backtester/result/summary.vue b/web/vue/src/components/backtester/result/summary.vue
similarity index 100%
rename from web/vue/src/backtester/result/summary.vue
rename to web/vue/src/components/backtester/result/summary.vue
diff --git a/web/vue/src/data/data.vue b/web/vue/src/components/data/data.vue
similarity index 98%
rename from web/vue/src/data/data.vue
rename to web/vue/src/components/data/data.vue
index 1f61360cd..061c418dc 100644
--- a/web/vue/src/data/data.vue
+++ b/web/vue/src/components/data/data.vue
@@ -41,7 +41,7 @@
 <script>
 
 import spinner from '../global/blockSpinner.vue'
-import marked from '../tools/marked'
+import marked from '../../tools/marked'
 import dataset from '../global/mixins/dataset'
 // global moment
 // global humanizeDuration
diff --git a/web/vue/src/data/import/importConfigBuilder.vue b/web/vue/src/components/data/import/importConfigBuilder.vue
similarity index 100%
rename from web/vue/src/data/import/importConfigBuilder.vue
rename to web/vue/src/components/data/import/importConfigBuilder.vue
diff --git a/web/vue/src/components/data/import/importState.js b/web/vue/src/components/data/import/importState.js
new file mode 100644
index 000000000..e69de29bb
diff --git a/web/vue/src/data/import/importer.vue b/web/vue/src/components/data/import/importer.vue
similarity index 95%
rename from web/vue/src/data/import/importer.vue
rename to web/vue/src/components/data/import/importer.vue
index 058fcf7d3..cbf061841 100644
--- a/web/vue/src/data/import/importer.vue
+++ b/web/vue/src/components/data/import/importer.vue
@@ -18,11 +18,11 @@
 
 <script>
 
-import { post, get } from '../../tools/ajax'
+import { post, get } from '../../../tools/ajax'
 import spinner from '../../global/blockSpinner.vue'
 import importConfigBuilder from './importConfigBuilder.vue'
 
-import marked from '../../tools/marked'
+import marked from '../../../tools/marked'
 
 let intro = marked(`
 
diff --git a/web/vue/src/data/import/single.vue b/web/vue/src/components/data/import/single.vue
similarity index 96%
rename from web/vue/src/data/import/single.vue
rename to web/vue/src/components/data/import/single.vue
index 0834a3461..04588ea23 100644
--- a/web/vue/src/data/import/single.vue
+++ b/web/vue/src/components/data/import/single.vue
@@ -31,8 +31,8 @@
 
 <script>
 
-import { bus as ws } from '../../tools/ws'
-import { get } from '../../tools/ajax'
+import { bus as ws } from '../../global/ws'
+import { get } from '../../../tools/ajax'
 
 export default {
   created: function() {
diff --git a/web/vue/src/gekko/gekkoConfigBuilder.vue b/web/vue/src/components/gekko/gekkoConfigBuilder.vue
similarity index 98%
rename from web/vue/src/gekko/gekkoConfigBuilder.vue
rename to web/vue/src/components/gekko/gekkoConfigBuilder.vue
index f57071361..b5e571f27 100644
--- a/web/vue/src/gekko/gekkoConfigBuilder.vue
+++ b/web/vue/src/components/gekko/gekkoConfigBuilder.vue
@@ -18,7 +18,7 @@ import marketPicker from '../global/configbuilder/marketpicker.vue'
 import typePicker from '../global/configbuilder/typepicker.vue'
 import stratPicker from '../global/configbuilder/stratpicker.vue'
 import paperTrader from '../global/configbuilder/papertrader.vue'
-import { get } from '../tools/ajax'
+import { get } from '../../tools/ajax'
 import _ from 'lodash'
 
 export default {
diff --git a/web/vue/src/gekko/list.vue b/web/vue/src/components/gekko/list.vue
similarity index 95%
rename from web/vue/src/gekko/list.vue
rename to web/vue/src/components/gekko/list.vue
index cf9088be1..aeee91fec 100644
--- a/web/vue/src/gekko/list.vue
+++ b/web/vue/src/components/gekko/list.vue
@@ -31,8 +31,8 @@
 
 <script>
 
-import { get } from '../tools/ajax'
-import marked from '../tools/marked';
+import { get } from '../../tools/ajax'
+import marked from '../../tools/marked';
 // global moment
 // global humanizeDuration
 
diff --git a/web/vue/src/gekko/new.vue b/web/vue/src/components/gekko/new.vue
similarity index 94%
rename from web/vue/src/gekko/new.vue
rename to web/vue/src/components/gekko/new.vue
index 1119fc322..c8013d66d 100644
--- a/web/vue/src/gekko/new.vue
+++ b/web/vue/src/components/gekko/new.vue
@@ -9,7 +9,7 @@
 
 <script>
 
-import { post } from '../tools/ajax'
+import { post } from '../../tools/ajax'
 import gekkoConfigBuilder from './gekkoConfigBuilder.vue'
 
 export default {
diff --git a/web/vue/src/gekko/single.vue b/web/vue/src/components/gekko/single.vue
similarity index 95%
rename from web/vue/src/gekko/single.vue
rename to web/vue/src/components/gekko/single.vue
index 0c7dbdd53..0846cf345 100644
--- a/web/vue/src/gekko/single.vue
+++ b/web/vue/src/components/gekko/single.vue
@@ -19,8 +19,8 @@
 <script>
 
 import spinner from '../global/blockSpinner.vue'
-import { bus as ws } from '../tools/ws'
-import { get } from '../tools/ajax'
+import { bus as ws } from '../global/ws'
+import { get } from '../../tools/ajax'
 
 export default {
   created: function() {
diff --git a/web/vue/src/global/blockSpinner.vue b/web/vue/src/components/global/blockSpinner.vue
similarity index 100%
rename from web/vue/src/global/blockSpinner.vue
rename to web/vue/src/components/global/blockSpinner.vue
diff --git a/web/vue/src/global/configbuilder/datasetpicker.vue b/web/vue/src/components/global/configbuilder/datasetpicker.vue
similarity index 97%
rename from web/vue/src/global/configbuilder/datasetpicker.vue
rename to web/vue/src/components/global/configbuilder/datasetpicker.vue
index 0a796faa7..ccec3605d 100644
--- a/web/vue/src/global/configbuilder/datasetpicker.vue
+++ b/web/vue/src/components/global/configbuilder/datasetpicker.vue
@@ -30,7 +30,7 @@ div
 
 <script>
 
-import { post } from '../../tools/ajax'
+import { post } from '../../../tools/ajax'
 import spinner from '../../global/blockSpinner.vue'
 import dataset from '../../global/mixins/dataset'
 
diff --git a/web/vue/src/global/configbuilder/marketpicker.vue b/web/vue/src/components/global/configbuilder/marketpicker.vue
similarity index 100%
rename from web/vue/src/global/configbuilder/marketpicker.vue
rename to web/vue/src/components/global/configbuilder/marketpicker.vue
diff --git a/web/vue/src/global/configbuilder/markets.js b/web/vue/src/components/global/configbuilder/markets.js
similarity index 75%
rename from web/vue/src/global/configbuilder/markets.js
rename to web/vue/src/components/global/configbuilder/markets.js
index 6fa4e3ef1..797b0f2c6 100644
--- a/web/vue/src/global/configbuilder/markets.js
+++ b/web/vue/src/components/global/configbuilder/markets.js
@@ -1,5 +1,5 @@
 // this is the exchanges file used by Gekko
-import exchangesRaw from '../../../../../exchanges.js';
+import exchangesRaw from '../../../../../../exchanges.js';
 
 const markets = {};
  exchangesRaw.forEach(e => {
diff --git a/web/vue/src/global/configbuilder/papertrader.vue b/web/vue/src/components/global/configbuilder/papertrader.vue
similarity index 97%
rename from web/vue/src/global/configbuilder/papertrader.vue
rename to web/vue/src/components/global/configbuilder/papertrader.vue
index 6b6c107b4..a50af290d 100644
--- a/web/vue/src/global/configbuilder/papertrader.vue
+++ b/web/vue/src/components/global/configbuilder/papertrader.vue
@@ -13,7 +13,7 @@
 <script>
 
 import _ from 'lodash'
-import { get } from '../../tools/ajax'
+import { get } from '../../../tools/ajax'
 
 export default {
   created: function() {
diff --git a/web/vue/src/global/configbuilder/rangecreator.vue b/web/vue/src/components/global/configbuilder/rangecreator.vue
similarity index 97%
rename from web/vue/src/global/configbuilder/rangecreator.vue
rename to web/vue/src/components/global/configbuilder/rangecreator.vue
index 1bdb82d11..35251a9f9 100644
--- a/web/vue/src/global/configbuilder/rangecreator.vue
+++ b/web/vue/src/components/global/configbuilder/rangecreator.vue
@@ -12,7 +12,7 @@ div
 <script>
 
 import _ from 'lodash'
-import { post } from '../../tools/ajax'
+import { post } from '../../../tools/ajax'
 // global moment
 
 export default {
diff --git a/web/vue/src/global/configbuilder/rangepicker.vue b/web/vue/src/components/global/configbuilder/rangepicker.vue
similarity index 98%
rename from web/vue/src/global/configbuilder/rangepicker.vue
rename to web/vue/src/components/global/configbuilder/rangepicker.vue
index ffd5ea5a3..17146c520 100644
--- a/web/vue/src/global/configbuilder/rangepicker.vue
+++ b/web/vue/src/components/global/configbuilder/rangepicker.vue
@@ -38,7 +38,7 @@ div
 <script>
 
 import _ from 'lodash'
-import { post } from '../../tools/ajax'
+import { post } from '../../../tools/ajax'
 // global moment
 
 export default {
diff --git a/web/vue/src/global/configbuilder/stratpicker.vue b/web/vue/src/components/global/configbuilder/stratpicker.vue
similarity index 98%
rename from web/vue/src/global/configbuilder/stratpicker.vue
rename to web/vue/src/components/global/configbuilder/stratpicker.vue
index 61490263c..42e15ca04 100644
--- a/web/vue/src/global/configbuilder/stratpicker.vue
+++ b/web/vue/src/components/global/configbuilder/stratpicker.vue
@@ -34,7 +34,7 @@
 <script>
 
 import _ from 'lodash'
-import { get } from '../../tools/ajax'
+import { get } from '../../../tools/ajax'
 
 export default {
   data: () => {
diff --git a/web/vue/src/global/configbuilder/typepicker.vue b/web/vue/src/components/global/configbuilder/typepicker.vue
similarity index 100%
rename from web/vue/src/global/configbuilder/typepicker.vue
rename to web/vue/src/components/global/configbuilder/typepicker.vue
diff --git a/web/vue/src/global/mixins/dataset.js b/web/vue/src/components/global/mixins/dataset.js
similarity index 96%
rename from web/vue/src/global/mixins/dataset.js
rename to web/vue/src/components/global/mixins/dataset.js
index 84f1c6ff6..1893c8ce5 100644
--- a/web/vue/src/global/mixins/dataset.js
+++ b/web/vue/src/components/global/mixins/dataset.js
@@ -1,4 +1,4 @@
-import { post } from '../../tools/ajax'
+import { post } from '../../../tools/ajax'
 
 var mixin = {
   data: () => {
diff --git a/web/vue/src/tools/ws.js b/web/vue/src/components/global/ws.js
similarity index 94%
rename from web/vue/src/tools/ws.js
rename to web/vue/src/components/global/ws.js
index 16929388d..bc32d38db 100644
--- a/web/vue/src/tools/ws.js
+++ b/web/vue/src/components/global/ws.js
@@ -1,7 +1,7 @@
 import _ from 'lodash'
 import Vue from 'vue'
 
-import { wsPath } from './api'
+import { wsPath } from '../../tools/api'
 
 var socket = null;
 
diff --git a/web/vue/src/layout/footer.vue b/web/vue/src/components/layout/footer.vue
similarity index 76%
rename from web/vue/src/layout/footer.vue
rename to web/vue/src/components/layout/footer.vue
index e1474f88d..f5e938cf7 100644
--- a/web/vue/src/layout/footer.vue
+++ b/web/vue/src/components/layout/footer.vue
@@ -7,8 +7,8 @@
 </template>
 
 <script>
-const gekkoPackage = require('../../../../package.json');
-const uiPackage = require('../../package.json');
+const gekkoPackage = require('../../../../../package.json');
+const uiPackage = require('../../../package.json');
 
 export default {
   data: () => {
diff --git a/web/vue/src/layout/header.vue b/web/vue/src/components/layout/header.vue
similarity index 100%
rename from web/vue/src/layout/header.vue
rename to web/vue/src/components/layout/header.vue
diff --git a/web/vue/src/layout/home.vue b/web/vue/src/components/layout/home.vue
similarity index 93%
rename from web/vue/src/layout/home.vue
rename to web/vue/src/components/layout/home.vue
index 083f41528..85abee7c8 100644
--- a/web/vue/src/layout/home.vue
+++ b/web/vue/src/components/layout/home.vue
@@ -8,7 +8,7 @@
 </template>
 
 <script>
-import marked from '../tools/marked';
+import marked from '../../tools/marked';
 
 const left = marked(`
 
diff --git a/web/vue/src/main.js b/web/vue/src/main.js
index e0a8716cd..8d4e471b4 100644
--- a/web/vue/src/main.js
+++ b/web/vue/src/main.js
@@ -1,24 +1,26 @@
 import Vue from 'vue'
+import Vuex from 'vuex'
 import App from './App.vue'
 
 import VueRouter from 'vue-router'
 
-import { connect } from './tools/ws'
+import { connect } from './components/global/ws'
 
 connect();
 
+Vue.use(Vuex)
 Vue.use(VueRouter);
 
-import backtester from './backtester/backtester.vue'
-import home from './layout/home.vue'
+import backtester from './components/backtester/backtester.vue'
+import home from './components/layout/home.vue'
 
-import data from './data/data.vue'
-import importer from './data/import/importer.vue'
-import singleImport from './data/import/single.vue'
+import data from './components/data/data.vue'
+import importer from './components/data/import/importer.vue'
+import singleImport from './components/data/import/single.vue'
 
-import gekkoList from './gekko/list.vue'
-import newGekko from './gekko/new.vue'
-import singleGekko from './gekko/single.vue'
+import gekkoList from './components/gekko/list.vue'
+import newGekko from './components/gekko/new.vue'
+import singleGekko from './components/gekko/single.vue'
 
 const router = new VueRouter({
   mode: 'hash',

From 0fd9c0067a5ee5064266ad37cbf03435f4331c10 Mon Sep 17 00:00:00 2001
From: Mike van Rossum <mike@mikevanrossum.nl>
Date: Sun, 27 Nov 2016 19:38:49 +0000
Subject: [PATCH 04/25] use vuex to store state

---
 web/routes/import.js                          | 14 ++++--
 web/state/listManager.js                      |  4 --
 .../src/components/data/import/importer.vue   | 18 ++++---
 web/vue/src/components/data/import/single.vue | 49 ++++++-------------
 web/vue/src/main.js                           | 16 +++---
 web/vue/src/store/index.js                    | 21 ++++++++
 web/vue/src/store/init.js                     |  7 +++
 .../src/store/modules/imports/mutations.js    | 17 +++++++
 web/vue/src/store/modules/imports/sync.js     | 21 ++++++++
 9 files changed, 109 insertions(+), 58 deletions(-)
 create mode 100644 web/vue/src/store/index.js
 create mode 100644 web/vue/src/store/init.js
 create mode 100644 web/vue/src/store/modules/imports/mutations.js
 create mode 100644 web/vue/src/store/modules/imports/sync.js

diff --git a/web/routes/import.js b/web/routes/import.js
index e68c09eee..7795a3d09 100644
--- a/web/routes/import.js
+++ b/web/routes/import.js
@@ -39,11 +39,16 @@ module.exports = function *() {
       });
     }
 
-    if(event && event.done)
-      importManager.delete(importId)
-    else
-      importManager.update(importId, {latest: event.latest})
+    if(!event)
+      return;
+
+    // update local cache
+    importManager.update(importId, {
+      latest: event.latest,
+      done: event.done
+    });
 
+    // emit update over ws
     let wsEvent = {
       type: 'import_update',
       import_id: importId,
@@ -52,7 +57,6 @@ module.exports = function *() {
         done: event.done
       }
     }
-
     broadcast(wsEvent);
   });
 
diff --git a/web/state/listManager.js b/web/state/listManager.js
index 874752abf..a3f0a3303 100644
--- a/web/state/listManager.js
+++ b/web/state/listManager.js
@@ -4,10 +4,6 @@
 // - The currently running gekko watchers
 // - The live gekkos
 // - etc..
-
-// this is used in both the frontend
-// as well as the backend!
-
 const _ = require('lodash');
 
 var ListManager = function() {
diff --git a/web/vue/src/components/data/import/importer.vue b/web/vue/src/components/data/import/importer.vue
index cbf061841..a09adc777 100644
--- a/web/vue/src/components/data/import/importer.vue
+++ b/web/vue/src/components/data/import/importer.vue
@@ -18,7 +18,7 @@
 
 <script>
 
-import { post, get } from '../../../tools/ajax'
+import { post } from '../../../tools/ajax'
 import spinner from '../../global/blockSpinner.vue'
 import importConfigBuilder from './importConfigBuilder.vue'
 
@@ -33,11 +33,6 @@ The importer can download historical market data directly from the exchange.
 `)
 
 export default {
-  created: function() {
-    get('imports', (error, response) => {
-      this.imports = response;
-    });
-  },
   components: {
     importConfigBuilder,
     spinner
@@ -45,10 +40,14 @@ export default {
   data: () => {
     return {
       intro,
-      imports: [],
       config: {}
     }
   },
+  computed: {
+    imports: function() {
+      return this.$store.state.imports
+    }
+  },
   methods: {
     daysApart: function(range) {
       let to = moment(range.to);
@@ -66,6 +65,11 @@ export default {
         return alert('You can only import at least one day of data..')
 
       post('import', this.config, (error, response) => {
+        if(error)
+          return alert(error);
+
+        this.$store.commit('addImport', response);
+
         this.$router.push({
           path: `/data/importer/import/${response.id}`,
           // this doesn't work for some reason...
diff --git a/web/vue/src/components/data/import/single.vue b/web/vue/src/components/data/import/single.vue
index 04588ea23..0150aa6ce 100644
--- a/web/vue/src/components/data/import/single.vue
+++ b/web/vue/src/components/data/import/single.vue
@@ -1,6 +1,6 @@
 <template lang='jade'>
   div.contain.my2
-    div(v-if='!done && data')
+    div(v-if='data && !data.done')
       h2 Importing data..
       p Market: {{ data.watch.exchange }}:{{ data.watch.currency }}/{{ data.watch.asset }}
       .grd
@@ -21,46 +21,32 @@
           | you can already start 
           router-link(to='/backtest') backtesting
           | ).
-    div(v-if='done').txt--center
+    div(v-if='data && data.done').txt--center
       h2 Import done
       p 
         | Go and 
         router-link(to='/backtest') backtest
         |  with your new data!
+    div(v-if='!data').txt--center
+      h2 ERROR: Uknown import
+      p 
+        I don't know this import..
 </template>
 
 <script>
 
-import { bus as ws } from '../../global/ws'
-import { get } from '../../../tools/ajax'
-
 export default {
   created: function() {
-    get('imports', (error, response) => {
-      this.data = _.find(response, {id: this.$route.params.id});
-      if(this.data === undefined)
-        this.done = true;
-    });
-
-    ws.$on('import_update', data => {
-      if(data.import_id !== this.$route.params.id)
-        return;
-
-      this.handleWsMessage(data)
-    });
-
-    ws.$on('import_error', data => {
-      if(data.import_id === this.$route.params.id)
-        this.$router.push({path: '/import'});
-    });
-  },
-  data: () => {
-    return {
-      done: false,
-      data: false, // I cannot name this "_import" for some reason...
-    }
+    let data = 
+    this.data = data;
   },
   computed: {
+    data: function() {
+      return _.find(
+        this.$store.state.imports,
+        { id: this.$route.params.id }
+      );
+    },
     latest: function() {
       if(this.data)
         return this.mom(this.data.latest);
@@ -82,13 +68,6 @@ export default {
     }
   },
   methods: {
-    handleWsMessage: function(data) {
-      if(data.done)
-        return this.done = true;
-
-      if(this.data)
-        this.data.latest = moment.utc(data.latest);
-    },
     fmt: mom => { return mom.format('YYYY-MM-DD HH:mm:ss') },
     mom: str => moment.utc(str)
   }
diff --git a/web/vue/src/main.js b/web/vue/src/main.js
index 8d4e471b4..0d331f66c 100644
--- a/web/vue/src/main.js
+++ b/web/vue/src/main.js
@@ -1,16 +1,11 @@
 import Vue from 'vue'
-import Vuex from 'vuex'
 import App from './App.vue'
 
 import VueRouter from 'vue-router'
-
-import { connect } from './components/global/ws'
-
-connect();
-
-Vue.use(Vuex)
 Vue.use(VueRouter);
 
+import store from './store'
+
 import backtester from './components/backtester/backtester.vue'
 import home from './components/layout/home.vue'
 
@@ -21,6 +16,8 @@ import singleImport from './components/data/import/single.vue'
 import gekkoList from './components/gekko/list.vue'
 import newGekko from './components/gekko/new.vue'
 import singleGekko from './components/gekko/single.vue'
+import { connect as connectWS } from './components/global/ws'
+import initializeState from './store/init'
 
 const router = new VueRouter({
   mode: 'hash',
@@ -37,8 +34,13 @@ const router = new VueRouter({
   ]
 });
 
+// setup some stuff
+connectWS();
+initializeState();
+
 new Vue({
   router,
+  store,
   el: '#app',
   render: h => h(App)
 })
\ No newline at end of file
diff --git a/web/vue/src/store/index.js b/web/vue/src/store/index.js
new file mode 100644
index 000000000..0621e9c7b
--- /dev/null
+++ b/web/vue/src/store/index.js
@@ -0,0 +1,21 @@
+import Vue from 'vue'
+import Vuex from 'vuex'
+import { addImport, syncImports, updateImport } from './modules/imports/mutations'
+
+Vue.use(Vuex)
+
+const debug = process.env.NODE_ENV !== 'production'
+
+export default new Vuex.Store({
+  state: {
+    imports: [],
+    gekkos: [],
+    watchers: []
+  },
+  mutations: {
+    addImport,
+    syncImports,
+    updateImport
+  },
+  strict: debug
+})
\ No newline at end of file
diff --git a/web/vue/src/store/init.js b/web/vue/src/store/init.js
new file mode 100644
index 000000000..99f1e0b90
--- /dev/null
+++ b/web/vue/src/store/init.js
@@ -0,0 +1,7 @@
+import Vue from 'vue'
+import Vuex from 'vuex'
+import syncImports from './modules/imports/sync'
+
+export default function() {
+  syncImports();
+}
\ No newline at end of file
diff --git a/web/vue/src/store/modules/imports/mutations.js b/web/vue/src/store/modules/imports/mutations.js
new file mode 100644
index 000000000..64f36aa6c
--- /dev/null
+++ b/web/vue/src/store/modules/imports/mutations.js
@@ -0,0 +1,17 @@
+export const addImport = (state, imp) => {
+  state.imports.push(imp);
+  return state;
+}
+
+export const syncImports = (state, imports) => {
+  state.imports = imports;
+  return state;
+}
+
+export const updateImport = (state, update) => {
+  let item = state.imports.find(i => i.id === update.import_id);
+  if(!item)
+    return state;
+  _.merge(item, update.updates);
+  return state;
+}
\ No newline at end of file
diff --git a/web/vue/src/store/modules/imports/sync.js b/web/vue/src/store/modules/imports/sync.js
new file mode 100644
index 000000000..f91d68e77
--- /dev/null
+++ b/web/vue/src/store/modules/imports/sync.js
@@ -0,0 +1,21 @@
+import { get } from '../../../tools/ajax'
+import store from '../../'
+import { bus } from '../../../components/global/ws'
+
+const init = () => {
+  store.commit('syncImports', []);
+  get('imports', (err, resp) => {
+    store.commit('syncImports', resp);
+  });
+}
+
+const sync = () => {
+  bus.$on('import_update', data => {
+    store.commit('updateImport', data);
+  });
+}
+
+export default function() {
+  init();
+  sync();
+}
\ No newline at end of file

From 97077cbb67d18fb812b125cc1efee382c8fd58ec Mon Sep 17 00:00:00 2001
From: Mike van Rossum <mike@mikevanrossum.nl>
Date: Thu, 1 Dec 2016 15:23:35 +0000
Subject: [PATCH 05/25] early version market watcher

---
 gekko.js                                      |  2 +-
 web/routes/import.js                          |  2 +-
 web/routes/startGekko.js                      | 87 ++++++++++---------
 web/server.js                                 |  2 -
 .../backtester/backtestConfigBuilder.vue      |  4 +
 .../src/components/data/import/importer.vue   |  2 -
 web/vue/src/components/data/import/single.vue |  4 -
 .../components/gekko/gekkoConfigBuilder.vue   | 25 ++++--
 web/vue/src/components/gekko/list.vue         | 64 +++++++++-----
 web/vue/src/components/gekko/new.vue          | 69 +++++++++++++--
 .../gekko/{single.vue => singleGekko.vue}     |  0
 .../src/components/gekko/singleWatcher.vue    | 59 +++++++++++++
 .../global/configbuilder/typepicker.vue       | 21 +++--
 web/vue/src/main.js                           |  6 +-
 web/vue/src/store/index.js                    | 20 +++--
 web/vue/src/store/init.js                     |  2 +
 web/vue/src/store/modules/imports/sync.js     |  1 -
 .../store/modules/stratrunners/mutations.js   | 17 ++++
 .../src/store/modules/stratrunners/sync.js    | 23 +++++
 .../src/store/modules/watchers/mutations.js   | 17 ++++
 web/vue/src/store/modules/watchers/sync.js    | 33 +++++++
 21 files changed, 359 insertions(+), 101 deletions(-)
 rename web/vue/src/components/gekko/{single.vue => singleGekko.vue} (100%)
 create mode 100644 web/vue/src/components/gekko/singleWatcher.vue
 create mode 100644 web/vue/src/store/modules/stratrunners/mutations.js
 create mode 100644 web/vue/src/store/modules/stratrunners/sync.js
 create mode 100644 web/vue/src/store/modules/watchers/mutations.js
 create mode 100644 web/vue/src/store/modules/watchers/sync.js

diff --git a/gekko.js b/gekko.js
index 4f5f6f541..2dd656e7e 100644
--- a/gekko.js
+++ b/gekko.js
@@ -30,7 +30,7 @@ console.log(`
   $$ \\__$$ |$$ |_____ $$ |$$  \\ $$ |$$  \\ $$ \\__$$ |
   $$    $$/ $$       |$$ | $$  |$$ | $$  |$$    $$/ 
    $$$$$$/  $$$$$$$$/ $$/   $$/ $$/   $$/  $$$$$$/
-`)
+`);
 
 const util = require(__dirname + '/core/util');
 
diff --git a/web/routes/import.js b/web/routes/import.js
index 7795a3d09..e62794832 100644
--- a/web/routes/import.js
+++ b/web/routes/import.js
@@ -21,7 +21,7 @@ module.exports = function *() {
 
   let errored = false;
 
-  console.log('Import started');
+  console.log('Import', importId, 'started');
 
   pipelineRunner(mode, config, (err, event) => {
     if(errored)
diff --git a/web/routes/startGekko.js b/web/routes/startGekko.js
index 9c8660a5c..e6788cbfb 100644
--- a/web/routes/startGekko.js
+++ b/web/routes/startGekko.js
@@ -5,86 +5,89 @@ const moment = require('moment');
 const pipelineRunner = promisify(require('../../core/workers/pipeline/parent'));
 const cache = require('../state/cache');
 const broadcast = cache.get('broadcast');
+const gekkoManager = cache.get('gekkos');
 
 const base = require('./baseConfig');
 
-// everything is in memory at the moment:
-// If Gekko UI crashes the import (in child process)
-// will stop anyway
-const addGekkoToCache = gekko => {
-  let list = cache.get('live_gekkos');
-  list.push(_.clone(gekko));
-  cache.set('live_gekkos', list);
-}
-const updateGekkoInCache = (id, updates) => {
-  console.log('UPDATING', updates)
-  let list = cache.get('live_gekkos');
-  let gekko = _.find(list, {id: id});
-  _.merge(gekko, updates);
-  cache.set('live_gekkos', list);
-}
-const removeGekkoFromCache = (id) => {
-  let list = cache.get('live_gekkos');
-  cache.set('live_gekkos', list.filter(im => id !== im.id));
-}
-
 // starts an import
 // requires a post body with a config object
 module.exports = function *() {
-  let mode = 'realtime';
+  const mode = this.request.body.mode;
 
   let config = {}
 
   _.merge(config, base, this.request.body);
 
-  let importId = (Math.random() + '').slice(3);
+  const id = (Math.random() + '').slice(3);
 
   let errored = false;
 
-  console.log('Gekko', importId, 'started');
+  console.log('Gekko', id, 'started');
 
   pipelineRunner(mode, config, (err, event) => {
-    console.log(event);
+
+    console.log('EVENT', err, event);
+
     if(err) {
       if(errored)
         return;
 
       errored = true;
-      console.error('RECEIVED ERROR IN ROUTE', importId);
+      console.error('RECEIVED ERROR IN GEKKO', id);
       console.error(err);
-      removeGekkoFromCache(importId);
+      gekkoManager.delete(id);
       return broadcast({
         type: 'gekko_error',
-        gekko_id: importId,
+        gekko_id: id,
         error: err
       });
     }
 
-    if(event.type === 'update')
-      updateGekkoInCache(importId, {latest: event.latest})
-
-    if(event.type === 'startAt')
-      updateGekkoInCache(importId, {startAt: event.startAt})
-
-    event.gekko_id = importId;
-    event.emitter = 'gekko';
+    if(!event)
+      return;
+
+    if(event.type === 'update' || event.type === 'startAt') {
+
+      let updates = {};
+
+      if(event.type === 'update') {
+        updates.latest = event.latest;
+      } else if(event.type === 'startAt') {
+        updates.startAt = event.startAt;
+      }
+
+      gekkoManager.update(id, updates);
+      // emit update over ws
+      let wsEvent = {
+        type: event.type,
+        gekko_id: id,
+        gekko_mode: mode,
+        emitter: 'gekko',
+        updates
+      }
+      broadcast(wsEvent);
+      return;
+    }
 
-    broadcast(event);
+    // else we ignore (for now)
   });
 
   const now = moment.utc().format();
 
   const gekko = {
     watch: config.watch,
-    id: importId,
+    id,
     startAt: '',
     latest: '',
-    type: config.type
+    mode
   }
 
-  addGekkoToCache(gekko);
+  gekkoManager.add(gekko);
 
-  this.body = {
-    id: importId
-  }
+  broadcast({
+    type: 'new_gekko',
+    gekko
+  });
+
+  this.body = {status: 'ok'};
 }
\ No newline at end of file
diff --git a/web/server.js b/web/server.js
index 39fb153c1..688a6375e 100644
--- a/web/server.js
+++ b/web/server.js
@@ -32,7 +32,6 @@ cache.set('broadcast', broadcast);
 
 // initialize lists and dump into cache
 cache.set('imports', new ListManager);
-cache.set('watchers', new ListManager);
 cache.set('gekkos', new ListManager);
 
 // setup API routes
@@ -47,7 +46,6 @@ router.get('/api/configPart/:part', require(ROUTE('configPart')));
 const listWraper = require(ROUTE('list'));
 router.get('/api/imports', listWraper('imports'));
 router.get('/api/gekkos', listWraper('gekkos'));
-router.get('/api/watchers', listWraper('watchers'));
 
 router.post('/api/scan', require(ROUTE('scanDateRange')));
 router.post('/api/scansets', require(ROUTE('scanDatasets')));
diff --git a/web/vue/src/components/backtester/backtestConfigBuilder.vue b/web/vue/src/components/backtester/backtestConfigBuilder.vue
index 851cfa6db..9a2f3b4df 100644
--- a/web/vue/src/components/backtester/backtestConfigBuilder.vue
+++ b/web/vue/src/components/backtester/backtestConfigBuilder.vue
@@ -79,6 +79,10 @@ export default {
       if(!config.tradingAdvisor)
         return false;
 
+      let strat = config.tradingAdvisor.method;
+      if(_.isEmpty(config[ strat ]))
+        return false;
+
       if(config.tradingAdvisor) {
         if(_.isNaN(config.tradingAdvisor.candleSize))
           return false;
diff --git a/web/vue/src/components/data/import/importer.vue b/web/vue/src/components/data/import/importer.vue
index a09adc777..28715c939 100644
--- a/web/vue/src/components/data/import/importer.vue
+++ b/web/vue/src/components/data/import/importer.vue
@@ -72,8 +72,6 @@ export default {
 
         this.$router.push({
           path: `/data/importer/import/${response.id}`,
-          // this doesn't work for some reason...
-          // params: {id: response.id}
         })
       });
     }
diff --git a/web/vue/src/components/data/import/single.vue b/web/vue/src/components/data/import/single.vue
index 0150aa6ce..11d714e6b 100644
--- a/web/vue/src/components/data/import/single.vue
+++ b/web/vue/src/components/data/import/single.vue
@@ -36,10 +36,6 @@
 <script>
 
 export default {
-  created: function() {
-    let data = 
-    this.data = data;
-  },
   computed: {
     data: function() {
       return _.find(
diff --git a/web/vue/src/components/gekko/gekkoConfigBuilder.vue b/web/vue/src/components/gekko/gekkoConfigBuilder.vue
index b5e571f27..9e95f5287 100644
--- a/web/vue/src/components/gekko/gekkoConfigBuilder.vue
+++ b/web/vue/src/components/gekko/gekkoConfigBuilder.vue
@@ -6,10 +6,11 @@
       market-picker.contain(v-on:market='updateMarketConfig')
     .grd-row-col-3-6.mx1
       type-picker(v-on:type='updateType')
-  .hr
-  strat-picker.contain.my2(v-on:stratConfig='updateStrat')
-  .hr
-  paper-trader(v-on:settings='updatePaperTrader')
+  template(v-if='type === "paper trader"')
+    .hr
+    strat-picker.contain.my2(v-on:stratConfig='updateStrat')
+    .hr
+    paper-trader(v-on:settings='updatePaperTrader')
 </template>
 
 <script>
@@ -22,6 +23,7 @@ import { get } from '../../tools/ajax'
 import _ from 'lodash'
 
 export default {
+
   created: function() {
     get('configPart/candleWriter', (error, response) => {
       this.candleWriter = toml.parse(response.part);
@@ -62,10 +64,18 @@ export default {
   },
   methods: {
     validConfig: config => {
-      if(!config.profitSimulator)
+      if(config.type === 'market watcher')
+        return true;
+
+      if(!config.tradingAdvisor)
+        return false;
+      if(_.isNaN(config.tradingAdvisor.candleSize))
+        return false;
+      else if(config.tradingAdvisor.candleSize == 0)
         return false;
 
-      if(!config.profitSimulator.enabled)
+      let strat = config.tradingAdvisor.method;
+      if(_.isEmpty(config[ strat ]))
         return false;
 
       return true;
@@ -86,8 +96,9 @@ export default {
       this.paperTrader = pt;
       this.emitConfig();
     },
+
     emitConfig: function() {
-      this.$emit('config', this.config);
+      this.$emit('config', this.config); 
     }
   }
 }
diff --git a/web/vue/src/components/gekko/list.vue b/web/vue/src/components/gekko/list.vue
index aeee91fec..f30e2c092 100644
--- a/web/vue/src/components/gekko/list.vue
+++ b/web/vue/src/components/gekko/list.vue
@@ -2,10 +2,31 @@
   .contain.py2
     .text(v-html='text')
     .hr
-    h2 Running gekkos
-    .text(v-if='!gekkos.length')
-      p You currently do not have any Gekkos running.
-    table.full(v-if='gekkos.length')
+    h3 Market watchers
+    .text(v-if='!watchers.length')
+      p You are currently not watching any markets.
+    table.full(v-if='watchers.length')
+      thead
+        tr
+          th exchange
+          th currency
+          th asset
+          th started at
+          th last update
+          th duration
+      tbody
+        tr.clickable(v-for='gekko in watchers', v-on:click='$router.push({path: `live-gekkos/watcher/${gekko.id}`})')
+          td {{ gekko.watch.exchange }}
+          td {{ gekko.watch.currency }}
+          td {{ gekko.watch.asset }}
+          td {{ fmt(gekko.startAt) }}
+          td {{ fmt(gekko.latest) }}
+          td {{ humanizeDuration(moment(gekko.latest).diff(moment(gekko.startAt))) }}
+    .hr
+    h3 Strat runners
+    .text(v-if='!stratrunners.length')
+      p You are currently not running any strategies.
+    table.full(v-if='stratrunners.length')
       thead
         tr
           th exchange
@@ -25,13 +46,12 @@
           td {{ humanizeDuration(gekko.latest.diff(gekko.startAt)) }}
           td {{ gekko.type }}
     .hr
-    h2 Start a new Gekko
-    router-link(to='/live-gekkos/new') start a new gekko!
+    h2 Start a new live Gekko
+    router-link(to='/live-gekkos/new') start a new live Gekko!
 </template>
 
 <script>
 
-import { get } from '../../tools/ajax'
 import marked from '../../tools/marked';
 // global moment
 // global humanizeDuration
@@ -40,31 +60,35 @@ const text = marked(`
 
 ## Live Gekko
 
-You can use Gekko to run you strategy against the live market!
+You can use Gekko to run your strategy against the live market!
 
-*Note: only paper trading is supported for now.*
+For this you run a live gekko, which consists of two parts:
+
+- A market watcher: this will in realtime gather data from a market (like "Bitstamp:USD/BTC").
+- A strategy: this will use the realtime data from the marketwatcher and run a strategy over it.
+
+*Right now the strategy will be evalutated using a paper trader. If you want to automatically trade using your strat, you have to use the command line for now.*
 
 `);
 
 export default {
-  created: function() {
-    get('liveGekkos', (error, response) => {
-      this.gekkos = _.map(response, g => {
-        g.startAt = moment.utc(g.startAt);
-        g.latest = moment.utc(g.latest);
-        return g;
-      });
-    });
-  },
   data: () => {
     return {
       text,
-      gekkos: []
+    }
+  },
+  computed: {
+    stratrunners: function() {
+      return this.$store.state.stratrunners
+    },
+    watchers: function() {
+      return this.$store.state.watchers
     }
   },
   methods: {
     humanizeDuration: (n) => window.humanizeDuration(n),
-    fmt: mom => mom.format('YYYY-MM-DD HH:mm')
+    moment: mom => moment.utc(mom),
+    fmt: mom => moment.utc(mom).format('YYYY-MM-DD HH:mm')
   }
 }
 </script>
diff --git a/web/vue/src/components/gekko/new.vue b/web/vue/src/components/gekko/new.vue
index c8013d66d..6261ed3d4 100644
--- a/web/vue/src/components/gekko/new.vue
+++ b/web/vue/src/components/gekko/new.vue
@@ -9,6 +9,7 @@
 
 <script>
 
+import Vue from 'vue'
 import { post } from '../../tools/ajax'
 import gekkoConfigBuilder from './gekkoConfigBuilder.vue'
 
@@ -21,16 +22,74 @@ export default {
       config: {}
     }
   },
+  computed: {
+    watchers: function() {
+      return this.$store.state.watchers;
+    },
+    watchConfig: function() {
+      let raw = _.pick(this.config, 'watch', 'candleWriter');
+      let watchConfig = Vue.util.extend({}, raw);
+      watchConfig.type = 'market watcher';
+      watchConfig.mode = 'realtime';
+      return watchConfig;
+    },
+    gekkoConfig: function() {
+      let gekkoConfig = Vue.util.extend({}, this.config);
+      gekkoConfig.mode = 'leech';
+      return gekkoConfig;
+    },
+    existingMarketWatcher: function() {
+      let market = Vue.util.extend({}, this.watchConfig.watch);
+      return _.find(this.watchers, {watch: market});
+    }
+  },
   methods: {
     updateConfig: function(config) {
       this.config = config;
     },
     start: function() {
-      post('startGekko', this.config, (error, response) => {
-        this.$router.push({
-          path: `/live-gekkos/gekko/${response.id}`
-        })
-      });
+      // internally a live gekko consists of two parts:
+      //
+      // - a market watcher
+      // - a live gekko (strat runner + paper trader)
+      //
+      // however if the user selected type "market watcher"
+      // the second part won't be created
+      if(this.config.type === 'market watcher') {
+
+        // check if the specified market is already being watched
+        if(this.existingMarketWatcher) {
+          alert('This market is already being watched, redirecting you now...')
+          console.log('ROUTING TO EXISTING MARKETWATCHER');
+        } else {
+          this.startWatcher(function(error, resp) {
+            console.log('ROUTING TO NEW MARKETWATCHER');
+          });
+        }
+
+      } else {
+
+        // defer until watcher is done
+        let startGekko = () => {
+          this.startGekko(function(error, resp) {
+            console.log('ROUTING TO GEKKO');
+          });
+        }
+
+        if(!this.existingMarketWatcher) {
+          // the specified market is not yet being watched,
+          // we need to create a watcher
+          this.startWatcher(startGekko);
+        } else {
+          startGekko();
+        }
+      }
+    },
+    startWatcher: function(next) {
+      post('startGekko', this.watchConfig, next);
+    },
+    startGekko: function(next) {
+      post('startGekko', this.gekkoConfig, next);
     }
   }
 }
diff --git a/web/vue/src/components/gekko/single.vue b/web/vue/src/components/gekko/singleGekko.vue
similarity index 100%
rename from web/vue/src/components/gekko/single.vue
rename to web/vue/src/components/gekko/singleGekko.vue
diff --git a/web/vue/src/components/gekko/singleWatcher.vue b/web/vue/src/components/gekko/singleWatcher.vue
new file mode 100644
index 000000000..7eaa4a71b
--- /dev/null
+++ b/web/vue/src/components/gekko/singleWatcher.vue
@@ -0,0 +1,59 @@
+<template lang='jade'>
+  div.contain.my2
+    div(v-if='!data')
+      h1 Unknown Watcher
+      p Gekko doesn't know what whatcher this is...
+    div(v-if='data && !error')
+      h2 Market Watcher
+      .grd
+        h3 Market
+        .grd-row
+          .grd-row-col-2-6 Exchange
+          .grd-row-col-4-6 {{ data.watch.exchange }}
+        .grd-row
+          .grd-row-col-2-6 Currency
+          .grd-row-col-4-6 {{ data.watch.currency }}
+        .grd-row
+          .grd-row-col-2-6 Asset
+          .grd-row-col-4-6 {{ data.watch.asset }}
+        h3 Statistics
+        .grd-row
+          .grd-row-col-2-6 Watching since
+          .grd-row-col-4-6 {{ fmt(data.startAt) }}
+        .grd-row
+          .grd-row-col-2-6 Received data until
+          .grd-row-col-4-6 {{ fmt(data.latest) }}
+        .grd-row
+          .grd-row-col-2-6 Running for
+          .grd-row-col-4-6 {{ humanizeDuration(moment(data.latest).diff(moment(data.startAt))) }}
+        h3 Market graph
+        p TODO: candle price graph!
+</template>
+
+<script>
+
+import { get } from '../../tools/ajax'
+import _ from 'lodash'
+
+export default {
+  created: function() {
+    // todo: get data and spawn chart
+  },
+  computed: {
+    watchers: function() {
+      return this.$store.state.watchers;
+    },
+    data: function() {
+      return _.find(this.watchers, {id: this.$route.params.id});
+    }
+  },
+  methods: {
+    humanizeDuration: (n) => window.humanizeDuration(n),
+    moment: mom => moment.utc(mom),
+    fmt: mom => moment.utc(mom).format('YYYY-MM-DD HH:mm')
+  }
+}
+</script>
+
+<style>
+</style>
diff --git a/web/vue/src/components/global/configbuilder/typepicker.vue b/web/vue/src/components/global/configbuilder/typepicker.vue
index 97d35e6e9..8c4176177 100644
--- a/web/vue/src/components/global/configbuilder/typepicker.vue
+++ b/web/vue/src/components/global/configbuilder/typepicker.vue
@@ -1,14 +1,15 @@
 <template lang='jade'>
 div
-  h3 Typepicker
+  h3 Type
   template
-    label(for='type').wrapper Type of Gekko:
+    label(for='type').wrapper What do you want to do with gekko?
     form.radio.grd
-      div.grd-row().m1
-        input.grd-row-col-1-6(type='radio', name='type', checked)
-        label.grd-row-col-5-6(for='type') {{ type }}
+      div.grd-row(v-for='(type, i) in types').m1
+        input.grd-row-col-1-6(type='radio', :value='i', v-model='selectedTypeIndex')
+        label.grd-row-col-5-6(:for='i') {{ type }}
+    
 
-    em (Only paper trader supported for now)
+    em (Live trading not supported for now)
 </template>
 
 <script>
@@ -19,7 +20,8 @@ export default {
   },
   data: () => {
     return {
-      type: 'paper-trader', // 'market-watcher'
+      types: ['paper trader', 'market watcher'],
+      selectedTypeIndex: 0,
     }
   },
   methods: {
@@ -31,6 +33,11 @@ export default {
     type: function() {
       this.emitType();
     }
+  },
+  computed: {
+    type: function() {
+      return this.types[ this.selectedTypeIndex ];
+    }
   }
 }
 </script>
diff --git a/web/vue/src/main.js b/web/vue/src/main.js
index 0d331f66c..0784355f9 100644
--- a/web/vue/src/main.js
+++ b/web/vue/src/main.js
@@ -15,7 +15,8 @@ import singleImport from './components/data/import/single.vue'
 
 import gekkoList from './components/gekko/list.vue'
 import newGekko from './components/gekko/new.vue'
-import singleGekko from './components/gekko/single.vue'
+import singleGekko from './components/gekko/singleGekko.vue'
+import singleWatcher from './components/gekko/singleWatcher.vue'
 import { connect as connectWS } from './components/global/ws'
 import initializeState from './store/init'
 
@@ -30,7 +31,8 @@ const router = new VueRouter({
     { path: '/data/importer/import/:id', component: singleImport },
     { path: '/live-gekkos', component: gekkoList },
     { path: '/live-gekkos/new', component: newGekko },
-    { path: '/live-gekkos/gekko/:id', component: singleGekko }
+    { path: '/live-gekkos/gekko/:id', component: singleGekko },
+    { path: '/live-gekkos/watcher/:id', component: singleWatcher }
   ]
 });
 
diff --git a/web/vue/src/store/index.js b/web/vue/src/store/index.js
index 0621e9c7b..c2e536a5b 100644
--- a/web/vue/src/store/index.js
+++ b/web/vue/src/store/index.js
@@ -1,21 +1,27 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
-import { addImport, syncImports, updateImport } from './modules/imports/mutations'
+import _ from 'lodash'
+
+import * as importMutations from './modules/imports/mutations'
+import * as watchMutations from './modules/watchers/mutations'
+
 
 Vue.use(Vuex)
 
 const debug = process.env.NODE_ENV !== 'production'
 
+let mutations = {};
+
+// TODO: spread syntax
+_.merge(mutations, importMutations);
+_.merge(mutations, watchMutations);
+
 export default new Vuex.Store({
   state: {
     imports: [],
-    gekkos: [],
+    stratrunners: [],
     watchers: []
   },
-  mutations: {
-    addImport,
-    syncImports,
-    updateImport
-  },
+  mutations,
   strict: debug
 })
\ No newline at end of file
diff --git a/web/vue/src/store/init.js b/web/vue/src/store/init.js
index 99f1e0b90..82eca56c2 100644
--- a/web/vue/src/store/init.js
+++ b/web/vue/src/store/init.js
@@ -1,7 +1,9 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
 import syncImports from './modules/imports/sync'
+import syncWatchers from './modules/watchers/sync'
 
 export default function() {
   syncImports();
+  syncWatchers();
 }
\ No newline at end of file
diff --git a/web/vue/src/store/modules/imports/sync.js b/web/vue/src/store/modules/imports/sync.js
index f91d68e77..9fcaed336 100644
--- a/web/vue/src/store/modules/imports/sync.js
+++ b/web/vue/src/store/modules/imports/sync.js
@@ -3,7 +3,6 @@ import store from '../../'
 import { bus } from '../../../components/global/ws'
 
 const init = () => {
-  store.commit('syncImports', []);
   get('imports', (err, resp) => {
     store.commit('syncImports', resp);
   });
diff --git a/web/vue/src/store/modules/stratrunners/mutations.js b/web/vue/src/store/modules/stratrunners/mutations.js
new file mode 100644
index 000000000..42f4f0f8e
--- /dev/null
+++ b/web/vue/src/store/modules/stratrunners/mutations.js
@@ -0,0 +1,17 @@
+export const addStratrunner = (state, runner) => {
+  state.stratrunners.push(runner);
+  return state;
+}
+
+export const syncStratrunners = (state, runners) => {
+  state.stratrunners = runners;
+  return state;
+}
+
+export const updateWatcher = (state, update) => {
+  let item = state.stratrunners.find(i => i.id === update.gekko_id);
+  if(!item)
+    return state;
+  _.merge(item, update.updates);
+  return state;
+}
\ No newline at end of file
diff --git a/web/vue/src/store/modules/stratrunners/sync.js b/web/vue/src/store/modules/stratrunners/sync.js
new file mode 100644
index 000000000..00ada2187
--- /dev/null
+++ b/web/vue/src/store/modules/stratrunners/sync.js
@@ -0,0 +1,23 @@
+import { get } from '../../../tools/ajax'
+import store from '../../'
+import { bus } from '../../../components/global/ws'
+import _ from 'lodash'
+
+const init = () => {
+  get('gekkos', (err, resp) => {
+    let watchers = _.filter(resp, {mode: 'leech'});
+    store.commit('syncStratrunners', watchers);
+  });
+}
+
+const sync = () => {
+  bus.$on('update', data => {
+    if(data.gekko_mode === 'leech')
+      store.commit('updateStratrunner', data);
+  });
+}
+
+export default function() {
+  init();
+  sync();
+}
\ No newline at end of file
diff --git a/web/vue/src/store/modules/watchers/mutations.js b/web/vue/src/store/modules/watchers/mutations.js
new file mode 100644
index 000000000..6bad628e6
--- /dev/null
+++ b/web/vue/src/store/modules/watchers/mutations.js
@@ -0,0 +1,17 @@
+export const addWatcher = (state, watcher) => {
+  state.watchers.push(watcher);
+  return state;
+}
+
+export const syncWatchers = (state, watchers) => {
+  state.watchers = watchers;
+  return state;
+}
+
+export const updateWatcher = (state, update) => {
+  let item = state.watchers.find(i => i.id === update.gekko_id);
+  if(!item)
+    return state;
+  _.merge(item, update.updates);
+  return state;
+}
\ No newline at end of file
diff --git a/web/vue/src/store/modules/watchers/sync.js b/web/vue/src/store/modules/watchers/sync.js
new file mode 100644
index 000000000..4e8939f16
--- /dev/null
+++ b/web/vue/src/store/modules/watchers/sync.js
@@ -0,0 +1,33 @@
+import { get } from '../../../tools/ajax'
+import store from '../../'
+import { bus } from '../../../components/global/ws'
+import _ from 'lodash'
+
+const init = () => {
+  get('gekkos', (err, resp) => {
+    let watchers = _.filter(resp, {mode: 'realtime'});
+    store.commit('syncWatchers', watchers);
+  });
+}
+
+const sync = () => {
+
+  bus.$on('new_gekko', data => {
+    if(data.gekko.mode === 'realtime')
+      store.commit('addWatcher', data.gekko);
+  });
+
+
+  const update = (data) => {
+    if(data.gekko_mode === 'realtime')
+      store.commit('updateWatcher', data);
+  }
+
+  bus.$on('update', update);
+  bus.$on('startAt', update);
+}
+
+export default function() {
+  init();
+  sync();
+}
\ No newline at end of file

From d7e12461aa7d0634257bdae3c86f50fc99afc51e Mon Sep 17 00:00:00 2001
From: Mike van Rossum <mike@mikevanrossum.nl>
Date: Thu, 1 Dec 2016 16:12:40 +0000
Subject: [PATCH 06/25] fix routing to new watcher

---
 web/routes/startGekko.js                       |  2 +-
 web/vue/src/components/gekko/new.vue           | 10 +++++++---
 web/vue/src/components/gekko/singleWatcher.vue |  4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/web/routes/startGekko.js b/web/routes/startGekko.js
index e6788cbfb..dd95f032c 100644
--- a/web/routes/startGekko.js
+++ b/web/routes/startGekko.js
@@ -89,5 +89,5 @@ module.exports = function *() {
     gekko
   });
 
-  this.body = {status: 'ok'};
+  this.body = gekko;
 }
\ No newline at end of file
diff --git a/web/vue/src/components/gekko/new.vue b/web/vue/src/components/gekko/new.vue
index 6261ed3d4..5d772c333 100644
--- a/web/vue/src/components/gekko/new.vue
+++ b/web/vue/src/components/gekko/new.vue
@@ -60,10 +60,14 @@ export default {
         // check if the specified market is already being watched
         if(this.existingMarketWatcher) {
           alert('This market is already being watched, redirecting you now...')
-          console.log('ROUTING TO EXISTING MARKETWATCHER');
+          this.$router.push({
+            path: `/live-gekkos/watcher/${this.existingMarketWatcher.id}`
+          });
         } else {
-          this.startWatcher(function(error, resp) {
-            console.log('ROUTING TO NEW MARKETWATCHER');
+          this.startWatcher((error, resp) => {
+            this.$router.push({
+              path: `/live-gekkos/watcher/${resp.id}`
+            });
           });
         }
 
diff --git a/web/vue/src/components/gekko/singleWatcher.vue b/web/vue/src/components/gekko/singleWatcher.vue
index 7eaa4a71b..b328df965 100644
--- a/web/vue/src/components/gekko/singleWatcher.vue
+++ b/web/vue/src/components/gekko/singleWatcher.vue
@@ -3,7 +3,7 @@
     div(v-if='!data')
       h1 Unknown Watcher
       p Gekko doesn't know what whatcher this is...
-    div(v-if='data && !error')
+    div(v-if='data')
       h2 Market Watcher
       .grd
         h3 Market
@@ -24,7 +24,7 @@
           .grd-row-col-2-6 Received data until
           .grd-row-col-4-6 {{ fmt(data.latest) }}
         .grd-row
-          .grd-row-col-2-6 Running for
+          .grd-row-col-2-6 Data spanning
           .grd-row-col-4-6 {{ humanizeDuration(moment(data.latest).diff(moment(data.startAt))) }}
         h3 Market graph
         p TODO: candle price graph!

From 617ed04dec0367e2b741b584c9b1e2dad3849dee Mon Sep 17 00:00:00 2001
From: Mike van Rossum <mike@mikevanrossum.nl>
Date: Sat, 3 Dec 2016 15:34:48 +0000
Subject: [PATCH 07/25] use TOML files for configuration

---
 config/adapters/mongodb.toml             |  4 ++
 config/adapters/postgresql.toml          |  4 ++
 config/adapters/sqlite.toml              |  7 +++
 config/general.toml                      | 10 ++++
 config/plugins/candleWriter.toml         |  3 +-
 config/plugins/pushbullet.toml           | 16 +++++++
 config/plugins/trader.toml               |  9 ++++
 config/plugins/tradingAdvisor.toml       |  9 ++++
 core/pluginUtil.js                       |  9 +---
 core/tools/configBuilder.js              | 38 +++++++++++++++
 core/tools/dataStitcher.js               |  2 +-
 core/util.js                             | 20 ++++++--
 plugins/sqlite/handle.js                 |  4 +-
 plugins/sqlite/util.js                   |  2 +-
 plugins/tradingAdvisor/tradingAdvisor.js | 26 ----------
 sample-config.js                         | 61 +++++++++++-------------
 16 files changed, 146 insertions(+), 78 deletions(-)
 create mode 100644 config/adapters/mongodb.toml
 create mode 100644 config/adapters/postgresql.toml
 create mode 100644 config/adapters/sqlite.toml
 create mode 100644 config/general.toml
 create mode 100644 config/plugins/pushbullet.toml
 create mode 100644 config/plugins/trader.toml
 create mode 100644 config/plugins/tradingAdvisor.toml
 create mode 100644 core/tools/configBuilder.js

diff --git a/config/adapters/mongodb.toml b/config/adapters/mongodb.toml
new file mode 100644
index 000000000..c7162f502
--- /dev/null
+++ b/config/adapters/mongodb.toml
@@ -0,0 +1,4 @@
+connectionString = "mongodb://mongodb/gekko"
+dependencies = [{"module"=>"mongojs", "version"=>"2.4.0"}]
+path = "plugins/mongodb"
+version = 0.1
diff --git a/config/adapters/postgresql.toml b/config/adapters/postgresql.toml
new file mode 100644
index 000000000..697240896
--- /dev/null
+++ b/config/adapters/postgresql.toml
@@ -0,0 +1,4 @@
+connectionString = "postgres://user:pass@localhost:5432"
+dependencies = [{"module"=>"pg", "version"=>"6.1.0"}]
+path = "plugins/postgresql"
+version = 0.1
\ No newline at end of file
diff --git a/config/adapters/sqlite.toml b/config/adapters/sqlite.toml
new file mode 100644
index 000000000..48e683341
--- /dev/null
+++ b/config/adapters/sqlite.toml
@@ -0,0 +1,7 @@
+dataDirectory = "history"
+path = "plugins/sqlite"
+version = 0.1
+
+[[dependencies]]
+module = "sqlite3"
+version = "3.1.4"
\ No newline at end of file
diff --git a/config/general.toml b/config/general.toml
new file mode 100644
index 000000000..9df75eaa0
--- /dev/null
+++ b/config/general.toml
@@ -0,0 +1,10 @@
+debug = true
+
+# what database should Gekko use?
+adapter = 'sqlite'
+
+[watch]
+exchange = 'Bitstamp'
+currency = 'USD'
+asset = 'BTC'
+
diff --git a/config/plugins/candleWriter.toml b/config/plugins/candleWriter.toml
index 54599a38f..3477e9e31 100644
--- a/config/plugins/candleWriter.toml
+++ b/config/plugins/candleWriter.toml
@@ -1,2 +1 @@
-enabled = true
-sqlite = "sqlite"
\ No newline at end of file
+enabled = true
\ No newline at end of file
diff --git a/config/plugins/pushbullet.toml b/config/plugins/pushbullet.toml
new file mode 100644
index 000000000..686352ee9
--- /dev/null
+++ b/config/plugins/pushbullet.toml
@@ -0,0 +1,16 @@
+enabled = false
+
+# Send 'Gekko starting' message if true
+sendMessageOnStart = true
+
+# disable advice printout if it's soft
+muteSoft = true
+
+# your email, change it unless you are Azor Ahai
+email = "jon_snow@westeros.org"
+
+# your pushbullet API key
+key = "xxx"
+
+# will make Gekko messages start with [GEKKO]
+tag = "[GEKKO]"
\ No newline at end of file
diff --git a/config/plugins/trader.toml b/config/plugins/trader.toml
new file mode 100644
index 000000000..8a76fc2c3
--- /dev/null
+++ b/config/plugins/trader.toml
@@ -0,0 +1,9 @@
+enabled = false
+
+## NOTE: once you filled in the following
+## never share this file with anyone!
+
+key = ""
+secret = ""
+# this is only required at specific exchanges
+username = ""
\ No newline at end of file
diff --git a/config/plugins/tradingAdvisor.toml b/config/plugins/tradingAdvisor.toml
new file mode 100644
index 000000000..54bc8e4ff
--- /dev/null
+++ b/config/plugins/tradingAdvisor.toml
@@ -0,0 +1,9 @@
+enabled = true
+
+candleSize = 60
+historySize = 25
+method = "MACD"
+
+[talib]
+enabled = false
+version = "1.0.2"
\ No newline at end of file
diff --git a/core/pluginUtil.js b/core/pluginUtil.js
index 1a92e3dca..e3a5dbacc 100644
--- a/core/pluginUtil.js
+++ b/core/pluginUtil.js
@@ -64,13 +64,6 @@ var pluginHelper = {
 
     plugin.config = config[plugin.slug];
 
-    if(!plugin.config)
-      log.warn(
-        'unable to find',
-        plugin.name,
-        'in the config. Is your config up to date?'
-      );
-
     if(!plugin.config || !plugin.config.enabled)
       return next();
 
@@ -94,7 +87,7 @@ var pluginHelper = {
       return next(cannotLoad);
 
     if(plugin.path)
-      var Constructor = require(pluginDir + plugin.path(plugin.config));
+      var Constructor = require(pluginDir + plugin.path(config));
     else
       var Constructor = require(pluginDir + plugin.slug);
 
diff --git a/core/tools/configBuilder.js b/core/tools/configBuilder.js
new file mode 100644
index 000000000..b9fb1dd39
--- /dev/null
+++ b/core/tools/configBuilder.js
@@ -0,0 +1,38 @@
+const fs = require('fs');
+const _ = require('lodash');
+const toml = require('toml');
+
+const util = require('../util');
+const dirs = util.dirs();
+
+
+const getTOML = function(fileName) {
+  var raw = fs.readFileSync(fileName);
+  return toml.parse(raw);
+}
+
+// build a config object out of a directory of TOML files
+module.exports = function() {
+  const configDir = util.dirs().config;
+
+  let _config = util.getTOML(configDir + 'general.toml');
+  fs.readdirSync(configDir + 'plugins').forEach(function(pluginFile) {
+    let pluginName = _.first(pluginFile.split('.'))
+    _config[pluginName] = util.getTOML(configDir + 'plugins/' + pluginFile);
+  });
+
+  // attach the proper adapter
+  let adapter = _config.adapter;
+  _config[adapter] = util.getTOML(configDir + 'adapters/' + adapter + '.toml');
+
+  if(_config.tradingAdvisor.enabled) {
+    // also load the strat
+    let strat = _config.tradingAdvisor.method;
+    let stratFile = configDir + 'strategies/' + strat + '.toml';
+    if(!fs.existsSync(stratFile))
+      util.die('Cannot find the strategy config file for ' + strat);
+    _config[strat] = util.getTOML(stratFile);
+  }
+
+  return _config;
+}
\ No newline at end of file
diff --git a/core/tools/dataStitcher.js b/core/tools/dataStitcher.js
index c0c487bc9..bcd150ed9 100644
--- a/core/tools/dataStitcher.js
+++ b/core/tools/dataStitcher.js
@@ -45,7 +45,7 @@ Stitcher.prototype.prepareHistoricalData = function(done) {
     return done();
 
   var requiredHistory = config.tradingAdvisor.candleSize * config.tradingAdvisor.historySize;
-  var Reader = require(dirs.plugins + config.tradingAdvisor.adapter + '/reader');
+  var Reader = require(dirs.plugins + config.adapter + '/reader');
 
   this.reader = new Reader;
 
diff --git a/core/util.js b/core/util.js
index a6eb07376..c1e363e9e 100644
--- a/core/util.js
+++ b/core/util.js
@@ -19,14 +19,24 @@ var util = {
     if(_config)
       return _config;
 
-    var configFile = path.resolve(program.config || util.dirs().gekko + 'config.js');
+    if(program.config) {
+      // we will use one single config file
+      if(!fs.existsSync(configFile))
+        util.die('Cannot find the specified config file.');
 
-    if(!fs.existsSync(configFile))
-      util.die('Cannot find a config file.');
+      _config = require(configFile);
+      return _config;
+    }
 
-    _config = require(configFile);
+    // build the config out of TOML files
+    var buildConfig = require(util.dirs().tools + 'configBuilder');
+    _config = buildConfig();
     return _config;
   },
+  getTOML: function(fileName) {
+    var raw = fs.readFileSync(fileName);
+    return toml.parse(raw);
+  },
   // overwrite the whole config
   setConfig: function(config) {
     _config = config;
@@ -153,7 +163,7 @@ var util = {
       return true;
     else
       return false;
-  },
+  }
 }
 
 // NOTE: those options are only used
diff --git a/plugins/sqlite/handle.js b/plugins/sqlite/handle.js
index 90d2f5bb9..78b374030 100644
--- a/plugins/sqlite/handle.js
+++ b/plugins/sqlite/handle.js
@@ -5,13 +5,13 @@ var util = require('../../core/util.js');
 var config = util.getConfig();
 var dirs = util.dirs();
 
-var adapter = config.adapters.sqlite;
+var adapter = config.sqlite;
 
 // verify the correct dependencies are installed
 var pluginHelper = require(dirs.core + 'pluginUtil');
 var pluginMock = {
   slug: 'sqlite adapter',
-  dependencies: config.adapters.sqlite.dependencies
+  dependencies: adapter.dependencies
 };
 
 var cannotLoad = pluginHelper.cannotLoad(pluginMock);
diff --git a/plugins/sqlite/util.js b/plugins/sqlite/util.js
index 66d31c9e8..bedb57e19 100644
--- a/plugins/sqlite/util.js
+++ b/plugins/sqlite/util.js
@@ -4,7 +4,7 @@ var watch = config.watch;
 var settings = {
   exchange: watch.exchange,
   pair: [watch.currency, watch.asset],
-  historyPath: config.adapters.sqlite.dataDirectory
+  historyPath: config.sqlite.dataDirectory
 }
 
 module.exports = {
diff --git a/plugins/tradingAdvisor/tradingAdvisor.js b/plugins/tradingAdvisor/tradingAdvisor.js
index f3129d610..23b1166b4 100644
--- a/plugins/tradingAdvisor/tradingAdvisor.js
+++ b/plugins/tradingAdvisor/tradingAdvisor.js
@@ -19,8 +19,6 @@ var Actor = function(done) {
 
   this.methodName = config.tradingAdvisor.method;
 
-  this.generalizeMethodSettings();
-
   this.setupTradingMethod();
 
   var mode = util.gekkoMode();
@@ -35,30 +33,6 @@ var Actor = function(done) {
 
 util.makeEventEmitter(Actor);
 
-Actor.prototype.generalizeMethodSettings = function() {
-  // method settings can be either part of the main config OR a seperate
-  // toml configuration file. In case of the toml config file we need to
-  // parse and attach to main config object
-
-  // config already part of 
-  if(config[this.methodName]) {
-    log.warn('\t', 'Config already has', this.methodName, 'parameters. Ignoring toml file');
-    return;
-  }
-
-  var tomlFile = dirs.config + 'strategies/' + this.methodName + '.toml';
-
-  if(!fs.existsSync(tomlFile)) {
-    log.warn('\t', 'toml configuration file not found.');
-    return;
-  }
-
-  var rawSettings = fs.readFileSync(tomlFile);
-  config[this.methodName] = toml.parse(rawSettings);
-
-  util.setConfig(config);
-}
-
 Actor.prototype.setupTradingMethod = function() {
 
   if(!fs.existsSync(dirs.methods + this.methodName + '.js'))
diff --git a/sample-config.js b/sample-config.js
index 6fbea2579..f167d4dda 100644
--- a/sample-config.js
+++ b/sample-config.js
@@ -175,43 +175,38 @@ config.adviceWriter = {
 //                       CONFIGURING ADAPTER
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+config.sqlite = {
+  path: 'plugins/sqlite',
 
+  dataDirectory: 'history',
+  version: 0.1,
 
+  dependencies: [{
+    module: 'sqlite3',
+    version: '3.1.4'
+  }]
+}
 
-
-
-config.adapters = {
-  sqlite: {
-    path: 'plugins/sqlite',
-
-    dataDirectory: 'history',
-    version: 0.1,
-
-    dependencies: [{
-      module: 'sqlite3',
-      version: '3.1.4'
-    }]
-  },
   // Postgres adapter example config (please note: requires postgres >= 9.5):
-  postgresql: {
-    path: 'plugins/postgresql',
-    version: 0.1,
-    connectionString: 'postgres://user:pass@localhost:5432', // if default port
-    dependencies: [{
-      module: 'pg',
-      version: '6.1.0'
-    }]
-  },
-  // Mongodb adapter, requires mongodb >= 3.3 (no version earlier tested)
-  mongodb: {
-    path: 'plugins/mongodb',
-    version: 0.1,
-    connectionString: 'mongodb://mongodb/gekko', // connection to mongodb server
-    dependencies: [{
-      module: 'mongojs',
-      version: '2.4.0'
-    }]
-  }
+config.postgresql = {
+  path: 'plugins/postgresql',
+  version: 0.1,
+  connectionString: 'postgres://user:pass@localhost:5432', // if default port
+  dependencies: [{
+    module: 'pg',
+    version: '6.1.0'
+  }]
+}
+
+// Mongodb adapter, requires mongodb >= 3.3 (no version earlier tested)
+config.mongodb = {
+  path: 'plugins/mongodb',
+  version: 0.1,
+  connectionString: 'mongodb://mongodb/gekko', // connection to mongodb server
+  dependencies: [{
+    module: 'mongojs',
+    version: '2.4.0'
+  }]
 }
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

From 6e20f0315ecb57f091353285d016f50a201a0afb Mon Sep 17 00:00:00 2001
From: Mike van Rossum <mike@mikevanrossum.nl>
Date: Sat, 3 Dec 2016 19:39:51 +0000
Subject: [PATCH 08/25] use new config structure everywhere

---
 config/adapters/mongodb.toml       |  5 +++-
 config/adapters/postgresql.toml    |  7 +++--
 config/general.toml                |  6 ++--
 core/markets/backtest.js           |  2 +-
 core/markets/importer.js           |  2 +-
 core/tools/configBuilder.js        | 14 ++++++----
 core/tools/dateRangeScanner.js     |  2 +-
 core/util.js                       |  4 ---
 core/workers/datasetScan/parent.js |  2 +-
 plugins/sqlite/scanner.js          |  2 +-
 sample-config.js                   |  1 -
 web/routes/baseConfig.js           | 45 +++++++++++++++++++++---------
 12 files changed, 58 insertions(+), 34 deletions(-)

diff --git a/config/adapters/mongodb.toml b/config/adapters/mongodb.toml
index c7162f502..2aed9d10a 100644
--- a/config/adapters/mongodb.toml
+++ b/config/adapters/mongodb.toml
@@ -1,4 +1,7 @@
 connectionString = "mongodb://mongodb/gekko"
-dependencies = [{"module"=>"mongojs", "version"=>"2.4.0"}]
 path = "plugins/mongodb"
 version = 0.1
+
+[[dependencies]]
+module = "mongojs"
+version = "2.4.0"
\ No newline at end of file
diff --git a/config/adapters/postgresql.toml b/config/adapters/postgresql.toml
index 697240896..834f442cd 100644
--- a/config/adapters/postgresql.toml
+++ b/config/adapters/postgresql.toml
@@ -1,4 +1,7 @@
 connectionString = "postgres://user:pass@localhost:5432"
-dependencies = [{"module"=>"pg", "version"=>"6.1.0"}]
 path = "plugins/postgresql"
-version = 0.1
\ No newline at end of file
+version = 0.1
+
+[[dependencies]]
+module = "pg"
+version = "6.1.0"
\ No newline at end of file
diff --git a/config/general.toml b/config/general.toml
index 9df75eaa0..fa1696ad7 100644
--- a/config/general.toml
+++ b/config/general.toml
@@ -1,10 +1,10 @@
-debug = true
+debug = false
 
 # what database should Gekko use?
 adapter = 'sqlite'
 
 [watch]
-exchange = 'Bitstamp'
-currency = 'USD'
+exchange = 'Poloniex'
+currency = 'USDT'
 asset = 'BTC'
 
diff --git a/core/markets/backtest.js b/core/markets/backtest.js
index 7947079d6..405ec03bc 100644
--- a/core/markets/backtest.js
+++ b/core/markets/backtest.js
@@ -5,7 +5,7 @@ var dirs = util.dirs();
 var log = require(dirs.core + 'log');
 var moment = require('moment');
 
-var adapter = config.adapters[config.backtest.adapter];
+var adapter = config[config.adapter];
 var Reader = require(dirs.gekko + adapter.path + '/reader');
 var daterange = config.backtest.daterange;
 
diff --git a/core/markets/importer.js b/core/markets/importer.js
index ec6cd4419..e9dd4b679 100644
--- a/core/markets/importer.js
+++ b/core/markets/importer.js
@@ -6,7 +6,7 @@ var log = require(dirs.core + 'log');
 var moment = require('moment');
 var cp = require(dirs.core + 'cp');
 
-var adapter = config.adapters[config.importer.adapter];
+var adapter = config[config.adapter];
 var daterange = config.importer.daterange;
 
 var from = moment.utc(daterange.from);
diff --git a/core/tools/configBuilder.js b/core/tools/configBuilder.js
index b9fb1dd39..7f4034825 100644
--- a/core/tools/configBuilder.js
+++ b/core/tools/configBuilder.js
@@ -5,7 +5,6 @@ const toml = require('toml');
 const util = require('../util');
 const dirs = util.dirs();
 
-
 const getTOML = function(fileName) {
   var raw = fs.readFileSync(fileName);
   return toml.parse(raw);
@@ -15,15 +14,15 @@ const getTOML = function(fileName) {
 module.exports = function() {
   const configDir = util.dirs().config;
 
-  let _config = util.getTOML(configDir + 'general.toml');
+  let _config = getTOML(configDir + 'general.toml');
   fs.readdirSync(configDir + 'plugins').forEach(function(pluginFile) {
     let pluginName = _.first(pluginFile.split('.'))
-    _config[pluginName] = util.getTOML(configDir + 'plugins/' + pluginFile);
+    _config[pluginName] = getTOML(configDir + 'plugins/' + pluginFile);
   });
 
   // attach the proper adapter
   let adapter = _config.adapter;
-  _config[adapter] = util.getTOML(configDir + 'adapters/' + adapter + '.toml');
+  _config[adapter] = getTOML(configDir + 'adapters/' + adapter + '.toml');
 
   if(_config.tradingAdvisor.enabled) {
     // also load the strat
@@ -31,8 +30,13 @@ module.exports = function() {
     let stratFile = configDir + 'strategies/' + strat + '.toml';
     if(!fs.existsSync(stratFile))
       util.die('Cannot find the strategy config file for ' + strat);
-    _config[strat] = util.getTOML(stratFile);
+    _config[strat] = getTOML(stratFile);
   }
 
+  const mode = util.gekkoMode();
+
+  if(mode === 'backtest')
+    _config.backtest = getTOML(configDir + 'backtest.toml');
+
   return _config;
 }
\ No newline at end of file
diff --git a/core/tools/dateRangeScanner.js b/core/tools/dateRangeScanner.js
index 01587e235..40e2d7502 100644
--- a/core/tools/dateRangeScanner.js
+++ b/core/tools/dateRangeScanner.js
@@ -10,7 +10,7 @@ var config = util.getConfig();
 var dirs = util.dirs();
 var log = require(dirs.core + 'log');
 
-var adapter = config.adapters[config.backtest.adapter];
+var adapter = config[config.adapter];
 var Reader = require(dirs.gekko + adapter.path + '/reader');
 
 var reader = new Reader();
diff --git a/core/util.js b/core/util.js
index c1e363e9e..53e28788f 100644
--- a/core/util.js
+++ b/core/util.js
@@ -33,10 +33,6 @@ var util = {
     _config = buildConfig();
     return _config;
   },
-  getTOML: function(fileName) {
-    var raw = fs.readFileSync(fileName);
-    return toml.parse(raw);
-  },
   // overwrite the whole config
   setConfig: function(config) {
     _config = config;
diff --git a/core/workers/datasetScan/parent.js b/core/workers/datasetScan/parent.js
index b1f3f64a3..d8b66ea65 100644
--- a/core/workers/datasetScan/parent.js
+++ b/core/workers/datasetScan/parent.js
@@ -7,7 +7,7 @@ var config = util.getConfig();
 var dirs = util.dirs();
 var log = require(dirs.core + 'log');
 
-var adapter = config.adapters[config.backtest.adapter];
+var adapter = config[config.adapter];
 var scan = require(dirs.gekko + adapter.path + '/scanner');
 
 var dateRangeScan = require('../dateRangeScan/parent');
diff --git a/plugins/sqlite/scanner.js b/plugins/sqlite/scanner.js
index 2e9ec82c8..31eaec801 100644
--- a/plugins/sqlite/scanner.js
+++ b/plugins/sqlite/scanner.js
@@ -10,7 +10,7 @@ const sqlite3 = require('sqlite3');
 
 // todo: rewrite with generators or async/await..
 module.exports = done => {
-  const dbDirectory = dirs.gekko + config.adapters.sqlite.dataDirectory
+  const dbDirectory = dirs.gekko + config.sqlite.dataDirectory
 
   if(!fs.existsSync(dbDirectory))
     return done(null, []);
diff --git a/sample-config.js b/sample-config.js
index f167d4dda..c8dd5b771 100644
--- a/sample-config.js
+++ b/sample-config.js
@@ -217,7 +217,6 @@ config.mongodb = {
 // @link: https://github.com/askmike/gekko/blob/stable/docs/Backtesting.md
 
 config.backtest = {
-  adapter: 'sqlite',
   daterange: 'scan',
   batchSize: 50
 }
diff --git a/web/routes/baseConfig.js b/web/routes/baseConfig.js
index 32635cfc4..384174fc6 100644
--- a/web/routes/baseConfig.js
+++ b/web/routes/baseConfig.js
@@ -12,7 +12,6 @@ config.debug = false;
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 config.tradingAdvisor = {
-  adapter: 'sqlite',
   talib: {
     enabled: false, // todo!
     version: '1.0.2'
@@ -39,7 +38,6 @@ config.profitSimulator = {
 }
 
 config.candleWriter = {
-  adapter: 'sqlite',
   enabled: true
 }
 
@@ -47,18 +45,40 @@ config.candleWriter = {
 //                       CONFIGURING ADAPTER
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-config.adapters = {
-  sqlite: {
-    path: 'plugins/sqlite',
+config.adapter = 'sqlite';
 
-    dataDirectory: 'history',
-    version: 0.1,
+config.sqlite = {
+  path: 'plugins/sqlite',
 
-    dependencies: [{
-      module: 'sqlite3',
-      version: '3.1.4'
-    }]
-  }
+  dataDirectory: 'history',
+  version: 0.1,
+
+  dependencies: [{
+    module: 'sqlite3',
+    version: '3.1.4'
+  }]
+}
+
+  // Postgres adapter example config (please note: requires postgres >= 9.5):
+config.postgresql = {
+  path: 'plugins/postgresql',
+  version: 0.1,
+  connectionString: 'postgres://user:pass@localhost:5432', // if default port
+  dependencies: [{
+    module: 'pg',
+    version: '6.1.0'
+  }]
+}
+
+// Mongodb adapter, requires mongodb >= 3.3 (no version earlier tested)
+config.mongodb = {
+  path: 'plugins/mongodb',
+  version: 0.1,
+  connectionString: 'mongodb://mongodb/gekko', // connection to mongodb server
+  dependencies: [{
+    module: 'mongojs',
+    version: '2.4.0'
+  }]
 }
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -69,7 +89,6 @@ config.adapters = {
 // @link: https://github.com/askmike/gekko/blob/stable/docs/Backtesting.md
 
 config.backtest = {
-  adapter: 'sqlite',
   daterange: 'scan',
   batchSize: 50
 }

From 67ae8ab6529c58577046caf32c599a25d5f0d2c5 Mon Sep 17 00:00:00 2001
From: Mike van Rossum <mike@mikevanrossum.nl>
Date: Sat, 3 Dec 2016 21:02:51 +0000
Subject: [PATCH 09/25] implement getCandles & hook up to API

---
 config/backtest.toml                          |  8 ++
 core/markets/backtest.js                      |  6 ++
 core/tools/candleLoader.js                    | 97 +++++++++++++++++++
 core/workers/loadCandles/child.js             | 25 +++++
 core/workers/loadCandles/parent.js            | 62 ++++++++++++
 web/routes/getCandles.js                      | 39 ++++++++
 web/server.js                                 |  1 +
 web/vue/src/components/gekko/list.vue         | 10 +-
 .../src/components/gekko/singleWatcher.vue    | 60 +++++++++++-
 web/vue/src/components/layout/header.vue      |  1 +
 10 files changed, 303 insertions(+), 6 deletions(-)
 create mode 100644 config/backtest.toml
 create mode 100644 core/tools/candleLoader.js
 create mode 100644 core/workers/loadCandles/child.js
 create mode 100644 core/workers/loadCandles/parent.js
 create mode 100644 web/routes/getCandles.js

diff --git a/config/backtest.toml b/config/backtest.toml
new file mode 100644
index 000000000..3569ec11d
--- /dev/null
+++ b/config/backtest.toml
@@ -0,0 +1,8 @@
+batchSize = 50
+
+# scan for available dateranges
+daterange = "scan"
+# or specify it like so:
+# [daterange]
+# from = "2015-01-01"
+# to = "2016-01-01"
\ No newline at end of file
diff --git a/core/markets/backtest.js b/core/markets/backtest.js
index 405ec03bc..2e7cd3e53 100644
--- a/core/markets/backtest.js
+++ b/core/markets/backtest.js
@@ -15,6 +15,12 @@ var from = moment.utc(daterange.from);
 if(to <= from)
   util.die('This daterange does not make sense.')
 
+if(!from.isValid())
+  util.die('invalid `from`');
+
+if(!to.isValid())
+  util.die('invalid `to`');
+
 var Market = function() {
 
   _.bindAll(this);
diff --git a/core/tools/candleLoader.js b/core/tools/candleLoader.js
new file mode 100644
index 000000000..d1865661f
--- /dev/null
+++ b/core/tools/candleLoader.js
@@ -0,0 +1,97 @@
+const batchSize = 1000;
+
+const _ = require('lodash');
+const fs = require('fs');
+const moment = require('moment');
+
+const util = require('../../core/util');
+const config = util.getConfig();
+const dirs = util.dirs();
+const log = require(dirs.core + '/log');
+
+const adapter = config[config.adapter];
+const Reader = require(dirs.gekko + adapter.path + '/reader');
+const daterange = config.daterange;
+
+const CandleBatcher = require(dirs.core + 'candleBatcher');
+
+const to = moment.utc(daterange.to).startOf('minute');
+const from = moment.utc(daterange.from).startOf('minute');
+const toUnix = to.unix();
+
+if(to <= from)
+  util.die('This daterange does not make sense.')
+
+if(!from.isValid())
+  util.die('invalid `from`');
+
+if(!to.isValid())
+  util.die('invalid `to`');
+
+let iterator = {
+  from: from.clone(),
+  to: from.clone().add(batchSize, 'm').subtract(1, 's')
+}
+
+var DONE = false;
+
+var result = [];
+var reader = new Reader();
+var batcher;
+var next;
+var doneFn = () => {
+  process.nextTick(() => {
+    next(result);
+  })
+};
+
+module.exports = function(candleSize, _next) {
+  next = _.once(_next);
+
+  batcher = new CandleBatcher(candleSize)
+    .on('candle', handleBatchedCandles);
+
+  getBatch();
+}
+
+const getBatch = () => {
+  reader.get(
+    iterator.from.unix(),
+    iterator.to.unix(),
+    'full',
+    handleCandles
+  )
+}
+
+const shiftIterator = () => {
+  iterator = {
+    from: iterator.from.clone().add(batchSize, 'm'),
+    to: iterator.from.clone().add(batchSize * 2, 'm').subtract(1, 's')
+  }
+}
+
+const handleCandles = (err, data) => {
+  if(err) {
+    console.error(err);
+    util.die('Encountered an error..')
+  }
+
+  if(_.last(data).start >= toUnix)
+    DONE = true;
+
+  batcher.write(data);
+
+  if(DONE) {
+    console.log('reader closed!');
+    reader.close();
+  } else {
+    shiftIterator();
+    getBatch();
+  }
+}
+
+const handleBatchedCandles = candle => {
+  result.push(candle);
+  if(DONE)
+    doneFn();
+}
\ No newline at end of file
diff --git a/core/workers/loadCandles/child.js b/core/workers/loadCandles/child.js
new file mode 100644
index 000000000..0fbf2cb2a
--- /dev/null
+++ b/core/workers/loadCandles/child.js
@@ -0,0 +1,25 @@
+var start = (config, candleSize, daterange) => {
+  var util = require(__dirname + '/../../util');
+
+  // force correct gekko env
+  util.setGekkoEnv('child-process');
+
+  // force disable debug
+  config.debug = false;
+  util.setConfig(config);
+
+  var dirs = util.dirs();
+
+  var load = require(dirs.tools + 'candleLoader');
+  load(config.candleSize, candles => {
+    console.log('LOAD CALLBACK!');
+    process.send(candles);
+  })
+}
+
+process.send('ready');
+
+process.on('message', (m) => {
+  if(m.what === 'start')
+    start(m.config, m.candleSize, m.daterange);
+});
\ No newline at end of file
diff --git a/core/workers/loadCandles/parent.js b/core/workers/loadCandles/parent.js
new file mode 100644
index 000000000..c9f41b3e7
--- /dev/null
+++ b/core/workers/loadCandles/parent.js
@@ -0,0 +1,62 @@
+// example usage:
+
+// let config = {
+//   watch: {
+//     exchange: 'poloniex',
+//     currency: 'USDT',
+//     asset: 'BTC'
+//   },
+//   daterange: {
+//     from: '2016-05-22 11:22',
+//     to: '2016-06-03 19:56'
+//   },
+//   adapter: 'sqlite',
+//   sqlite: {
+//     path: 'plugins/sqlite',
+
+//     dataDirectory: 'history',
+//     version: 0.1,
+
+//     dependencies: [{
+//       module: 'sqlite3',
+//       version: '3.1.4'
+//     }]
+//   },
+//   candleSize: 100
+// }
+
+// module.exports(config, function(err, data) {
+//   console.log('FINAL CALLBACK');
+//   console.log('err', err);
+//   console.log('data', data.length);
+// })
+
+
+const fork = require('child_process').fork;
+const _ = require('lodash');
+
+module.exports = (config, callback) => {
+  const child = fork(__dirname + '/child');
+
+  const message = {
+    what: 'start',
+    config
+  }
+
+  const done = _.once(callback);
+
+  child.on('message', function(m) {
+    console.log('GOT MESSAGE!')
+    if(m === 'ready')
+      return child.send(message);
+
+    // else we are done and have candles!
+    done(null, m);
+    child.kill('SIGINT');
+  });
+
+  child.on('exit', code => {
+    if(code !== 0)
+      done('ERROR, unable to load candles, please check the console.');
+  });
+}
\ No newline at end of file
diff --git a/web/routes/getCandles.js b/web/routes/getCandles.js
new file mode 100644
index 000000000..2265514c5
--- /dev/null
+++ b/web/routes/getCandles.js
@@ -0,0 +1,39 @@
+// simple POST request that returns the candles requested
+
+// expects a config like:
+
+// let config = {
+//   watch: {
+//     exchange: 'poloniex',
+//     currency: 'USDT',
+//     asset: 'BTC'
+//   },
+//   daterange: {
+//     from: '2016-05-22 11:22',
+//     to: '2016-06-03 19:56'
+//   },
+//   adapter: 'sqlite',
+//   sqlite: {
+//     path: 'plugins/sqlite',
+
+//     dataDirectory: 'history',
+//     version: 0.1,
+
+//     dependencies: [{
+//       module: 'sqlite3',
+//       version: '3.1.4'
+//     }]
+//   },
+//   candleSize: 100
+// }
+
+const _ = require('lodash');
+const promisify = require('tiny-promisify');
+const candleLoader = promisify(require('../../core/workers/loadCandles/parent'));
+
+// starts a backtest
+// requires a post body with a config object
+module.exports = function *() {
+
+  this.body = yield candleLoader(this.request.body);
+}
\ No newline at end of file
diff --git a/web/server.js b/web/server.js
index 688a6375e..11c83f476 100644
--- a/web/server.js
+++ b/web/server.js
@@ -52,6 +52,7 @@ router.post('/api/scansets', require(ROUTE('scanDatasets')));
 router.post('/api/backtest', require(ROUTE('backtest')));
 router.post('/api/import', require(ROUTE('import')));
 router.post('/api/startGekko', require(ROUTE('startGekko')));
+router.post('/api/getCandles', require(ROUTE('getCandles')));
 
 // incoming WS:
 // wss.on('connection', ws => {
diff --git a/web/vue/src/components/gekko/list.vue b/web/vue/src/components/gekko/list.vue
index f30e2c092..9f4abfef0 100644
--- a/web/vue/src/components/gekko/list.vue
+++ b/web/vue/src/components/gekko/list.vue
@@ -5,7 +5,7 @@
     h3 Market watchers
     .text(v-if='!watchers.length')
       p You are currently not watching any markets.
-    table.full(v-if='watchers.length')
+    table.full.clickable(v-if='watchers.length')
       thead
         tr
           th exchange
@@ -94,6 +94,14 @@ export default {
 </script>
 
 <style>
+table.clickable {
+  border-collapse: separate;
+}
+
+tr.clickable td:nth-child(1) {
+  padding-left: 5px;
+}
+
 tr.clickable {
   cursor: pointer;
 }
diff --git a/web/vue/src/components/gekko/singleWatcher.vue b/web/vue/src/components/gekko/singleWatcher.vue
index b328df965..80e18c41c 100644
--- a/web/vue/src/components/gekko/singleWatcher.vue
+++ b/web/vue/src/components/gekko/singleWatcher.vue
@@ -27,17 +27,25 @@
           .grd-row-col-2-6 Data spanning
           .grd-row-col-4-6 {{ humanizeDuration(moment(data.latest).diff(moment(data.startAt))) }}
         h3 Market graph
-        p TODO: candle price graph!
+        spinner(v-if='candleFetch === "fetching"')
+        template(v-if='candleFetch === "fetched"')
+        p CHART!
 </template>
 
 <script>
 
-import { get } from '../../tools/ajax'
+import { post } from '../../tools/ajax'
 import _ from 'lodash'
+import spinner from '../global/blockSpinner.vue'
 
 export default {
-  created: function() {
-    // todo: get data and spawn chart
+  components: {
+    spinner
+  },
+  data: () => {
+    return {
+      candleFetch: 'idle'
+    }
   },
   computed: {
     watchers: function() {
@@ -45,12 +53,54 @@ export default {
     },
     data: function() {
       return _.find(this.watchers, {id: this.$route.params.id});
+    },
+    getCandleConfig: () => {
+      return {
+        watch: {
+          exchange: 'poloniex',
+          currency: 'USDT',
+          asset: 'BTC'
+        },
+        daterange: {
+          from: '2016-05-22 11:22',
+          to: '2016-06-03 19:56'
+        },
+        adapter: 'sqlite',
+        sqlite: {
+          path: 'plugins/sqlite',
+
+          dataDirectory: 'history',
+          version: 0.1,
+
+          dependencies: [{
+            module: 'sqlite3',
+            version: '3.1.4'
+          }]
+        },
+        candleSize: 100
+      }
+    }
+  },
+  watch: {
+    data: function(val) {
+      console.log('watch data', val, this.candleFetch);
+      if(val && this.candleFetch !== 'fetched')
+        this.getCandles();
     }
   },
   methods: {
     humanizeDuration: (n) => window.humanizeDuration(n),
     moment: mom => moment.utc(mom),
-    fmt: mom => moment.utc(mom).format('YYYY-MM-DD HH:mm')
+    fmt: mom => moment.utc(mom).format('YYYY-MM-DD HH:mm'),
+    getCandles: function() {
+      console.log()
+
+      this.candleFetch = 'fetching';
+      post('getCandles', this.getCandleConfig, (err, res) => {
+        this.candleFetch = 'fetched';
+        console.log(err, res);
+      })
+    }
   }
 }
 </script>
diff --git a/web/vue/src/components/layout/header.vue b/web/vue/src/components/layout/header.vue
index a02f0bc0a..7555116b4 100644
--- a/web/vue/src/components/layout/header.vue
+++ b/web/vue/src/components/layout/header.vue
@@ -1,5 +1,6 @@
 <template lang='jade'>
   div
+    #top
     header.bg--off-white.grd
       .contain.grd-row
         h3.py1.px2.col-2 Gekko UI

From ea092c8ee3d440d4c2c965b2382aedf3cc81e38a Mon Sep 17 00:00:00 2001
From: Mike van Rossum <mike@mikevanrossum.nl>
Date: Sat, 3 Dec 2016 22:56:28 +0000
Subject: [PATCH 10/25] communicate candle data from child-process to frontend

---
 core/budfox/candleManager.js                  |  8 +++
 core/cp.js                                    | 31 +++++---
 web/routes/startGekko.js                      | 41 +++++------
 .../src/components/gekko/singleWatcher.vue    | 70 +++++++++++++------
 4 files changed, 99 insertions(+), 51 deletions(-)

diff --git a/core/budfox/candleManager.js b/core/budfox/candleManager.js
index b90cc692d..64f3f497a 100644
--- a/core/budfox/candleManager.js
+++ b/core/budfox/candleManager.js
@@ -10,6 +10,7 @@ var util = require(__dirname + '/../util');
 var dirs = util.dirs();
 var config = util.getConfig();
 var log = require(dirs.core + 'log');
+var cp = require(dirs.core + 'cp');
 
 var CandleCreator = require(dirs.budfox + 'candleCreator');
 
@@ -20,6 +21,10 @@ var Manager = function() {
 
   this.candleCreator
     .on('candles', this.relayCandles);
+
+  this.messageFirstCandle = _.once(candle => {
+    cp.firstCandle(candle);
+  })
 };
 
 util.makeEventEmitter(Manager);
@@ -29,6 +34,9 @@ Manager.prototype.processTrades = function(tradeBatch) {
 
 Manager.prototype.relayCandles = function(candles) {
   this.emit('candles', candles);
+
+  this.messageFirstCandle(_.first(candles));
+  cp.lastCandle(_.last(candles));
 }
 
 module.exports = Manager;
diff --git a/core/cp.js b/core/cp.js
index 0d12994db..260b4f496 100644
--- a/core/cp.js
+++ b/core/cp.js
@@ -1,5 +1,4 @@
-// functions that emit information
-// to the parent process.
+// functions that emit data to the parent process.
 //
 // noops if this gekko instance is not a child process!
 
@@ -11,13 +10,29 @@ var moment = require('moment');
 
 var ENV = util.gekkoEnv();
 
+var message = (type, payload) => {
+  payload.type = type;
+  process.send(payload);
+}
+
 var cp = {
-  message: (type, payload) => {
-    payload.type = type;
-    process.send(payload);
-  },
-  update: latest => cp.message('update', { latest }),
-  startAt: startAt => cp.message('startAt', { startAt }),
+  // string like: '2016-12-03T22:23:00.000Z'
+  update: latest => message('update', { latest }),
+  startAt: startAt => message('startAt', { startAt }),
+
+  // object like:
+  //
+  // { start: '2016-12-03T22:23:00.000Z',
+  //   open: 765,
+  //   high: 765,
+  //   low: 765,
+  //   close: 765,
+  //   vwp: 765,
+  //   volume: 0,
+  //   trades: 0
+  // }
+  lastCandle: lastCandle => message('lastCandle', { lastCandle }),
+  firstCandle: firstCandle => message('firstCandle', { firstCandle })
 }
 
 if(ENV !== 'child-process') {
diff --git a/web/routes/startGekko.js b/web/routes/startGekko.js
index dd95f032c..44d7c8196 100644
--- a/web/routes/startGekko.js
+++ b/web/routes/startGekko.js
@@ -46,30 +46,25 @@ module.exports = function *() {
     if(!event)
       return;
 
-    if(event.type === 'update' || event.type === 'startAt') {
-
-      let updates = {};
-
-      if(event.type === 'update') {
-        updates.latest = event.latest;
-      } else if(event.type === 'startAt') {
-        updates.startAt = event.startAt;
-      }
-
-      gekkoManager.update(id, updates);
-      // emit update over ws
-      let wsEvent = {
-        type: event.type,
-        gekko_id: id,
-        gekko_mode: mode,
-        emitter: 'gekko',
-        updates
-      }
-      broadcast(wsEvent);
-      return;
+    let updates = {};
+
+    if(event.type === 'update') {
+      updates.latest = event.latest;
+    } else
+      // all possible events can be found in
+      // @file gekko/core/cp.js
+      updates[event.type] = event[event.type];
+
+    gekkoManager.update(id, updates);
+    // emit update over ws
+    let wsEvent = {
+      type: event.type,
+      gekko_id: id,
+      gekko_mode: mode,
+      emitter: 'gekko',
+      updates
     }
-
-    // else we ignore (for now)
+    broadcast(wsEvent);
   });
 
   const now = moment.utc().format();
diff --git a/web/vue/src/components/gekko/singleWatcher.vue b/web/vue/src/components/gekko/singleWatcher.vue
index 80e18c41c..57897d984 100644
--- a/web/vue/src/components/gekko/singleWatcher.vue
+++ b/web/vue/src/components/gekko/singleWatcher.vue
@@ -28,8 +28,8 @@
           .grd-row-col-4-6 {{ humanizeDuration(moment(data.latest).diff(moment(data.startAt))) }}
         h3 Market graph
         spinner(v-if='candleFetch === "fetching"')
-        template(v-if='candleFetch === "fetched"')
-        p CHART!
+        template(v-if='candles.length')
+          p CHART!
 </template>
 
 <script>
@@ -37,6 +37,8 @@
 import { post } from '../../tools/ajax'
 import _ from 'lodash'
 import spinner from '../global/blockSpinner.vue'
+import Vue from 'vue'
+// global moment
 
 export default {
   components: {
@@ -44,7 +46,8 @@ export default {
   },
   data: () => {
     return {
-      candleFetch: 'idle'
+      candleFetch: 'idle',
+      candles: []
     }
   },
   computed: {
@@ -54,17 +57,8 @@ export default {
     data: function() {
       return _.find(this.watchers, {id: this.$route.params.id});
     },
-    getCandleConfig: () => {
+    baseCandleConfig: () => {
       return {
-        watch: {
-          exchange: 'poloniex',
-          currency: 'USDT',
-          asset: 'BTC'
-        },
-        daterange: {
-          from: '2016-05-22 11:22',
-          to: '2016-06-03 19:56'
-        },
         adapter: 'sqlite',
         sqlite: {
           path: 'plugins/sqlite',
@@ -76,15 +70,17 @@ export default {
             module: 'sqlite3',
             version: '3.1.4'
           }]
-        },
-        candleSize: 100
+        }
       }
     }
   },
   watch: {
     data: function(val) {
-      console.log('watch data', val, this.candleFetch);
-      if(val && this.candleFetch !== 'fetched')
+      if(
+        val &&
+        this.candleFetch !== 'fetched' &&
+        this.data.firstCandle
+      )
         this.getCandles();
     }
   },
@@ -93,12 +89,46 @@ export default {
     moment: mom => moment.utc(mom),
     fmt: mom => moment.utc(mom).format('YYYY-MM-DD HH:mm'),
     getCandles: function() {
-      console.log()
 
       this.candleFetch = 'fetching';
-      post('getCandles', this.getCandleConfig, (err, res) => {
+
+      console.log('last start', this.data.lastCandle.start);
+      console.log('first start', this.data.firstCandle.start)
+
+      // up unto we have data
+      let to = moment.utc(
+        this.data.lastCandle.start
+      ).format();
+
+      console.log('to', to);
+
+      // max 7 days of data
+      let from = Math.max(
+        moment.utc(this.data.firstCandle.start).subtract(7, 'days').unix(),
+        moment.utc(to).subtract(7, 'days').unix()
+      )
+
+      console.log('from1', from);
+
+      from = moment.unix(from).utc().format();
+
+      console.log('from2', from);
+
+      let config = Vue.util.extend(
+        {
+          watch: this.data.watch,
+          daterange: {
+            to, from
+          },
+          // hourly candles
+          candleSize: 60
+        },
+        this.baseCandleConfig
+      );
+
+      post('getCandles', config, (err, res) => {
         this.candleFetch = 'fetched';
-        console.log(err, res);
+        this.candles = res;
       })
     }
   }

From 288a47e47d51dfe1dfa6c4113846b57d66d9ff9a Mon Sep 17 00:00:00 2001
From: Mike van Rossum <mike@mikevanrossum.nl>
Date: Sat, 3 Dec 2016 23:03:59 +0000
Subject: [PATCH 11/25] use very simple backtest price chart in the
 singleWatcher

---
 core/tools/candleLoader.js                    |  8 +++-
 core/workers/loadCandles/parent.js            |  2 +
 .../src/components/gekko/singleWatcher.vue    | 37 +++++++++----------
 web/vue/src/store/modules/watchers/sync.js    |  2 +
 4 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/core/tools/candleLoader.js b/core/tools/candleLoader.js
index d1865661f..fd9c1a41b 100644
--- a/core/tools/candleLoader.js
+++ b/core/tools/candleLoader.js
@@ -1,3 +1,5 @@
+// TODO: properly handle a daterange for which no data is available.
+
 const batchSize = 1000;
 
 const _ = require('lodash');
@@ -55,6 +57,9 @@ module.exports = function(candleSize, _next) {
 }
 
 const getBatch = () => {
+  console.log('from', iterator.from.format(), iterator.from.unix())
+  console.log('to', iterator.to.format(), iterator.to.unix())
+
   reader.get(
     iterator.from.unix(),
     iterator.to.unix(),
@@ -76,13 +81,12 @@ const handleCandles = (err, data) => {
     util.die('Encountered an error..')
   }
 
-  if(_.last(data).start >= toUnix)
+  if(_.size(data) && _.last(data).start >= toUnix)
     DONE = true;
 
   batcher.write(data);
 
   if(DONE) {
-    console.log('reader closed!');
     reader.close();
   } else {
     shiftIterator();
diff --git a/core/workers/loadCandles/parent.js b/core/workers/loadCandles/parent.js
index c9f41b3e7..55d57940a 100644
--- a/core/workers/loadCandles/parent.js
+++ b/core/workers/loadCandles/parent.js
@@ -50,6 +50,8 @@ module.exports = (config, callback) => {
     if(m === 'ready')
       return child.send(message);
 
+    console.log('done?')
+
     // else we are done and have candles!
     done(null, m);
     child.kill('SIGINT');
diff --git a/web/vue/src/components/gekko/singleWatcher.vue b/web/vue/src/components/gekko/singleWatcher.vue
index 57897d984..2f90871e4 100644
--- a/web/vue/src/components/gekko/singleWatcher.vue
+++ b/web/vue/src/components/gekko/singleWatcher.vue
@@ -1,11 +1,11 @@
 <template lang='jade'>
-  div.contain.my2
-    div(v-if='!data')
+  div.my2
+    .contain(v-if='!data')
       h1 Unknown Watcher
       p Gekko doesn't know what whatcher this is...
     div(v-if='data')
-      h2 Market Watcher
-      .grd
+      h2.contain Market Watcher
+      .grd.contain
         h3 Market
         .grd-row
           .grd-row-col-2-6 Exchange
@@ -26,10 +26,10 @@
         .grd-row
           .grd-row-col-2-6 Data spanning
           .grd-row-col-4-6 {{ humanizeDuration(moment(data.latest).diff(moment(data.startAt))) }}
-        h3 Market graph
-        spinner(v-if='candleFetch === "fetching"')
-        template(v-if='candles.length')
-          p CHART!
+      h3.contain Market graph
+      spinner(v-if='candleFetch === "fetching"')
+      template(v-if='candles.length')
+        chart(:data='chartData')
 </template>
 
 <script>
@@ -38,11 +38,13 @@ import { post } from '../../tools/ajax'
 import _ from 'lodash'
 import spinner from '../global/blockSpinner.vue'
 import Vue from 'vue'
+import chart from '../backtester/result/chartWrapper.vue'
 // global moment
 
 export default {
   components: {
-    spinner
+    spinner,
+    chart
   },
   data: () => {
     return {
@@ -72,6 +74,12 @@ export default {
           }]
         }
       }
+    },
+    chartData: function() {
+      return {
+        candles: this.candles,
+        trades: []
+      }
     }
   },
   watch: {
@@ -92,28 +100,19 @@ export default {
 
       this.candleFetch = 'fetching';
 
-      console.log('last start', this.data.lastCandle.start);
-      console.log('first start', this.data.firstCandle.start)
-
       // up unto we have data
       let to = moment.utc(
         this.data.lastCandle.start
       ).format();
 
-      console.log('to', to);
-
       // max 7 days of data
       let from = Math.max(
         moment.utc(this.data.firstCandle.start).subtract(7, 'days').unix(),
         moment.utc(to).subtract(7, 'days').unix()
-      )
-
-      console.log('from1', from);
+      );
 
       from = moment.unix(from).utc().format();
 
-      console.log('from2', from);
-
       let config = Vue.util.extend(
         {
           watch: this.data.watch,
diff --git a/web/vue/src/store/modules/watchers/sync.js b/web/vue/src/store/modules/watchers/sync.js
index 4e8939f16..28fa9dcf8 100644
--- a/web/vue/src/store/modules/watchers/sync.js
+++ b/web/vue/src/store/modules/watchers/sync.js
@@ -25,6 +25,8 @@ const sync = () => {
 
   bus.$on('update', update);
   bus.$on('startAt', update);
+  bus.$on('lastCandle', update);
+  bus.$on('firstCandle', update);
 }
 
 export default function() {

From f53a9c018ff901d945afb0c15012e40d4d198985 Mon Sep 17 00:00:00 2001
From: Mike van Rossum <mike@mikevanrossum.nl>
Date: Sun, 4 Dec 2016 14:40:56 +0000
Subject: [PATCH 12/25] use candle data for marketwatcher statistics

---
 core/tools/candleLoader.js                    |  3 --
 core/workers/loadCandles/child.js             |  1 -
 core/workers/loadCandles/parent.js            |  3 --
 .../src/components/gekko/singleWatcher.vue    | 42 +++++++++++++++----
 4 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/core/tools/candleLoader.js b/core/tools/candleLoader.js
index fd9c1a41b..74d8e2203 100644
--- a/core/tools/candleLoader.js
+++ b/core/tools/candleLoader.js
@@ -57,9 +57,6 @@ module.exports = function(candleSize, _next) {
 }
 
 const getBatch = () => {
-  console.log('from', iterator.from.format(), iterator.from.unix())
-  console.log('to', iterator.to.format(), iterator.to.unix())
-
   reader.get(
     iterator.from.unix(),
     iterator.to.unix(),
diff --git a/core/workers/loadCandles/child.js b/core/workers/loadCandles/child.js
index 0fbf2cb2a..d1418db89 100644
--- a/core/workers/loadCandles/child.js
+++ b/core/workers/loadCandles/child.js
@@ -12,7 +12,6 @@ var start = (config, candleSize, daterange) => {
 
   var load = require(dirs.tools + 'candleLoader');
   load(config.candleSize, candles => {
-    console.log('LOAD CALLBACK!');
     process.send(candles);
   })
 }
diff --git a/core/workers/loadCandles/parent.js b/core/workers/loadCandles/parent.js
index 55d57940a..bb4f237e8 100644
--- a/core/workers/loadCandles/parent.js
+++ b/core/workers/loadCandles/parent.js
@@ -46,12 +46,9 @@ module.exports = (config, callback) => {
   const done = _.once(callback);
 
   child.on('message', function(m) {
-    console.log('GOT MESSAGE!')
     if(m === 'ready')
       return child.send(message);
 
-    console.log('done?')
-
     // else we are done and have candles!
     done(null, m);
     child.kill('SIGINT');
diff --git a/web/vue/src/components/gekko/singleWatcher.vue b/web/vue/src/components/gekko/singleWatcher.vue
index 2f90871e4..05f3adc5a 100644
--- a/web/vue/src/components/gekko/singleWatcher.vue
+++ b/web/vue/src/components/gekko/singleWatcher.vue
@@ -17,12 +17,12 @@
           .grd-row-col-2-6 Asset
           .grd-row-col-4-6 {{ data.watch.asset }}
         h3 Statistics
-        .grd-row
+        .grd-row(v-if='data.firstCandle')
           .grd-row-col-2-6 Watching since
-          .grd-row-col-4-6 {{ fmt(data.startAt) }}
-        .grd-row
+          .grd-row-col-4-6 {{ fmt(data.firstCandle.start) }}
+        .grd-row(v-if='data.lastCandle')
           .grd-row-col-2-6 Received data until
-          .grd-row-col-4-6 {{ fmt(data.latest) }}
+          .grd-row-col-4-6 {{ fmt(data.lastCandle.start) }}
         .grd-row
           .grd-row-col-2-6 Data spanning
           .grd-row-col-4-6 {{ humanizeDuration(moment(data.latest).diff(moment(data.startAt))) }}
@@ -42,6 +42,14 @@ import chart from '../backtester/result/chartWrapper.vue'
 // global moment
 
 export default {
+  created: function() {
+    if(
+      this.data &&
+      this.candleFetch !== 'fetched' &&
+      this.data.firstCandle
+    )
+      this.getCandles();
+  },
   components: {
     spinner,
     chart
@@ -90,6 +98,10 @@ export default {
         this.data.firstCandle
       )
         this.getCandles();
+    },
+    candles: function() {
+      console.log(moment.unix(_.first(this.candles).start).format())
+      console.log(moment.unix(_.last(this.candles).start).format())
     }
   },
   methods: {
@@ -103,15 +115,26 @@ export default {
       // up unto we have data
       let to = moment.utc(
         this.data.lastCandle.start
-      ).format();
+      ).unix();
 
       // max 7 days of data
       let from = Math.max(
-        moment.utc(this.data.firstCandle.start).subtract(7, 'days').unix(),
+        moment.utc(this.data.firstCandle.start).unix(),
         moment.utc(to).subtract(7, 'days').unix()
       );
 
+      const diff = to - from;
+      let candleSize = 60;
+      if(diff < 60 * 60 * 24) // a day
+        if(diff < 60 * 60 * 12) // 3 hours
+          candleSize = 1;
+        else
+          candleSize = 5;
+
+      console.log(diff, candleSize);
+
       from = moment.unix(from).utc().format();
+      to = moment.unix(to).utc().format();
 
       let config = Vue.util.extend(
         {
@@ -120,14 +143,17 @@ export default {
             to, from
           },
           // hourly candles
-          candleSize: 60
+          candleSize
         },
         this.baseCandleConfig
       );
 
       post('getCandles', config, (err, res) => {
         this.candleFetch = 'fetched';
-        this.candles = res;
+        this.candles = res.map(c => {
+          c.start = moment.unix(c.start).utc().format();
+          return c;
+        });
       })
     }
   }

From 33dd4b6b02b2668470a0c5d04104f47cec815667 Mon Sep 17 00:00:00 2001
From: Mike van Rossum <mike@mikevanrossum.nl>
Date: Sun, 4 Dec 2016 17:19:08 +0000
Subject: [PATCH 13/25] add init leech market

---
 core/markets/leech.js                    | 88 ++++++++++++++++++++++++
 core/pipeline.js                         | 10 ++-
 core/util.js                             |  5 +-
 plugins/tradingAdvisor/tradingAdvisor.js |  5 +-
 sample-config.js                         | 28 ++++++--
 5 files changed, 124 insertions(+), 12 deletions(-)
 create mode 100644 core/markets/leech.js

diff --git a/core/markets/leech.js b/core/markets/leech.js
new file mode 100644
index 000000000..2df5d7522
--- /dev/null
+++ b/core/markets/leech.js
@@ -0,0 +1,88 @@
+// a leech market is "semi-realtime" and pulls out candles of a
+// database (which is expected to be updated reguraly, like with a
+// realtime market running in parralel).
+
+const _ = require('lodash');
+const moment = require('moment');
+
+const util = require('../util');
+const dirs = util.dirs();
+const config = util.getConfig();
+
+const adapter = config[config.adapter];
+const Reader = require(dirs.gekko + adapter.path + '/reader');
+
+const TICKINTERVAL = 20 * 1000; // 20 seconds
+
+const exchanges = require(dirs.gekko + 'exchanges');
+const exchange = _.find(exchanges, function(e) {
+  return e.slug === config.watch.exchange.toLowerCase();
+});
+
+if(!exchange)
+  util.die(`Unsupported exchange: ${config.watch.exchange.toLowerCase()}`)
+
+const exchangeChecker = require(util.dirs().core + 'exchangeChecker');
+
+const error = exchangeChecker.cantMonitor(config.watch);
+if(error)
+  util.die(error, true);
+
+if(config.market.from)
+  const fromTs = moment.utc(config.market.from).unix();
+else
+  const fromTs = moment().startOf('minute').unix();
+
+var Market = function() {
+
+  _.bindAll(this);
+
+  Readable.call(this, {objectMode: true});
+
+  this.reader = new Reader();
+  this.latestTs = fromTs;
+
+  setInterval(
+    this.get,
+    TICKINTERVAL
+  );
+}
+
+var Readable = require('stream').Readable;
+Market.prototype = Object.create(Readable.prototype, {
+  constructor: { value: Market }
+});
+
+Market.prototype._read = _.once(function() {
+  this.get();
+});
+
+Market.prototype.get = function() {
+  var future = moment().add(1, 'minute').unix();
+
+  this.reader.get(
+    this.latestTs,
+    future,
+    'full',
+    this.processCandles
+  )
+}
+
+Market.prototype.processCandles = function(err, candles) {
+
+  var amount = _.size(candles);
+
+  if(amount === 0) {
+    // no new candles!
+    return;
+  }
+
+  _.each(candles, function(c, i) {
+    c.start = moment.unix(c.start).utc();
+    this.push(c);
+  }, this);
+
+  this.latestTs = _.last(candles).start + 1;
+}
+
+module.exports = Market;
diff --git a/core/pipeline.js b/core/pipeline.js
index 7d426e354..d3208d5b1 100644
--- a/core/pipeline.js
+++ b/core/pipeline.js
@@ -159,8 +159,14 @@ var pipeline = (settings) => {
       prepareMarket
     ],
     function() {
-      // load a market based on the mode
-      var Market = require(dirs.markets + mode);
+      // load a market based on the config (or fallback to mode)
+      let marketType;
+      if(config.market)
+        marketType = config.market.type;
+      else
+        marketType = mode;
+
+      var Market = require(dirs.markets + marketType);
 
       var market = new Market(config);
       var gekko = new GekkoStream(candleConsumers);
diff --git a/core/util.js b/core/util.js
index 53e28788f..9ab233511 100644
--- a/core/util.js
+++ b/core/util.js
@@ -20,11 +20,12 @@ var util = {
       return _config;
 
     if(program.config) {
+
       // we will use one single config file
-      if(!fs.existsSync(configFile))
+      if(!fs.existsSync(util.dirs().gekko + program.config))
         util.die('Cannot find the specified config file.');
 
-      _config = require(configFile);
+      _config = require(util.dirs().gekko + program.config);
       return _config;
     }
 
diff --git a/plugins/tradingAdvisor/tradingAdvisor.js b/plugins/tradingAdvisor/tradingAdvisor.js
index 23b1166b4..47b28ecf6 100644
--- a/plugins/tradingAdvisor/tradingAdvisor.js
+++ b/plugins/tradingAdvisor/tradingAdvisor.js
@@ -9,6 +9,7 @@ var log = require(dirs.core + 'log');
 var CandleBatcher = require(dirs.core + 'candleBatcher');
 
 var moment = require('moment');
+var isLeecher = config.market && config.market.type === 'leech';
 
 var Actor = function(done) {
   _.bindAll(this);
@@ -23,11 +24,11 @@ var Actor = function(done) {
 
   var mode = util.gekkoMode();
 
-  if(mode === 'realtime') {
+  if(mode === 'realtime' && !isLeecher) {
     var Stitcher = require(dirs.tools + 'dataStitcher');
     var stitcher = new Stitcher(this.batcher);
     stitcher.prepareHistoricalData(done);
-  } else if(mode === 'backtest')
+  } else
     done();
 }
 
diff --git a/sample-config.js b/sample-config.js
index c8dd5b771..e2701e089 100644
--- a/sample-config.js
+++ b/sample-config.js
@@ -17,8 +17,8 @@ config.debug = true; // for additional logging / debugging
 config.watch = {
 
   // see https://github.com/askmike/gekko#supported-exchanges
-  exchange: 'Bitstamp',
-  currency: 'USD',
+  exchange: 'Poloniex',
+  currency: 'USDT',
   asset: 'BTC'
 }
 
@@ -38,6 +38,22 @@ config.tradingAdvisor = {
   }
 }
 
+config.MACD = {
+  // EMA weight (α)
+  // the higher the weight, the more smooth (and delayed) the line
+  short: 10,
+  long: 21,
+  signal: 9,
+  // the difference between the EMAs (to act as triggers)
+  thresholds: {
+    down: -0.025,
+    up: 0.025,
+    // How many candle intervals should a trend persist
+    // before we consider it real?
+    persistence: 1
+  }
+};
+
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //                       CONFIGURING PLUGINS
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -53,7 +69,7 @@ config.trader = {
 }
 
 config.adviceLogger = {
-  enabled: true,
+  enabled: false,
   muteSoft: true // disable advice printout if it's soft
 }
 
@@ -161,12 +177,10 @@ config.redisBeacon = {
 }
 
 config.candleWriter = {
-  adapter: 'sqlite',
-  enabled: true
+  enabled: false
 }
 
 config.adviceWriter = {
-  adapter: 'mongodb',
   enabled: false,
   muteSoft: true,
 }
@@ -175,6 +189,8 @@ config.adviceWriter = {
 //                       CONFIGURING ADAPTER
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+config.adapter = 'sqlite';
+
 config.sqlite = {
   path: 'plugins/sqlite',
 

From e49d35e0f22f2cdbebe9f566c2a2ae1001279124 Mon Sep 17 00:00:00 2001
From: Mike van Rossum <mike@mikevanrossum.nl>
Date: Sun, 4 Dec 2016 19:55:54 +0000
Subject: [PATCH 14/25] handle standby, fix #514

---
 config/general.toml                      |  2 +-
 core/budfox/heart.js                     | 32 +++++++++++++++---------
 plugins/tradingAdvisor/tradingAdvisor.js |  4 +++
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/config/general.toml b/config/general.toml
index fa1696ad7..6da631f2c 100644
--- a/config/general.toml
+++ b/config/general.toml
@@ -1,4 +1,4 @@
-debug = false
+debug = true
 
 # what database should Gekko use?
 adapter = 'sqlite'
diff --git a/core/budfox/heart.js b/core/budfox/heart.js
index 2b5ad943b..12a3f594c 100644
--- a/core/budfox/heart.js
+++ b/core/budfox/heart.js
@@ -6,7 +6,14 @@ var log = require(util.dirs().core + 'log');
 var _ = require('lodash');
 var moment = require('moment');
 
+if(util.getConfig().watch.exchange === 'okcoin')
+  var TICKRATE = 2;
+else
+  var TICKRATE = 20;
+
 var Heart = function() {
+  this.lastTick = false;
+
   _.bindAll(this);
 }
 
@@ -18,22 +25,23 @@ Heart.prototype.pump = function() {
 }
 
 Heart.prototype.tick = function() {
+  if(this.lastTick) {
+    // make sure the last tick happened not to lang ago
+    // fixes #514
+    // @link https://github.com/askmike/gekko/issues/514
+    if(this.lastTick < moment().unix() - TICKRATE * 3)
+      util.die('Failed to tick in time, see https://github.com/askmike/gekko/issues/514 for details', true);
+  }
+
+  this.lastTick = moment().unix();
   this.emit('tick');
 }
 
-Heart.prototype.determineLiveTickRate = function() {
-  // TODO: fix
-  if(util.getConfig().watch.exchange === 'okcoin')
-    var seconds = 2;
-  else
-    var seconds = 20;
-
-  this.tickRate = +moment.duration(seconds, 's');
-}
-
 Heart.prototype.scheduleTicks = function() {
-  this.determineLiveTickRate();
-  setInterval(this.tick, this.tickRate);
+  setInterval(
+    this.tick,
+    +moment.duration(TICKRATE, 's')
+  );
 
   // start!
   _.defer(this.tick);
diff --git a/plugins/tradingAdvisor/tradingAdvisor.js b/plugins/tradingAdvisor/tradingAdvisor.js
index 47b28ecf6..fa17a216d 100644
--- a/plugins/tradingAdvisor/tradingAdvisor.js
+++ b/plugins/tradingAdvisor/tradingAdvisor.js
@@ -24,6 +24,10 @@ var Actor = function(done) {
 
   var mode = util.gekkoMode();
 
+  // the stitcher will try to pump in historical data
+  // so that the strat can use this data as a "warmup period"
+  //
+  // the realtime "leech" market won't use the stitcher
   if(mode === 'realtime' && !isLeecher) {
     var Stitcher = require(dirs.tools + 'dataStitcher');
     var stitcher = new Stitcher(this.batcher);

From 2857836e51d963aa2560a1b898ecd51060dd5f24 Mon Sep 17 00:00:00 2001
From: Mike van Rossum <mike@mikevanrossum.nl>
Date: Mon, 5 Dec 2016 17:16:48 +0000
Subject: [PATCH 15/25] dont mutate state in vuex store

---
 web/vue/src/store/modules/imports/mutations.js  | 10 ++++++++--
 web/vue/src/store/modules/watchers/mutations.js | 10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/web/vue/src/store/modules/imports/mutations.js b/web/vue/src/store/modules/imports/mutations.js
index 64f36aa6c..df837e7ba 100644
--- a/web/vue/src/store/modules/imports/mutations.js
+++ b/web/vue/src/store/modules/imports/mutations.js
@@ -1,3 +1,5 @@
+import Vue from 'vue'
+
 export const addImport = (state, imp) => {
   state.imports.push(imp);
   return state;
@@ -9,9 +11,13 @@ export const syncImports = (state, imports) => {
 }
 
 export const updateImport = (state, update) => {
-  let item = state.imports.find(i => i.id === update.import_id);
+  let index = state.imports.findIndex(i => i.id === update.import_id);
+  let item = state.imports[index];
   if(!item)
     return state;
-  _.merge(item, update.updates);
+
+  let updated = Vue.util.extend(item, update.updates);
+  Vue.set(state.imports, index, updated);
+
   return state;
 }
\ No newline at end of file
diff --git a/web/vue/src/store/modules/watchers/mutations.js b/web/vue/src/store/modules/watchers/mutations.js
index 6bad628e6..d836d11e1 100644
--- a/web/vue/src/store/modules/watchers/mutations.js
+++ b/web/vue/src/store/modules/watchers/mutations.js
@@ -1,3 +1,5 @@
+import Vue from 'vue'
+
 export const addWatcher = (state, watcher) => {
   state.watchers.push(watcher);
   return state;
@@ -9,9 +11,13 @@ export const syncWatchers = (state, watchers) => {
 }
 
 export const updateWatcher = (state, update) => {
-  let item = state.watchers.find(i => i.id === update.gekko_id);
+  let index = state.watchers.findIndex(i => i.id === update.gekko_id);
+  let item = state.watchers[index];
   if(!item)
     return state;
-  _.merge(item, update.updates);
+
+  let updated = Vue.util.extend(item, update.updates);
+  Vue.set(state.watchers, index, updated);
+
   return state;
 }
\ No newline at end of file

From 7ddee3574b4c90a7dd0c6970e51238f36aeb565f Mon Sep 17 00:00:00 2001
From: Mike van Rossum <mike@mikevanrossum.nl>
Date: Mon, 5 Dec 2016 17:17:25 +0000
Subject: [PATCH 16/25] redraw market chart on new data

---
 core/budfox/candleManager.js                  |  3 +++
 core/budfox/heart.js                          |  1 -
 web/routes/startGekko.js                      |  2 --
 .../src/components/gekko/singleWatcher.vue    | 23 +++++++++----------
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/core/budfox/candleManager.js b/core/budfox/candleManager.js
index 64f3f497a..a37801f45 100644
--- a/core/budfox/candleManager.js
+++ b/core/budfox/candleManager.js
@@ -35,6 +35,9 @@ Manager.prototype.processTrades = function(tradeBatch) {
 Manager.prototype.relayCandles = function(candles) {
   this.emit('candles', candles);
 
+  if(!_.size(candles))
+    return;
+
   this.messageFirstCandle(_.first(candles));
   cp.lastCandle(_.last(candles));
 }
diff --git a/core/budfox/heart.js b/core/budfox/heart.js
index 12a3f594c..ecdb9c30f 100644
--- a/core/budfox/heart.js
+++ b/core/budfox/heart.js
@@ -27,7 +27,6 @@ Heart.prototype.pump = function() {
 Heart.prototype.tick = function() {
   if(this.lastTick) {
     // make sure the last tick happened not to lang ago
-    // fixes #514
     // @link https://github.com/askmike/gekko/issues/514
     if(this.lastTick < moment().unix() - TICKRATE * 3)
       util.die('Failed to tick in time, see https://github.com/askmike/gekko/issues/514 for details', true);
diff --git a/web/routes/startGekko.js b/web/routes/startGekko.js
index 44d7c8196..d0fc607c8 100644
--- a/web/routes/startGekko.js
+++ b/web/routes/startGekko.js
@@ -26,8 +26,6 @@ module.exports = function *() {
 
   pipelineRunner(mode, config, (err, event) => {
 
-    console.log('EVENT', err, event);
-
     if(err) {
       if(errored)
         return;
diff --git a/web/vue/src/components/gekko/singleWatcher.vue b/web/vue/src/components/gekko/singleWatcher.vue
index 05f3adc5a..e06e2eada 100644
--- a/web/vue/src/components/gekko/singleWatcher.vue
+++ b/web/vue/src/components/gekko/singleWatcher.vue
@@ -91,17 +91,17 @@ export default {
     }
   },
   watch: {
-    data: function(val) {
-      if(
-        val &&
-        this.candleFetch !== 'fetched' &&
-        this.data.firstCandle
-      )
-        this.getCandles();
+    'data.lastCandle.start': function() {
+      this.candleFetch = 'dirty';
     },
-    candles: function() {
-      console.log(moment.unix(_.first(this.candles).start).format())
-      console.log(moment.unix(_.last(this.candles).start).format())
+    data: function(val, prev) {
+      let complete = val && val.firstCandle && val.lastCandle;
+
+      if(!complete)
+        return;
+
+      if(this.candleFetch !== 'fetched' )
+        this.getCandles();
     }
   },
   methods: {
@@ -123,6 +123,7 @@ export default {
         moment.utc(to).subtract(7, 'days').unix()
       );
 
+      // TODO...
       const diff = to - from;
       let candleSize = 60;
       if(diff < 60 * 60 * 24) // a day
@@ -131,8 +132,6 @@ export default {
         else
           candleSize = 5;
 
-      console.log(diff, candleSize);
-
       from = moment.unix(from).utc().format();
       to = moment.unix(to).utc().format();
 

From 5b65760850e16615a97c6f08b17e54061cbba6af Mon Sep 17 00:00:00 2001
From: Mike van Rossum <mike@mikevanrossum.nl>
Date: Mon, 5 Dec 2016 17:19:57 +0000
Subject: [PATCH 17/25] base market time on candle dates

---
 web/vue/src/components/gekko/singleWatcher.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/vue/src/components/gekko/singleWatcher.vue b/web/vue/src/components/gekko/singleWatcher.vue
index e06e2eada..f8b160318 100644
--- a/web/vue/src/components/gekko/singleWatcher.vue
+++ b/web/vue/src/components/gekko/singleWatcher.vue
@@ -23,9 +23,9 @@
         .grd-row(v-if='data.lastCandle')
           .grd-row-col-2-6 Received data until
           .grd-row-col-4-6 {{ fmt(data.lastCandle.start) }}
-        .grd-row
+        .grd-row(v-if='data.lastCandle && data.firstCandle')
           .grd-row-col-2-6 Data spanning
-          .grd-row-col-4-6 {{ humanizeDuration(moment(data.latest).diff(moment(data.startAt))) }}
+          .grd-row-col-4-6 {{ humanizeDuration(moment(data.lastCandle.start).diff(moment(data.firstCandle.start))) }}
       h3.contain Market graph
       spinner(v-if='candleFetch === "fetching"')
       template(v-if='candles.length')

From 5b315ab5ccaa6e2f6989d8bb9db4dad56a0f6fbf Mon Sep 17 00:00:00 2001
From: Mike van Rossum <mike@mikevanrossum.nl>
Date: Mon, 5 Dec 2016 19:40:39 +0000
Subject: [PATCH 18/25] remove sqlite WAL, (kinda) fixes #437

---
 plugins/sqlite/handle.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/plugins/sqlite/handle.js b/plugins/sqlite/handle.js
index 78b374030..08c0e7665 100644
--- a/plugins/sqlite/handle.js
+++ b/plugins/sqlite/handle.js
@@ -50,8 +50,5 @@ if(mode === 'realtime' || mode === 'importer') {
 }
 
 var db = new sqlite3.Database(fullPath);
-// enable WAL mode to enable concurrent reads and writes
-// http://sqlite.org/wal.html
-db.run("PRAGMA journal_mode = WAL")
 
 module.exports = db;
\ No newline at end of file

From b0280f09d854d6229865c8a85792815e84e4a38a Mon Sep 17 00:00:00 2001
From: Mike van Rossum <mike@mikevanrossum.nl>
Date: Tue, 6 Dec 2016 00:29:01 +0000
Subject: [PATCH 19/25] create live Gekko -> spawn leecher

---
 core/markets/leech.js                |  9 ++++----
 plugins/sqlite/handle.js             |  2 ++
 web/vue/src/components/gekko/new.vue | 34 ++++++++++++++++++++++++++--
 3 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/core/markets/leech.js b/core/markets/leech.js
index 2df5d7522..5998e25c7 100644
--- a/core/markets/leech.js
+++ b/core/markets/leech.js
@@ -29,9 +29,10 @@ if(error)
   util.die(error, true);
 
 if(config.market.from)
-  const fromTs = moment.utc(config.market.from).unix();
+  var fromTs = moment.utc(config.market.from).unix();
 else
-  const fromTs = moment().startOf('minute').unix();
+  var fromTs = moment().startOf('minute').unix();
+
 
 var Market = function() {
 
@@ -69,9 +70,7 @@ Market.prototype.get = function() {
 }
 
 Market.prototype.processCandles = function(err, candles) {
-
   var amount = _.size(candles);
-
   if(amount === 0) {
     // no new candles!
     return;
@@ -82,7 +81,7 @@ Market.prototype.processCandles = function(err, candles) {
     this.push(c);
   }, this);
 
-  this.latestTs = _.last(candles).start + 1;
+  this.latestTs = moment(_.last(candles).start).unix() + 1;
 }
 
 module.exports = Market;
diff --git a/plugins/sqlite/handle.js b/plugins/sqlite/handle.js
index 08c0e7665..a9e2f61b7 100644
--- a/plugins/sqlite/handle.js
+++ b/plugins/sqlite/handle.js
@@ -50,5 +50,7 @@ if(mode === 'realtime' || mode === 'importer') {
 }
 
 var db = new sqlite3.Database(fullPath);
+db.run("PRAGMA journal_mode = WAL");
+
 
 module.exports = db;
\ No newline at end of file
diff --git a/web/vue/src/components/gekko/new.vue b/web/vue/src/components/gekko/new.vue
index 5d772c333..5e9389895 100644
--- a/web/vue/src/components/gekko/new.vue
+++ b/web/vue/src/components/gekko/new.vue
@@ -33,9 +33,39 @@ export default {
       watchConfig.mode = 'realtime';
       return watchConfig;
     },
+    requiredHistoricalData: function() {
+      if(!this.config.tradingAdvisor || !this.config.valid)
+        return;
+
+      let stratSettings = this.config.tradingAdvisor;
+      return stratSettings.candleSize * stratSettings.historySize;
+    },
     gekkoConfig: function() {
-      let gekkoConfig = Vue.util.extend({}, this.config);
-      gekkoConfig.mode = 'leech';
+      var startAt;
+
+      if(!this.existingMarketWatcher || !this.requiredHistoricalData)
+        startAt = moment().utc().startOf('minute').format();
+      else {
+        // TODO: figure out whether we can stitch data
+        // without looking at the existing watcher
+        let optimal = moment().utc().startOf('minute')
+          .subtract(this.requiredHistoricalData, 'minutes')
+          .unix();
+
+        let available = moment
+          .utc(this.existingMarketWatcher.firstCandle.start)
+          .unix();
+
+        startAt = moment.unix(Math.max(optimal, available)).utc().format();
+      }
+
+      let gekkoConfig = Vue.util.extend({
+        market: {
+          type: 'leech',
+          from: startAt
+        },
+        mode: 'realtime'
+      }, this.config);
       return gekkoConfig;
     },
     existingMarketWatcher: function() {

From 47fef951a109a6bafa37e2c0c03316bf44171537 Mon Sep 17 00:00:00 2001
From: Mike van Rossum <mike@mikevanrossum.nl>
Date: Fri, 9 Dec 2016 13:45:27 +0000
Subject: [PATCH 20/25] relay candle messages when leeching

---
 core/markets/leech.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/core/markets/leech.js b/core/markets/leech.js
index 5998e25c7..fc90ab32f 100644
--- a/core/markets/leech.js
+++ b/core/markets/leech.js
@@ -9,6 +9,8 @@ const util = require('../util');
 const dirs = util.dirs();
 const config = util.getConfig();
 
+const cp = require(dirs.core + 'cp');
+
 const adapter = config[config.adapter];
 const Reader = require(dirs.gekko + adapter.path + '/reader');
 
@@ -81,7 +83,14 @@ Market.prototype.processCandles = function(err, candles) {
     this.push(c);
   }, this);
 
-  this.latestTs = moment(_.last(candles).start).unix() + 1;
+  this.sendStartAt(_.first(candles));
+  cp.lastCandle(_.last(candles));
+
+  this.latestTs = _.last(candles).start.unix() + 1;
 }
 
+Market.prototype.sendStartAt = _.once(function(candle) {
+  cp.firstCandle(candle);
+});
+
 module.exports = Market;

From d0a4195cc468d95769f0aede32098d0cfeb37015 Mon Sep 17 00:00:00 2001
From: Mike van Rossum <mike@mikevanrossum.nl>
Date: Fri, 9 Dec 2016 13:46:42 +0000
Subject: [PATCH 21/25] use cp to relay trade messags

---
 core/cp.js                 | 15 ++++++++++--
 plugins/profitSimulator.js | 48 ++++++++++++++++++++------------------
 2 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/core/cp.js b/core/cp.js
index 260b4f496..f0ccc7e57 100644
--- a/core/cp.js
+++ b/core/cp.js
@@ -22,7 +22,8 @@ var cp = {
 
   // object like:
   //
-  // { start: '2016-12-03T22:23:00.000Z',
+  // {
+  //   start: '2016-12-03T22:23:00.000Z',
   //   open: 765,
   //   high: 765,
   //   low: 765,
@@ -32,7 +33,17 @@ var cp = {
   //   trades: 0
   // }
   lastCandle: lastCandle => message('lastCandle', { lastCandle }),
-  firstCandle: firstCandle => message('firstCandle', { firstCandle })
+  firstCandle: firstCandle => message('firstCandle', { firstCandle }),
+
+  // object like:
+  //
+  // {
+  //   action: 'sell',
+  //   price: 765,
+  //   date: '2016-12-03T22:23:00.000Z',
+  //   balance: 4242
+  // }
+  trade: trade => message('trade', { trade }),
 }
 
 if(ENV !== 'child-process') {
diff --git a/plugins/profitSimulator.js b/plugins/profitSimulator.js
index 3362a7aa7..23739fb08 100644
--- a/plugins/profitSimulator.js
+++ b/plugins/profitSimulator.js
@@ -1,8 +1,11 @@
-var util = require('../core/util.js');
 var _ = require('lodash');
-var log = require('../core/log.js');
 var moment = require('moment');
 
+var util = require('../core/util.js');
+var dirs = util.dirs();
+var log = require(dirs.core + 'log');
+var cp = require(dirs.core + 'cp');
+
 var mode = util.gekkoMode();
 
 var config = util.getConfig();
@@ -11,6 +14,7 @@ var watchConfig = config.watch;
 
 var ENV = util.gekkoEnv();
 
+
 var Logger = function() {
   _.bindAll(this);
 
@@ -123,28 +127,26 @@ Logger.prototype.jsonReport = function(advice) {
   var price = advice.candle.close;
   var at = advice.candle.start;
 
-  if(what === 'short')
-    process.send({
-      type: 'trade',
-      trade: {
-        action: 'sell',
-        price: price,
-        date: at,
-        balance: this.current.currency
-      }
-    });
-
-  else if(what === 'long')
-    process.send({
-      type: 'trade',
-      trade: {
-        action: 'buy',
-        price: price,
-        date: at,
-        balance: this.current.asset * price
-      }
-    });
+  if(what !== 'short' || what !== 'long')
+    return;
 
+  var payload;
+  if(what === 'short')
+    payload = {
+      action: 'sell',
+      price: price,
+      date: at,
+      balance: this.current.currency
+    }
+  else
+    payload = {
+      action: 'buy',
+      price: price,
+      date: at,
+      balance: this.current.asset * price
+    }
+  
+  cp.trade(payload);
 }
 
 Logger.prototype.summarizedReport = function(advice) {

From a18f6808aa27214c0ff0bd4b32adbd9cff4a4f3a Mon Sep 17 00:00:00 2001
From: Mike van Rossum <mike@mikevanrossum.nl>
Date: Fri, 9 Dec 2016 13:47:38 +0000
Subject: [PATCH 22/25] init strat runner

---
 web/routes/startGekko.js                      |  23 ++-
 web/vue/src/App.vue                           |   5 +-
 .../backtester/result/chartWrapper.vue        |  30 +++-
 .../components/backtester/result/summary.vue  |  40 +----
 web/vue/src/components/gekko/list.vue         |  36 ++--
 web/vue/src/components/gekko/new.vue          |  53 ++++--
 web/vue/src/components/gekko/singleGekko.vue  |  75 --------
 .../components/gekko/singleStratrunner.vue    | 169 ++++++++++++++++++
 .../src/components/gekko/singleWatcher.vue    |  47 +++--
 .../components/global/paperTradeSummary.vue   |  60 +++++++
 web/vue/src/components/layout/modal.vue       |  82 +++++++++
 web/vue/src/d3/message.js                     |  11 ++
 web/vue/src/main.js                           |   4 +-
 web/vue/src/store/index.js                    |   2 +
 web/vue/src/store/init.js                     |   3 +
 .../src/store/modules/messages/mutations.js   |   0
 .../store/modules/stratrunners/mutations.js   |  12 +-
 .../src/store/modules/stratrunners/sync.js    |  20 ++-
 web/vue/src/store/modules/watchers/sync.js    |   8 +-
 19 files changed, 504 insertions(+), 176 deletions(-)
 delete mode 100644 web/vue/src/components/gekko/singleGekko.vue
 create mode 100644 web/vue/src/components/gekko/singleStratrunner.vue
 create mode 100644 web/vue/src/components/global/paperTradeSummary.vue
 create mode 100644 web/vue/src/components/layout/modal.vue
 create mode 100644 web/vue/src/d3/message.js
 create mode 100644 web/vue/src/store/modules/messages/mutations.js

diff --git a/web/routes/startGekko.js b/web/routes/startGekko.js
index d0fc607c8..bd50478b4 100644
--- a/web/routes/startGekko.js
+++ b/web/routes/startGekko.js
@@ -18,6 +18,15 @@ module.exports = function *() {
 
   _.merge(config, base, this.request.body);
 
+  if(mode === 'realtime') {
+    if(config.market && config.market.type)
+      var type = config.market.type;
+    else
+      var type = 'watcher';
+  } else {
+    var type = '';
+  }
+
   const id = (Math.random() + '').slice(3);
 
   let errored = false;
@@ -59,6 +68,7 @@ module.exports = function *() {
       type: event.type,
       gekko_id: id,
       gekko_mode: mode,
+      gekko_type: type,
       emitter: 'gekko',
       updates
     }
@@ -67,12 +77,21 @@ module.exports = function *() {
 
   const now = moment.utc().format();
 
-  const gekko = {
+  var gekko = {
     watch: config.watch,
     id,
     startAt: '',
     latest: '',
-    mode
+    mode,
+    type
+  }
+
+  if(config.tradingAdvisor && config.tradingAdvisor.enabled) {
+    gekko.strat = {
+      name: config.tradingAdvisor.method,
+      tradingAdvisor: config.tradingAdvisor,
+      params: config[ config.tradingAdvisor.method ]
+    }
   }
 
   gekkoManager.add(gekko);
diff --git a/web/vue/src/App.vue b/web/vue/src/App.vue
index 50870ef45..9141f7bf0 100644
--- a/web/vue/src/App.vue
+++ b/web/vue/src/App.vue
@@ -2,12 +2,14 @@
 
 import top from './components/layout/header.vue'
 import bottom from './components/layout/footer.vue'
+import modal from './components/layout/modal.vue'
 
 export default {
   name: 'app',
   components: {
     top,
-    bottom
+    bottom,
+    modal
   }
 }
 </script>
@@ -18,6 +20,7 @@ export default {
     .fill
       router-view.view
     bottom
+    modal
 </template>
 
 <style>
diff --git a/web/vue/src/components/backtester/result/chartWrapper.vue b/web/vue/src/components/backtester/result/chartWrapper.vue
index a645fd699..2e51feedc 100644
--- a/web/vue/src/components/backtester/result/chartWrapper.vue
+++ b/web/vue/src/components/backtester/result/chartWrapper.vue
@@ -7,15 +7,26 @@ div
 <script>
 
 import chart from '../../../d3/chart4'
+import { draw, clear } from '../../../d3/message'
+
+const MIN_CANDLES = 4;
 
 export default {
   props: ['data'],
   data: () => {
-    return {}
+    return {
+      message: false
+    }
   },
 
   watch: {
-    data: function() { this.render() }
+    data: function() { this.render() },
+    message: function(val) {
+      if(this.message)
+        draw(this.message)
+      else
+        clear();
+    }
   },
 
   created: function() { setTimeout( this.render, 100) },
@@ -27,19 +38,28 @@ export default {
     render: function() {
       this.remove();
 
-      chart(this.data.candles, this.data.trades);
+      if(_.size(this.data.candles) < MIN_CANDLES) {
+        this.message = 'Not enough data to spawn chart';
+      }
+      else {
+        this.message = false;
+        chart(this.data.candles, this.data.trades);
+      }
     },
     remove: function() {
       d3.select('#chart').html('');
     }
-  },
-  components: {
   }
 }
 </script>
 
 <style>
 
+#chart {
+  background-color: #eee;
+  width: 100%;
+}
+
 #chart circle {
   clip-path: url(#clip);
 }
diff --git a/web/vue/src/components/backtester/result/summary.vue b/web/vue/src/components/backtester/result/summary.vue
index 83868e2e5..93bc80200 100644
--- a/web/vue/src/components/backtester/result/summary.vue
+++ b/web/vue/src/components/backtester/result/summary.vue
@@ -23,35 +23,26 @@ div.contain
           th buy and hold profit
           td {{ round(report.buynhold) }}%
 
-    .grd-row-col-3-6
-      table.p1
-        tr
-          th amount of trades
-          td {{ report.trades }}
-        tr
-          th start balance
-          td {{ round(report.startBalance) }} {{ report.currency }}
-        tr
-          th final balance
-          td {{ round(report.balance) }} {{ report.currency }}
-        tr
-          th simulated profit
-
-      .big.txt--right.price(:class='profitClass') {{ round(report.relativeProfit) }}%
+    paperTradeSummary(:report='report')
 
 </template>
 
 <script>
 
+import paperTradeSummary from '../../global/paperTradeSummary.vue'
+
 export default {
   props: ['report'],
+  components: {
+    paperTradeSummary
+  },
   methods: {
     round: n => (+n).toFixed(5)
   },
   computed: {
     profitClass: function() {
       if(this.report.relativeProfit > 0)
-        return 'profit';
+        return 'profit'
       else
         return 'loss'
     }
@@ -64,21 +55,4 @@ export default {
   text-align: right;
 }
 
-.big {
-  font-size: 1.7em;
-  width: 80%;
-}
-
-.summary table {
-  width: 80%;
-}
-
-.price.profit {
-  color: #7FFF00;
-}
-
-.price.loss {
-  color: red;
-}
-
 </style>
diff --git a/web/vue/src/components/gekko/list.vue b/web/vue/src/components/gekko/list.vue
index 9f4abfef0..c5488de06 100644
--- a/web/vue/src/components/gekko/list.vue
+++ b/web/vue/src/components/gekko/list.vue
@@ -19,9 +19,12 @@
           td {{ gekko.watch.exchange }}
           td {{ gekko.watch.currency }}
           td {{ gekko.watch.asset }}
-          td {{ fmt(gekko.startAt) }}
-          td {{ fmt(gekko.latest) }}
-          td {{ humanizeDuration(moment(gekko.latest).diff(moment(gekko.startAt))) }}
+          td 
+            template(v-if='gekko.firstCandle') {{ fmt(gekko.firstCandle.start) }}
+          td
+            template(v-if='gekko.lastCandle') {{ fmt(gekko.lastCandle.start) }}
+          td
+            template(v-if='gekko.firstCandle && gekko.lastCandle') {{ timespan(gekko.lastCandle.start, gekko.firstCandle.start) }}
     .hr
     h3 Strat runners
     .text(v-if='!stratrunners.length')
@@ -32,19 +35,21 @@
           th exchange
           th currency
           th asset
-          th started at
-          th last update
           th duration
-          th type
+          th last update
+          th strategy
+          th profit
       tbody
-        tr.clickable(v-for='gekko in gekkos', v-on:click='$router.push({path: `live-gekkos/gekko/${gekko.id}`})')
+        tr.clickable(v-for='gekko in stratrunners', v-on:click='$router.push({path: `live-gekkos/stratrunner/${gekko.id}`})')
           td {{ gekko.watch.exchange }}
           td {{ gekko.watch.currency }}
           td {{ gekko.watch.asset }}
-          td {{ fmt(gekko.startAt) }}
-          td {{ fmt(gekko.latest) }}
-          td {{ humanizeDuration(gekko.latest.diff(gekko.startAt)) }}
-          td {{ gekko.type }}
+          td
+            template(v-if='gekko.firstCandle && gekko.lastCandle') {{ timespan(gekko.lastCandle.start, gekko.firstCandle.start) }}
+          td
+            template(v-if='gekko.lastCandle') {{ timespan(moment(), gekko.lastCandle.start) }}
+          td {{ gekko.strat.name }}
+          td TODO!
     .hr
     h2 Start a new live Gekko
     router-link(to='/live-gekkos/new') start a new live Gekko!
@@ -52,7 +57,7 @@
 
 <script>
 
-import marked from '../../tools/marked';
+import marked from '../../tools/marked'
 // global moment
 // global humanizeDuration
 
@@ -74,7 +79,7 @@ For this you run a live gekko, which consists of two parts:
 export default {
   data: () => {
     return {
-      text,
+      text
     }
   },
   computed: {
@@ -88,7 +93,10 @@ export default {
   methods: {
     humanizeDuration: (n) => window.humanizeDuration(n),
     moment: mom => moment.utc(mom),
-    fmt: mom => moment.utc(mom).format('YYYY-MM-DD HH:mm')
+    fmt: mom => moment.utc(mom).format('YYYY-MM-DD HH:mm'),
+    timespan: function(a, b) {
+      return this.humanizeDuration(this.moment(a).diff(this.moment(b)))
+    }
   }
 }
 </script>
diff --git a/web/vue/src/components/gekko/new.vue b/web/vue/src/components/gekko/new.vue
index 5e9389895..439c67624 100644
--- a/web/vue/src/components/gekko/new.vue
+++ b/web/vue/src/components/gekko/new.vue
@@ -9,6 +9,7 @@
 
 <script>
 
+import _ from 'lodash'
 import Vue from 'vue'
 import { post } from '../../tools/ajax'
 import gekkoConfigBuilder from './gekkoConfigBuilder.vue'
@@ -19,6 +20,7 @@ export default {
   },
   data: () => {
     return {
+      pendingStratrunner: false,
       config: {}
     }
   },
@@ -43,7 +45,10 @@ export default {
     gekkoConfig: function() {
       var startAt;
 
-      if(!this.existingMarketWatcher || !this.requiredHistoricalData)
+      if(!this.existingMarketWatcher)
+        return;
+
+      if(!this.requiredHistoricalData)
         startAt = moment().utc().startOf('minute').format();
       else {
         // TODO: figure out whether we can stitch data
@@ -73,6 +78,23 @@ export default {
       return _.find(this.watchers, {watch: market});
     }
   },
+  watch: {
+    // start the stratrunner
+    existingMarketWatcher: function(val, prev) {
+      if(!this.pendingStratrunner)
+        return;
+
+      if(val && val.firstCandle && val.lastCandle) {
+        this.pendingStratrunner = false;
+
+        this.startGekko((err, resp) => {
+          this.$router.push({
+            path: `/live-gekkos/stratrunner/${resp.id}`
+          });
+        });
+      }
+    }
+  },
   methods: {
     updateConfig: function(config) {
       this.config = config;
@@ -103,22 +125,29 @@ export default {
 
       } else {
 
-        // defer until watcher is done
-        let startGekko = () => {
-          this.startGekko(function(error, resp) {
-            console.log('ROUTING TO GEKKO');
-          });
-        }
-
-        if(!this.existingMarketWatcher) {
+        if(this.existingMarketWatcher) {
+          // the specified market is already being watched,
+          // just start a gekko!
+          startGekko(this.routeToGekko);
+          
+        } else {
           // the specified market is not yet being watched,
           // we need to create a watcher
-          this.startWatcher(startGekko);
-        } else {
-          startGekko();
+          this.startWatcher((err, resp) => {
+            this.pendingStratrunner = true;
+            // now we just wait for 
+          });
         }
       }
     },
+    routeToGekko: function(err, resp) {
+      if(err || resp.error)
+        return console.error(err, resp.error);
+
+      this.$router.push({
+        path: `/live-gekkos/stratrunner/${resp.id}`
+      });
+    },
     startWatcher: function(next) {
       post('startGekko', this.watchConfig, next);
     },
diff --git a/web/vue/src/components/gekko/singleGekko.vue b/web/vue/src/components/gekko/singleGekko.vue
deleted file mode 100644
index 0846cf345..000000000
--- a/web/vue/src/components/gekko/singleGekko.vue
+++ /dev/null
@@ -1,75 +0,0 @@
-<template lang='jade'>
-  div.contain.my2
-    div(v-if='error')
-      h1 Error
-      p {{ error }}
-    div(v-if='data && !error')
-      h2 Running Gekko!
-      p {{ data }}
-      p Market: {{ data.watch.exchange }}:{{ data.watch.currency }}/{{ data.watch.asset }}
-      .grd
-        .grd-row
-          .grd-row-col-2-6 Since:
-          .grd-row-col-4-6 {{ fmt(since) }}
-        .grd-row
-          .grd-row-col-2-6 Received data until:
-          .grd-row-col-4-6 {{ fmt(latest) }}
-</template>
-
-<script>
-
-import spinner from '../global/blockSpinner.vue'
-import { bus as ws } from '../global/ws'
-import { get } from '../../tools/ajax'
-
-export default {
-  created: function() {
-    get('liveGekkos', (error, response) => {
-      this.data = _.find(response, {id: this.$route.params.id});
-      if(!this.data)
-        this.error = 'Not sure what Gekko this is..'
-    });
-
-    ws.$on('update', data => {
-      if(data.gekko_id !== this.$route.params.id)
-        return;
-
-      this.handleWsMessage(data)
-    });
-
-    ws.$on('import_error', data => {
-      if(data.import_id === this.$route.params.id)
-        this.$router.push({path: '/import'});
-    });
-  },
-  data: () => {
-    return {
-      error: false,
-      data: false
-    }
-  },
-  computed: {
-    latest: function() {
-      if(this.data)
-        return this.mom(this.data.latest);
-    },
-    since: function() {
-      if(this.data)
-        return this.mom(this.data.startAt)
-    }
-  },
-  methods: {
-    handleWsMessage: function(event) {
-      if(event.type === 'update')
-        this.data.latest = moment.utc(event.latest);
-      else if(event.type === 'startAt')
-        this.data.since = moment.utc(event.startAt);
-    },
-    fmt: mom => { return mom.format('YYYY-MM-DD HH:mm:ss') },
-    mom: str => moment.utc(str)
-  }
-}
-</script>
-
-<style>
-</style>
diff --git a/web/vue/src/components/gekko/singleStratrunner.vue b/web/vue/src/components/gekko/singleStratrunner.vue
new file mode 100644
index 000000000..03bdcd236
--- /dev/null
+++ b/web/vue/src/components/gekko/singleStratrunner.vue
@@ -0,0 +1,169 @@
+<template lang='jade'>
+  div.my2
+    .contain(v-if='!data')
+      h1 Unknown Strat runner
+      p Gekko doesn't know what strat runner this is...
+    div(v-if='data')
+      h2.contain Strat runner
+      .grd.contain
+        h3 Market
+        .grd-row
+          .grd-row-col-2-6 Exchange
+          .grd-row-col-4-6 {{ data.watch.exchange }}
+        .grd-row
+          .grd-row-col-2-6 Currency
+          .grd-row-col-4-6 {{ data.watch.currency }}
+        .grd-row
+          .grd-row-col-2-6 Asset
+          .grd-row-col-4-6 {{ data.watch.asset }}
+        p(v-if='watcher')
+          em This strat runner gets data from 
+            router-link(:to='"/live-gekkos/watcher/" + watcher.id') this market watcher
+          | .
+        h3 Statistics
+        spinner(v-if='isLoading')
+        template(v-if='!isLoading')
+          .grd-row(v-if='data.firstCandle')
+            .grd-row-col-2-6 Watching since
+            .grd-row-col-4-6 {{ fmt(data.firstCandle.start) }}
+          .grd-row(v-if='data.lastCandle')
+            .grd-row-col-2-6 Received data until
+            .grd-row-col-4-6 {{ fmt(data.lastCandle.start) }}
+          .grd-row(v-if='data.lastCandle && data.firstCandle')
+            .grd-row-col-2-6 Data spanning
+            .grd-row-col-4-6 {{ humanizeDuration(moment(data.lastCandle.start).diff(moment(data.firstCandle.start))) }}
+          .grd-row.summary
+            // paperTradeSummary(:report='report')
+      template(v-if='!isLoading')
+        h3.contain Market graph
+        spinner(v-if='candleFetch === "fetching"')
+        template(v-if='candles.length')
+          chart(:data='chartData')
+</template>
+
+<script>
+
+import Vue from 'vue'
+import _ from 'lodash'
+
+import { post } from '../../tools/ajax'
+import spinner from '../global/blockSpinner.vue'
+import chart from '../backtester/result/chartWrapper.vue'
+import paperTradeSummary from '../global/paperTradeSummary.vue'
+// global moment
+
+export default {
+  created: function() {
+    if(!this.isLoading)
+      this.getCandles();
+  },
+  components: {
+    spinner,
+    chart,
+    paperTradeSummary
+  },
+  data: () => {
+    return {
+      candleFetch: 'idle',
+      candles: []
+    }
+  },
+  computed: {
+    stratrunners: function() {
+      return this.$store.state.stratrunners;
+    },
+    data: function() {
+      return _.find(this.stratrunners, {id: this.$route.params.id});
+    },
+    baseCandleConfig: () => {
+      return {
+        adapter: 'sqlite',
+        sqlite: {
+          path: 'plugins/sqlite',
+
+          dataDirectory: 'history',
+          version: 0.1,
+
+          dependencies: [{
+            module: 'sqlite3',
+            version: '3.1.4'
+          }]
+        }
+      }
+    },
+    chartData: function() {
+      return {
+        candles: this.candles,
+        trades: []
+      }
+    },
+    isLoading: function() {
+      if(!this.data)
+        return true;
+      if(!_.isObject(this.data.firstCandle))
+        return true;
+      if(!_.isObject(this.data.lastCandle))
+        return true;
+
+      return false;
+    },
+    watchers: function() {
+      return this.$store.state.watchers;
+    },
+    watcher: function() {
+      let watch = Vue.util.extend({}, this.data.watch);
+      return _.find(this.watchers, { watch });
+    },
+  },
+  watch: {
+    'data.lastCandle.start': function() {
+      this.candleFetch = 'dirty';
+    },
+    data: function(val, prev) {
+      if(this.isLoading)
+        return;
+
+      if(this.candleFetch !== 'fetched' )
+        this.getCandles();
+    }
+  },
+  methods: {
+    humanizeDuration: (n) => window.humanizeDuration(n),
+    moment: mom => moment.utc(mom),
+    fmt: mom => moment.utc(mom).format('YYYY-MM-DD HH:mm'),
+    getCandles: function() {
+      this.candleFetch = 'fetching';
+
+      let to = this.data.lastCandle.start;
+      let from = this.data.firstCandle.start;
+      let candleSize = this.data.strat.tradingAdvisor.candleSize;
+
+      let config = Vue.util.extend(
+        {
+          watch: this.data.watch,
+          daterange: {
+            to, from
+          },
+          // hourly candles
+          candleSize
+        },
+        this.baseCandleConfig
+      );
+
+      post('getCandles', config, (err, res) => {
+        this.candleFetch = 'fetched';
+        if(!res || res.error)
+          return;
+
+        this.candles = res.map(c => {
+          c.start = moment.unix(c.start).utc().format();
+          return c;
+        });
+      })
+    }
+  }
+}
+</script>
+
+<style>
+</style>
diff --git a/web/vue/src/components/gekko/singleWatcher.vue b/web/vue/src/components/gekko/singleWatcher.vue
index f8b160318..f61330c0a 100644
--- a/web/vue/src/components/gekko/singleWatcher.vue
+++ b/web/vue/src/components/gekko/singleWatcher.vue
@@ -17,19 +17,22 @@
           .grd-row-col-2-6 Asset
           .grd-row-col-4-6 {{ data.watch.asset }}
         h3 Statistics
-        .grd-row(v-if='data.firstCandle')
-          .grd-row-col-2-6 Watching since
-          .grd-row-col-4-6 {{ fmt(data.firstCandle.start) }}
-        .grd-row(v-if='data.lastCandle')
-          .grd-row-col-2-6 Received data until
-          .grd-row-col-4-6 {{ fmt(data.lastCandle.start) }}
-        .grd-row(v-if='data.lastCandle && data.firstCandle')
-          .grd-row-col-2-6 Data spanning
-          .grd-row-col-4-6 {{ humanizeDuration(moment(data.lastCandle.start).diff(moment(data.firstCandle.start))) }}
-      h3.contain Market graph
-      spinner(v-if='candleFetch === "fetching"')
-      template(v-if='candles.length')
-        chart(:data='chartData')
+        spinner(v-if='isLoading')
+        template(v-if='!isLoading')
+          .grd-row(v-if='data.firstCandle')
+            .grd-row-col-2-6 Watching since
+            .grd-row-col-4-6 {{ fmt(data.firstCandle.start) }}
+          .grd-row(v-if='data.lastCandle')
+            .grd-row-col-2-6 Received data until
+            .grd-row-col-4-6 {{ fmt(data.lastCandle.start) }}
+          .grd-row(v-if='data.lastCandle && data.firstCandle')
+            .grd-row-col-2-6 Data spanning
+            .grd-row-col-4-6 {{ humanizeDuration(moment(data.lastCandle.start).diff(moment(data.firstCandle.start))) }}
+      template(v-if='!isLoading')
+        h3.contain Market graph
+        spinner(v-if='candleFetch === "fetching"')
+        template(v-if='candles.length')
+          chart(:data='chartData')
 </template>
 
 <script>
@@ -43,11 +46,7 @@ import chart from '../backtester/result/chartWrapper.vue'
 
 export default {
   created: function() {
-    if(
-      this.data &&
-      this.candleFetch !== 'fetched' &&
-      this.data.firstCandle
-    )
+    if(!this.isLoading)
       this.getCandles();
   },
   components: {
@@ -88,7 +87,17 @@ export default {
         candles: this.candles,
         trades: []
       }
-    }
+    },
+    isLoading: function() {
+      if(!this.data)
+        return true;
+      if(!_.isObject(this.data.firstCandle))
+        return true;
+      if(!_.isObject(this.data.lastCandle))
+        return true;
+
+      return false;
+    },
   },
   watch: {
     'data.lastCandle.start': function() {
diff --git a/web/vue/src/components/global/paperTradeSummary.vue b/web/vue/src/components/global/paperTradeSummary.vue
new file mode 100644
index 000000000..7cdff2922
--- /dev/null
+++ b/web/vue/src/components/global/paperTradeSummary.vue
@@ -0,0 +1,60 @@
+<template lang='jade'>
+.grd-row-col-3-6
+  table.p1
+    tr
+      th amount of trades
+      td {{ report.trades }}
+    tr
+      th start balance
+      td {{ round(report.startBalance) }} {{ report.currency }}
+    tr
+      th final balance
+      td {{ round(report.balance) }} {{ report.currency }}
+    tr
+      th simulated profit
+
+  .big.txt--right.price(:class='profitClass') {{ round(report.relativeProfit) }}%
+
+</template>
+
+<script>
+
+export default {
+  props: ['report'],
+  methods: {
+    round: n => (+n).toFixed(5)
+  },
+  computed: {
+    profitClass: function() {
+      if(this.report.relativeProfit > 0)
+        return 'profit'
+      else
+        return 'loss'
+    }
+  }
+}
+</script>
+
+<style>
+.summary td {
+  text-align: right;
+}
+
+.big {
+  font-size: 1.7em;
+  width: 80%;
+}
+
+.summary table {
+  width: 80%;
+}
+
+.price.profit {
+  color: #7FFF00;
+}
+
+.price.loss {
+  color: red;
+}
+
+</style>
diff --git a/web/vue/src/components/layout/modal.vue b/web/vue/src/components/layout/modal.vue
new file mode 100644
index 000000000..c2cb03ba8
--- /dev/null
+++ b/web/vue/src/components/layout/modal.vue
@@ -0,0 +1,82 @@
+<template lang='jade'>
+  div(v-if='active')
+    #modal-background(v-on:click='disable')
+    #modal.modal
+      .modal-guts
+        p this is a modal!
+</template>
+
+<script>
+
+import marked from '../../tools/marked'
+
+export default {
+  data: () => {
+    return {
+      active: false
+    }
+  },
+  methods: {
+    clearMessages: function() {
+
+    },
+    disable: function() {
+      this.active = false;
+    },
+    enable: function() {
+      this.active = true;
+    },
+    gekkoCrashed: gekko => {
+      // only 2 types supported
+      let type = gekko.type === 'watcher' ? 'Market watcher' : 'Strat runner';
+      return marked(`
+        The ${type} ${gekko.id} crashed because:
+
+        ${gekko.error}
+      `)
+    }
+  }
+}
+</script>
+
+<style>
+#modal-background {
+  position: fixed;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+
+  background-color: black;
+  opacity: 0.5
+}
+
+.modal {
+  position: fixed;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  width: 600px;
+  min-height: 300px;
+  background-color: white;
+}
+
+.modal-guts {
+
+  /* other stuff we already covered */
+
+  /* cover the modal */
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+
+  /* spacing as needed */
+  padding: 20px 50px 20px 20px;
+
+  /* let it scroll */
+  overflow: auto;
+  
+}
+</style>
diff --git a/web/vue/src/d3/message.js b/web/vue/src/d3/message.js
new file mode 100644
index 000000000..a1b3eb028
--- /dev/null
+++ b/web/vue/src/d3/message.js
@@ -0,0 +1,11 @@
+export const draw = function(message) {
+  d3.select("#chart").append("text")
+      .attr('class', 'message')
+      .attr('x', 150)
+      .attr('y', 150)
+      .text(message);
+}
+
+export const clear = function() {
+  svg.find('text').remove();
+}
\ No newline at end of file
diff --git a/web/vue/src/main.js b/web/vue/src/main.js
index 0784355f9..1ce81f3ef 100644
--- a/web/vue/src/main.js
+++ b/web/vue/src/main.js
@@ -15,7 +15,7 @@ import singleImport from './components/data/import/single.vue'
 
 import gekkoList from './components/gekko/list.vue'
 import newGekko from './components/gekko/new.vue'
-import singleGekko from './components/gekko/singleGekko.vue'
+import singleStratrunner from './components/gekko/singleStratrunner.vue'
 import singleWatcher from './components/gekko/singleWatcher.vue'
 import { connect as connectWS } from './components/global/ws'
 import initializeState from './store/init'
@@ -31,7 +31,7 @@ const router = new VueRouter({
     { path: '/data/importer/import/:id', component: singleImport },
     { path: '/live-gekkos', component: gekkoList },
     { path: '/live-gekkos/new', component: newGekko },
-    { path: '/live-gekkos/gekko/:id', component: singleGekko },
+    { path: '/live-gekkos/stratrunner/:id', component: singleStratrunner },
     { path: '/live-gekkos/watcher/:id', component: singleWatcher }
   ]
 });
diff --git a/web/vue/src/store/index.js b/web/vue/src/store/index.js
index c2e536a5b..8af0732a4 100644
--- a/web/vue/src/store/index.js
+++ b/web/vue/src/store/index.js
@@ -4,6 +4,7 @@ import _ from 'lodash'
 
 import * as importMutations from './modules/imports/mutations'
 import * as watchMutations from './modules/watchers/mutations'
+import * as stratrunnerMutations from './modules/stratrunners/mutations'
 
 
 Vue.use(Vuex)
@@ -15,6 +16,7 @@ let mutations = {};
 // TODO: spread syntax
 _.merge(mutations, importMutations);
 _.merge(mutations, watchMutations);
+_.merge(mutations, stratrunnerMutations);
 
 export default new Vuex.Store({
   state: {
diff --git a/web/vue/src/store/init.js b/web/vue/src/store/init.js
index 82eca56c2..6c9a197ec 100644
--- a/web/vue/src/store/init.js
+++ b/web/vue/src/store/init.js
@@ -1,9 +1,12 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
+
 import syncImports from './modules/imports/sync'
 import syncWatchers from './modules/watchers/sync'
+import syncStratrunners from './modules/stratrunners/sync'
 
 export default function() {
   syncImports();
   syncWatchers();
+  syncStratrunners();
 }
\ No newline at end of file
diff --git a/web/vue/src/store/modules/messages/mutations.js b/web/vue/src/store/modules/messages/mutations.js
new file mode 100644
index 000000000..e69de29bb
diff --git a/web/vue/src/store/modules/stratrunners/mutations.js b/web/vue/src/store/modules/stratrunners/mutations.js
index 42f4f0f8e..a7ecc0f3c 100644
--- a/web/vue/src/store/modules/stratrunners/mutations.js
+++ b/web/vue/src/store/modules/stratrunners/mutations.js
@@ -1,3 +1,5 @@
+import Vue from 'vue'
+
 export const addStratrunner = (state, runner) => {
   state.stratrunners.push(runner);
   return state;
@@ -8,10 +10,14 @@ export const syncStratrunners = (state, runners) => {
   return state;
 }
 
-export const updateWatcher = (state, update) => {
-  let item = state.stratrunners.find(i => i.id === update.gekko_id);
+export const updateStratrunner = (state, update) => {
+  let index = state.stratrunners.findIndex(i => i.id === update.gekko_id);
+  let item = state.stratrunners[index];
   if(!item)
     return state;
-  _.merge(item, update.updates);
+
+  let updated = Vue.util.extend(item, update.updates);
+  Vue.set(state.stratrunners, index, updated);
+
   return state;
 }
\ No newline at end of file
diff --git a/web/vue/src/store/modules/stratrunners/sync.js b/web/vue/src/store/modules/stratrunners/sync.js
index 00ada2187..71e6366d8 100644
--- a/web/vue/src/store/modules/stratrunners/sync.js
+++ b/web/vue/src/store/modules/stratrunners/sync.js
@@ -5,16 +5,26 @@ import _ from 'lodash'
 
 const init = () => {
   get('gekkos', (err, resp) => {
-    let watchers = _.filter(resp, {mode: 'leech'});
-    store.commit('syncStratrunners', watchers);
+    let runners = _.filter(resp, {type: 'leech'});
+    store.commit('syncStratrunners', runners);
   });
 }
 
 const sync = () => {
-  bus.$on('update', data => {
-    if(data.gekko_mode === 'leech')
-      store.commit('updateStratrunner', data);
+
+  bus.$on('new_gekko', data => {
+    if(data.gekko.type === 'leech')
+      store.commit('addStratrunner', data.gekko);
   });
+
+  const update = (data) => {
+    store.commit('updateStratrunner', data);
+  }
+
+  bus.$on('update', update);
+  bus.$on('startAt', update);
+  bus.$on('lastCandle', update);
+  bus.$on('firstCandle', update);
 }
 
 export default function() {
diff --git a/web/vue/src/store/modules/watchers/sync.js b/web/vue/src/store/modules/watchers/sync.js
index 28fa9dcf8..f29506e83 100644
--- a/web/vue/src/store/modules/watchers/sync.js
+++ b/web/vue/src/store/modules/watchers/sync.js
@@ -5,7 +5,7 @@ import _ from 'lodash'
 
 const init = () => {
   get('gekkos', (err, resp) => {
-    let watchers = _.filter(resp, {mode: 'realtime'});
+    let watchers = _.filter(resp, {type: 'watcher'});
     store.commit('syncWatchers', watchers);
   });
 }
@@ -13,14 +13,12 @@ const init = () => {
 const sync = () => {
 
   bus.$on('new_gekko', data => {
-    if(data.gekko.mode === 'realtime')
+    if(data.gekko.type === 'watcher')
       store.commit('addWatcher', data.gekko);
   });
 
-
   const update = (data) => {
-    if(data.gekko_mode === 'realtime')
-      store.commit('updateWatcher', data);
+    store.commit('updateWatcher', data);
   }
 
   bus.$on('update', update);

From 92534c06a040a221c97c9726476af990b9721197 Mon Sep 17 00:00:00 2001
From: Mike van Rossum <mike@mikevanrossum.nl>
Date: Fri, 9 Dec 2016 13:55:18 +0000
Subject: [PATCH 23/25] fix if check.. (need more coffee)

---
 plugins/profitSimulator.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/profitSimulator.js b/plugins/profitSimulator.js
index 23739fb08..ff8d2c92a 100644
--- a/plugins/profitSimulator.js
+++ b/plugins/profitSimulator.js
@@ -127,7 +127,7 @@ Logger.prototype.jsonReport = function(advice) {
   var price = advice.candle.close;
   var at = advice.candle.start;
 
-  if(what !== 'short' || what !== 'long')
+  if(what !== 'short' && what !== 'long')
     return;
 
   var payload;
@@ -145,7 +145,7 @@ Logger.prototype.jsonReport = function(advice) {
       date: at,
       balance: this.current.asset * price
     }
-  
+
   cp.trade(payload);
 }
 

From ee491a93c00ecd90484d6d679b7e531e609dbe3c Mon Sep 17 00:00:00 2001
From: Mike van Rossum <mike@mikevanrossum.nl>
Date: Fri, 9 Dec 2016 18:12:52 +0000
Subject: [PATCH 24/25] add killGekko api endpoint

---
 core/markets/leech.js    |  7 +++++++
 web/routes/killGekko.js  | 42 ++++++++++++++++++++++++++++++++++++++++
 web/server.js            |  1 +
 web/state/listManager.js |  7 ++++++-
 4 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 web/routes/killGekko.js

diff --git a/core/markets/leech.js b/core/markets/leech.js
index fc90ab32f..fcb092aeb 100644
--- a/core/markets/leech.js
+++ b/core/markets/leech.js
@@ -78,6 +78,13 @@ Market.prototype.processCandles = function(err, candles) {
     return;
   }
 
+
+  // TODO:
+  // verify that the correct amount of candles was passed:
+  //
+  // if `this.latestTs` was at 10:00 and we receive 3 candles with the latest at 11:00
+  // we know we are missing 57 candles...
+
   _.each(candles, function(c, i) {
     c.start = moment.unix(c.start).utc();
     this.push(c);
diff --git a/web/routes/killGekko.js b/web/routes/killGekko.js
new file mode 100644
index 000000000..705ae6ba9
--- /dev/null
+++ b/web/routes/killGekko.js
@@ -0,0 +1,42 @@
+const _ = require('lodash');
+const promisify = require('tiny-promisify');
+const moment = require('moment');
+
+const pipelineRunner = promisify(require('../../core/workers/pipeline/parent'));
+const cache = require('../state/cache');
+const broadcast = cache.get('broadcast');
+const gekkoManager = cache.get('gekkos');
+
+const base = require('./baseConfig');
+
+// starts an import
+// requires a post body with a config object
+module.exports = function *() {
+
+  let id = this.request.body.id;
+
+  if(!id) {
+    this.body = {
+      status: 'not ok'
+    }
+    return;
+  }
+
+  let deleted = gekkoManager.delete(id);
+
+  if(!deleted){
+    this.body = {
+      status: 'not ok'
+    }
+    return; 
+  }
+
+  broadcast({
+    type: 'gekko_killed',
+    gekko_id: id
+  });
+
+  this.body = {
+    status: 'ok'
+  };
+}
\ No newline at end of file
diff --git a/web/server.js b/web/server.js
index 11c83f476..6b06d1850 100644
--- a/web/server.js
+++ b/web/server.js
@@ -52,6 +52,7 @@ router.post('/api/scansets', require(ROUTE('scanDatasets')));
 router.post('/api/backtest', require(ROUTE('backtest')));
 router.post('/api/import', require(ROUTE('import')));
 router.post('/api/startGekko', require(ROUTE('startGekko')));
+router.post('/api/killGekko', require(ROUTE('killGekko')));
 router.post('/api/getCandles', require(ROUTE('getCandles')));
 
 // incoming WS:
diff --git a/web/state/listManager.js b/web/state/listManager.js
index a3f0a3303..6877d1077 100644
--- a/web/state/listManager.js
+++ b/web/state/listManager.js
@@ -29,8 +29,13 @@ ListManager.prototype.update = function(id, updates) {
 
 // delete an item from the list
 ListManager.prototype.delete = function(id) {
+  let wasThere = this._list.find(i => i.id === id);
   this._list = this._list.filter(i => i.id !== id);
-  return true;
+
+  if(wasThere)
+    return true;
+  else
+    return false;
 }
 
 // getter

From c4edda479c49ca3e08286f62dbbed097b7846ca0 Mon Sep 17 00:00:00 2001
From: Mike van Rossum <mike@mikevanrossum.nl>
Date: Fri, 9 Dec 2016 21:24:35 +0000
Subject: [PATCH 25/25] watch for killed gekko

---
 web/routes/startGekko.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/web/routes/startGekko.js b/web/routes/startGekko.js
index bd50478b4..7c7f3ffee 100644
--- a/web/routes/startGekko.js
+++ b/web/routes/startGekko.js
@@ -39,10 +39,16 @@ module.exports = function *() {
       if(errored)
         return;
 
+      let deleted = gekkoManager.delete(id);
+
+      if(!deleted)
+        // it was already deleted
+        return;
+
+
       errored = true;
       console.error('RECEIVED ERROR IN GEKKO', id);
       console.error(err);
-      gekkoManager.delete(id);
       return broadcast({
         type: 'gekko_error',
         gekko_id: id,