pass thru if server/relay are connected

1 files changed, 243 insertions, 35 deletions

diff --git a/public/bundle.js b/public/bundle.js
index 7fafa10..136c87c 100644
--- a/public/bundle.js
+++ b/public/bundle.js
@@ -293,6 +293,72 @@ exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(
 
 /***/ }),
 
+/***/ "./app/client/common/param.component.js":
+/*!**********************************************!*\
+  !*** ./app/client/common/param.component.js ***!
+  \**********************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+
+var _preact = __webpack_require__(/*! preact */ "./node_modules/preact/dist/preact.esm.js");
+
+var _reactRedux = __webpack_require__(/*! react-redux */ "./node_modules/react-redux/es/index.js");
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+
+var Param = function (_Component) {
+  _inherits(Param, _Component);
+
+  function Param(props) {
+    _classCallCheck(this, Param);
+
+    return _possibleConstructorReturn(this, (Param.__proto__ || Object.getPrototypeOf(Param)).call(this, props));
+  }
+
+  _createClass(Param, [{
+    key: 'render',
+    value: function render() {
+      return (0, _preact.h)(
+        'div',
+        { className: 'button param' },
+        (0, _preact.h)(
+          'label',
+          null,
+          (0, _preact.h)(
+            'span',
+            null,
+            this.props.title
+          ),
+          (0, _preact.h)(
+            'span',
+            null,
+            this.props.children
+          )
+        )
+      );
+    }
+  }]);
+
+  return Param;
+}(_preact.Component);
+
+exports.default = Param;
+
+/***/ }),
+
 /***/ "./app/client/common/paramGroup.component.js":
 /*!***************************************************!*\
   !*** ./app/client/common/paramGroup.component.js ***!
@@ -2728,6 +2794,31 @@ var socket = io.connect('/client');
 
 // SOCKET ACTIONS
 
+socket.on('connect', function () {
+  return _store.store.dispatch({ type: _types2.default.socket.connect });
+});
+socket.on('connect_error', function (error) {
+  return _store.store.dispatch({ type: _types2.default.socket.connect_error, error: error });
+});
+socket.on('reconnect', function (attempt) {
+  return _store.store.dispatch({ type: _types2.default.socket.reconnect, attempt: attempt });
+});
+socket.on('reconnecting', function () {
+  return _store.store.dispatch({ type: _types2.default.socket.reconnecting });
+});
+socket.on('reconnect_error', function (error) {
+  return _store.store.dispatch({ type: _types2.default.socket.reconnect_error, error: error });
+});
+socket.on('reconnect_failed', function (error) {
+  return _store.store.dispatch({ type: _types2.default.socket.reconnect_failed, error: error });
+});
+socket.on('disconnect', function () {
+  return _store.store.dispatch({ type: _types2.default.socket.disconnect });
+});
+socket.on('error', function (error) {
+  return _store.store.dispatch({ type: _types2.default.socket.error, error: error });
+});
+
 socket.on('res', function (data) {
   console.log(data.cmd);
   switch (data.cmd) {
@@ -2771,6 +2862,10 @@ socket.on('res', function (data) {
 socket.on('system_res', function (data) {
   console.log('system response', data);
   switch (data.type) {
+    case 'relay_connected':
+      return _store.store.dispatch({ type: _types2.default.system.relay_connected });
+    case 'relay_disconnected':
+      return _store.store.dispatch({ type: _types2.default.system.relay_disconnected });
     case 'command_output':
       _store.store.dispatch({
         type: _types2.default.system.command_output,
@@ -2970,6 +3065,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
+var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+
 var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
 
 var _preact = __webpack_require__(/*! preact */ "./node_modules/preact/dist/preact.esm.js");
@@ -2982,17 +3079,9 @@ var _group = __webpack_require__(/*! ../common/group.component */ "./app/client/
 
 var _group2 = _interopRequireDefault(_group);
 
-var _slider = __webpack_require__(/*! ../common/slider.component */ "./app/client/common/slider.component.js");
-
-var _slider2 = _interopRequireDefault(_slider);
-
-var _select = __webpack_require__(/*! ../common/select.component */ "./app/client/common/select.component.js");
-
-var _select2 = _interopRequireDefault(_select);
-
-var _button = __webpack_require__(/*! ../common/button.component */ "./app/client/common/button.component.js");
+var _param = __webpack_require__(/*! ../common/param.component */ "./app/client/common/param.component.js");
 
-var _button2 = _interopRequireDefault(_button);
+var _param2 = _interopRequireDefault(_param);
 
 var _system = __webpack_require__(/*! ./system.actions */ "./app/client/system/system.actions.js");
 
@@ -3022,11 +3111,14 @@ var System = function (_Component) {
     value: function render() {
       var _props = this.props,
           site = _props.site,
+          server = _props.server,
+          relay = _props.relay,
+          rpc = _props.rpc,
           actions = _props.actions;
 
       return (0, _preact.h)(
         'div',
-        { className: 'dashboard' },
+        { className: 'system' },
         (0, _preact.h)(
           'div',
           { className: 'heading' },
@@ -3039,34 +3131,77 @@ var System = function (_Component) {
         ),
         (0, _preact.h)(
           'div',
-          { className: 'column' },
+          { className: 'row params' },
           (0, _preact.h)(
             _group2.default,
-            { title: 'Diagnostics' },
+            { title: 'Status' },
             (0, _preact.h)(
-              'button',
-              { onClick: function onClick() {
-                  return actions.run('nvidia-smi');
-                } },
-              'nvidia-smi'
+              _param2.default,
+              { title: 'Server' },
+              server.status
+            ),
+            server.error && (0, _preact.h)(
+              _param2.default,
+              { title: 'Server error' },
+              server.error.message
+            ),
+            (0, _preact.h)(
+              _param2.default,
+              { title: 'Relay' },
+              relay.status
+            ),
+            (0, _preact.h)(
+              _param2.default,
+              { title: 'RPC' },
+              rpc.status
+            ),
+            (0, _preact.h)(
+              _param2.default,
+              { title: 'CPU' },
+              'pix2pix dataset.py'
             ),
             (0, _preact.h)(
-              'button',
-              { onClick: function onClick() {
-                  return actions.run('ps');
-                } },
-              'ps'
+              _param2.default,
+              { title: 'GPU' },
+              'pix2pix train.py'
             ),
             (0, _preact.h)(
-              'button',
-              { onClick: function onClick() {
-                  return actions.run('w');
-                } },
-              'w'
+              _param2.default,
+              { title: 'Current Task' },
+              'train samplernn'
             )
           ),
-          this.renderCommandOutput()
-        )
+          (0, _preact.h)(
+            _group2.default,
+            { title: 'Diagnostics' },
+            (0, _preact.h)(
+              _param2.default,
+              { title: 'Commands' },
+              (0, _preact.h)(
+                'button',
+                { onClick: function onClick() {
+                    return actions.run('nvidia-smi');
+                  } },
+                'nvidia-smi'
+              ),
+              (0, _preact.h)(
+                'button',
+                { onClick: function onClick() {
+                    return actions.run('ps');
+                  } },
+                'ps'
+              ),
+              (0, _preact.h)(
+                'button',
+                { onClick: function onClick() {
+                    return actions.run('w');
+                  } },
+                'w'
+              )
+            )
+          )
+        ),
+        this.renderCommandOutput()
       );
     }
   }, {
@@ -3104,10 +3239,7 @@ var System = function (_Component) {
 }(_preact.Component);
 
 var mapStateToProps = function mapStateToProps(state) {
-  return {
-    site: state.system.site,
-    cmd: state.system.cmd
-  };
+  return _extends({}, state.system);
 };
 
 var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) {
@@ -3155,6 +3287,21 @@ var systemInitialState = {
   site: {
     name: 'Lens Cortex'
   },
+  server: {
+    connected: false,
+    status: "disconnected",
+    error: null
+  },
+  relay: {
+    connected: false,
+    status: "unknown",
+    error: null
+  },
+  rpc: {
+    connected: false,
+    status: "unknown",
+    error: null
+  },
   cmd: {
     loading: false,
     loaded: false,
@@ -3243,6 +3390,56 @@ var systemReducer = function systemReducer() {
   var action = arguments[1];
 
   switch (action.type) {
+    case _types2.default.socket.connect:
+    case _types2.default.socket.reconnecting:
+      return _extends({}, state, {
+        server: {
+          status: 'connected',
+          connected: true,
+          error: null
+        }
+      });
+    case _types2.default.socket.reconnect:
+      return _extends({}, state, {
+        server: {
+          status: 'reconnecting (attempt ' + action.attempt + ')',
+          connected: false,
+          error: null
+        }
+      });
+    case _types2.default.socket.connect_error:
+    case _types2.default.socket.reconnect_error:
+    case _types2.default.socket.disconnect:
+    case _types2.default.socket.reconnect_failed:
+      return _extends({}, state, {
+        server: {
+          status: 'disconnected',
+          connected: false,
+          error: action.error || null
+        }
+      });
+    case _types2.default.socket.error:
+      return _extends({}, state, {
+        server: _extends({}, state.socket, {
+          error: action.error
+        })
+      });
+    case _types2.default.system.relay_connected:
+      return _extends({}, state, {
+        relay: {
+          status: 'connected',
+          connected: true,
+          error: null
+        }
+      });
+    case _types2.default.system.relay_disconnected:
+      return _extends({}, state, {
+        relay: {
+          status: 'disconnected',
+          connected: false,
+          error: null
+        }
+      });
     case _types2.default.system.running_command:
       return _extends({}, state, {
         cmd: {
@@ -3290,9 +3487,20 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = {
 	system: {
 		running_command: 'SYSTEM_RUNNING_COMMAND',
-		command_output: 'SYSTEM_COMMAND_OUTPUT'
+		command_output: 'SYSTEM_COMMAND_OUTPUT',
+		relay_connected: 'SYSTEM_RELAY_CONNECTED',
+		relay_disconnected: 'SYSTEM_RELAY_DISCONNECTED'
 	},
 	socket: {
+		connect: 'SOCKET_CONNECT',
+		connect_error: 'SOCKET_CONNECT_ERROR',
+		reconnect: 'SOCKET_RECONNECT',
+		reconnecting: 'SOCKET_RECONNECTING',
+		reconnect_error: 'SOCKET_RECONNECT_ERROR',
+		reconnect_failed: 'SOCKET_RECONNECT_FAILED',
+		disconnect: 'SOCKET_DISCONNECT',
+		error: 'SOCKET_ERROR',
+
 		load_params: 'LOAD_PARAMS',
 		list_sequences: 'LIST_SEQUENCES',
 		list_epochs: 'LIST_EPOCHS'