diff options
Diffstat (limited to 'app/client/socket')
| -rw-r--r-- | app/client/socket/socket.live.js | 2 | ||||
| -rw-r--r-- | app/client/socket/socket.task.js | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/app/client/socket/socket.live.js b/app/client/socket/socket.live.js index 867b391..56fd279 100644 --- a/app/client/socket/socket.live.js +++ b/app/client/socket/socket.live.js @@ -5,7 +5,7 @@ import * as player from '../live/player' import { socket } from './socket.connection' socket.on('res', (data) => { - console.log(data.cmd) + console.log('socket:', data.cmd) switch (data.cmd) { case 'get_last_frame': if (data.res !== 'working') { diff --git a/app/client/socket/socket.task.js b/app/client/socket/socket.task.js index ba074c0..595066e 100644 --- a/app/client/socket/socket.task.js +++ b/app/client/socket/socket.task.js @@ -11,14 +11,14 @@ socket.on('task_res', (data) => { case 'start': // return dispatch({ type: types.system.rpc_connected, runner: data.runner }) break - case 'task_begin': - clearTimeout(finishTimeout) - return dispatch({ type: types.task.task_begin, task: data.task }) - break case 'stop': break + // begin and finish calls often arrive out of order, if the old task was preempted + case 'task_begin': + dispatch({ type: types.task.task_begin, task: data.task }) + break case 'task_finish': - return finishTimeout = setTimeout(() => dispatch({ type: types.task.task_finish, task: data.task }), 100) + dispatch({ type: types.task.task_finish, task: data.task }) break case 'kill': break |