diff options
Diffstat (limited to 'public/bundle.js')
| -rw-r--r-- | public/bundle.js | 99 |
1 files changed, 76 insertions, 23 deletions
diff --git a/public/bundle.js b/public/bundle.js index 67d1ce0..5ca8eef 100644 --- a/public/bundle.js +++ b/public/bundle.js @@ -3045,15 +3045,27 @@ _socket.socket.on('system_res', function (data) { console.log('system response', data); switch (data.type) { case 'relay_connected': - return (0, _store.dispatch)({ type: _types2.default.system.relay_connected }); + return (0, _store.dispatch)({ + type: _types2.default.system.relay_connected + }); case 'relay_disconnected': - return (0, _store.dispatch)({ type: _types2.default.system.relay_disconnected }); + return (0, _store.dispatch)({ + type: _types2.default.system.relay_disconnected + }); case 'rpc_connected': - return (0, _store.dispatch)({ type: _types2.default.system.rpc_connected, runner: data.runner }); + return (0, _store.dispatch)({ + type: _types2.default.system.rpc_connected, + runner: data.runner + }); case 'rpc_disconnected': - return (0, _store.dispatch)({ type: _types2.default.system.rpc_disconnected }); + return (0, _store.dispatch)({ + type: _types2.default.system.rpc_disconnected + }); case 'relay_status': - return (0, _store.dispatch)({ type: data.rpc_connected ? _types2.default.system.rpc_connected : _types2.default.system.rpc_disconnected, runner: data.runner }); + return (0, _store.dispatch)({ + type: data.rpc_connected ? _types2.default.system.rpc_connected : _types2.default.system.rpc_disconnected, + runner: data.runner + }); case 'command_output': return (0, _store.dispatch)({ type: _types2.default.system.command_output, @@ -3101,6 +3113,8 @@ var _socket = __webpack_require__(/*! ./socket.connection */ "./app/client/socke function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } +var finishTimeout = void 0; + _socket.socket.on('task_res', function (data) { console.log('system response', data); switch (data.type) { @@ -3108,12 +3122,15 @@ _socket.socket.on('task_res', function (data) { // return dispatch({ type: types.system.rpc_connected, runner: data.runner }) break; case 'task_begin': - return (0, _store.dispatch)({ type: _types2.default.task.task_begin, data: data.data }); + clearTimeout(finishTimeout); + return (0, _store.dispatch)({ type: _types2.default.task.task_begin, task: data.task }); break; case 'stop': break; case 'task_finish': - return (0, _store.dispatch)({ type: _types2.default.task.task_finish, data: data.data }); + return finishTimeout = setTimeout(function () { + return (0, _store.dispatch)({ type: _types2.default.task.task_finish, task: data.task }); + }, 100); break; case 'kill': break; @@ -3242,7 +3259,7 @@ exports.run = undefined; var _socket = __webpack_require__(/*! ../socket */ "./app/client/socket/index.js"); -var socket = _interopRequireWildcard(_socket); +var _socket2 = _interopRequireDefault(_socket); var _types = __webpack_require__(/*! ../types */ "./app/client/types.js"); @@ -3250,10 +3267,8 @@ var _types2 = _interopRequireDefault(_types); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -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; } } - var run = exports.run = function run(cmd) { - socket.system.run_system_command(cmd); + _socket2.default.system.run_system_command(cmd); return { type: _types2.default.system.running_command, cmd: cmd }; }; @@ -3341,12 +3356,21 @@ var System = function (_Component) { } _createClass(System, [{ + key: 'componentDidUpdate', + value: function componentDidUpdate() { + console.log(this._screen.scrollHeight, this._screen.scrollTop, this._screen.offsetHeight); + if (this._screen.scrollHeight > this._screen.scrollTop - this._screen.offsetHeight + 100) { + this._screen.scrollTop = this._screen.scrollHeight; + } + } + }, { key: 'render', value: function render() { var _props = this.props, site = _props.site, server = _props.server, relay = _props.relay, + runner = _props.runner, rpc = _props.rpc, actions = _props.actions; @@ -3395,17 +3419,12 @@ var System = function (_Component) { (0, _preact.h)( _param2.default, { title: 'CPU' }, - rpc.cpu_cmd + this.renderStatus(runner.cpu) ), (0, _preact.h)( _param2.default, { title: 'GPU' }, - rpc.gpu_cmd - ), - (0, _preact.h)( - _param2.default, - { title: 'Current Task' }, - 'train samplernn' + this.renderStatus(runner.gpu) ) ), (0, _preact.h)( @@ -3520,8 +3539,22 @@ var System = function (_Component) { ); } }, { + key: 'renderStatus', + value: function renderStatus(processor) { + if (!processor) { + return 'unknown'; + } + if (processor.status === 'IDLE') { + return 'idle'; + } + var task = processor.task; + return task.activity + ' ' + task.module; + } + }, { key: 'renderCommandOutput', value: function renderCommandOutput() { + var _this2 = this; + var _props2 = this.props, cmd = _props2.cmd, stdout = _props2.stdout, @@ -3542,7 +3575,7 @@ var System = function (_Component) { } } else { output = stdout; - if (cmd.stderr) { + if (stderr.length) { output += '\n\n_________________________________\n\n'; output += stderr; } @@ -3552,7 +3585,9 @@ var System = function (_Component) { null, (0, _preact.h)( 'div', - { className: 'screen' }, + { ref: function ref(_ref) { + return _this2._screen = _ref; + }, className: 'screen' }, output ) ); @@ -3605,6 +3640,8 @@ var _moment2 = _interopRequireDefault(_moment); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } +function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } + var FileSaver = __webpack_require__(/*! file-saver */ "./node_modules/file-saver/FileSaver.js"); var systemInitialState = { @@ -3627,8 +3664,6 @@ var systemInitialState = { rpc: { connected: false, status: "unknown", - cpu_cmd: "unknown", - gpu_cmd: "unknown", error: null }, cmd: { @@ -3639,6 +3674,10 @@ var systemInitialState = { stdout: "", stderr: "" }, + runner: { + cpu: { status: 'IDLE', task: {} }, + gpu: { status: 'IDLE', task: {} } + }, stdout: "", stderr: "" }; @@ -3709,7 +3748,8 @@ var systemReducer = function systemReducer() { status: 'connected', connected: true, error: null - } + }, + runner: action.runner }); case _types2.default.system.rpc_connected: return _extends({}, state, { @@ -3743,9 +3783,22 @@ var systemReducer = function systemReducer() { }); case _types2.default.task.task_begin: return _extends({}, state, { + runner: _extends({}, state.runner, _defineProperty({}, action.task.processor, { status: 'RUNNING', task: action.task })), + cmd: _extends({}, state.cmd, { + loaded: false, + stdout: "", + stderr: "" + }), stdout: "", stderr: "" }); + case _types2.default.task.task_finish: + if (state.runner[action.task.processor].task.uuid !== action.task.uuid) { + return state; + } + return _extends({}, state, { + runner: _extends({}, state.runner, _defineProperty({}, action.task.processor, { status: 'IDLE', task: {} })) + }); case _types2.default.system.stdout: return _extends({}, state, { stdout: state.stdout + action.data |