modularize... circular dependencies... whatever

1 files changed, 107 insertions, 8 deletions

diff --git a/public/bundle.js b/public/bundle.js
index b44ce93..82a6d13 100644
--- a/public/bundle.js
+++ b/public/bundle.js
@@ -2786,6 +2786,10 @@ var _socket3 = __webpack_require__(/*! ./socket.live */ "./app/client/socket/soc
 
 var live = _interopRequireWildcard(_socket3);
 
+var _socket4 = __webpack_require__(/*! ./socket.task */ "./app/client/socket/socket.task.js");
+
+var task = _interopRequireWildcard(_socket4);
+
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -2793,7 +2797,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 exports.default = {
   socket: _socket.socket,
   system: system,
-  live: live
+  live: live,
+  task: task
 };
 
 
@@ -3067,6 +3072,59 @@ function run_system_command(cmd) {
 
 /***/ }),
 
+/***/ "./app/client/socket/socket.task.js":
+/*!******************************************!*\
+  !*** ./app/client/socket/socket.task.js ***!
+  \******************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.start_task = start_task;
+exports.stop_task = stop_task;
+
+var _store = __webpack_require__(/*! ../store */ "./app/client/store.js");
+
+var _types = __webpack_require__(/*! ../types */ "./app/client/types.js");
+
+var _types2 = _interopRequireDefault(_types);
+
+var _socket = __webpack_require__(/*! ./socket.connection */ "./app/client/socket/socket.connection.js");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+_socket.socket.on('task_res', function (data) {
+  console.log('system response', data);
+  switch (data.type) {
+    // case 'rpc_connected':
+    //   return dispatch({ type: types.system.rpc_connected, runner: data.runner })
+    default:
+      return console.log('no such task command', data.type);
+  }
+});
+
+function start_task(task, preempt) {
+  _socket.socket.emit('task', {
+    type: 'start',
+    task: task,
+    preempt: preempt
+  });
+}
+
+function stop_task(task) {
+  _socket.socket.emit('task', {
+    type: 'stop',
+    task: task
+  });
+}
+
+/***/ }),
+
 /***/ "./app/client/store.js":
 /*!*****************************!*\
   !*** ./app/client/store.js ***!
@@ -3215,14 +3273,26 @@ function _possibleConstructorReturn(self, call) { if (!self) { throw new Referen
 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 cpu_test_task = {
-  id: 1073,
-  activity: 'train',
+  activity: 'cpu',
+  library: 'test',
+  dataset: 'test',
+  epochs: 1,
+  opt: {}
+};
+var gpu_test_task = {
+  activity: 'gpu',
+  library: 'test',
+  dataset: 'test',
+  epochs: 1,
+  opt: {}
+};
+var live_test_task = {
+  activity: 'live',
   library: 'test',
   dataset: 'test',
   epochs: 1,
   opt: {}
 };
-var gpu_test_task = {};
 
 var System = function (_Component) {
   _inherits(System, _Component);
@@ -3358,7 +3428,7 @@ var System = function (_Component) {
                 (0, _preact.h)(
                   'button',
                   { onClick: function onClick() {
-                      return actions.task.start_task(cpu_test_task);
+                      return actions.task.start_task(cpu_test_task, { preempt: true, watch: true });
                     } },
                   'Start'
                 ),
@@ -3376,7 +3446,7 @@ var System = function (_Component) {
                 (0, _preact.h)(
                   'button',
                   { onClick: function onClick() {
-                      return actions.task.start_task(gpu_test_task);
+                      return actions.task.start_task(gpu_test_task, { preempt: true, watch: true });
                     } },
                   'Start'
                 ),
@@ -3387,6 +3457,24 @@ var System = function (_Component) {
                     } },
                   'Stop'
                 )
+              ),
+              (0, _preact.h)(
+                _param2.default,
+                { title: 'Live Test Task' },
+                (0, _preact.h)(
+                  'button',
+                  { onClick: function onClick() {
+                      return actions.task.start_task(live_test_task, { preempt: true, watch: true });
+                    } },
+                  'Start'
+                ),
+                (0, _preact.h)(
+                  'button',
+                  { onClick: function onClick() {
+                      return actions.task.stop_task(live_test_task);
+                    } },
+                  'Stop'
+                )
               )
             )
           ),
@@ -3629,19 +3717,30 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.stop_task = exports.start_task = undefined;
 
+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 _socket = __webpack_require__(/*! ../socket */ "./app/client/socket/index.js");
 
 var _socket2 = _interopRequireDefault(_socket);
 
+var _types = __webpack_require__(/*! ../types */ "./app/client/types.js");
+
+var _types2 = _interopRequireDefault(_types);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var start_task = exports.start_task = function start_task(task) {
+  var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
   _socket2.default.task.start_task(task);
-  return { type: types.task.starting_task, task: task };
+  return _extends({ type: _types2.default.task.starting_task, task: task }, opt);
 };
+
 var stop_task = exports.stop_task = function stop_task(task) {
+  var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
   _socket2.default.task.stop_task(task);
-  return { type: types.task.stopping_task, task: task };
+  return _extends({ type: _types2.default.task.stopping_task, task: task }, opt);
 };
 
 /***/ }),