diff options
| -rw-r--r-- | app/client/socket/socket.api.js | 7 | ||||
| -rw-r--r-- | app/server/bridge.js | 2 | ||||
| -rw-r--r-- | app/server/site.js | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/app/client/socket/socket.api.js b/app/client/socket/socket.api.js index 4ee0b75..a568aaf 100644 --- a/app/client/socket/socket.api.js +++ b/app/client/socket/socket.api.js @@ -4,6 +4,7 @@ import { socket } from './socket.connection' socket.on('api_res', (data) => { // console.log('system response', data) + data = parse(data) const type = types[data.datatype] console.log('api_res', data.type, data.datatype) if (! type) return console.error('socket:api_res bad datatype', data.datatype) @@ -12,19 +13,19 @@ socket.on('api_res', (data) => { return dispatch({ type: type.create, source: 'socket', - data: parse(data.data), + data: data.data, }) case 'update': return dispatch({ type: type.update, source: 'socket', - data: parse(data.data), + data: data.data, }) case 'destroy': return dispatch({ type: type.destroy, source: 'socket', - data: parse(data.data), + data: data.data, }) default: break diff --git a/app/server/bridge.js b/app/server/bridge.js index 1a744a3..9eba844 100644 --- a/app/server/bridge.js +++ b/app/server/bridge.js @@ -63,7 +63,7 @@ function bind_relay(socket) { db.models.file.update(data.task.opt.file_id, { dataset: data.task.dataset, }).then(file => { - client.emit('api_res', { type: 'update', datatype: 'file', data: JSON.stringify(file) }) + client.emit('api_res', JSON.stringify({ type: 'update', datatype: 'file', data: file })) }).catch(err => { console.error('error setting the dataset', err) }) diff --git a/app/server/site.js b/app/server/site.js index 99f1e63..85c932f 100644 --- a/app/server/site.js +++ b/app/server/site.js @@ -76,7 +76,7 @@ app.post('/api/folder/:id/upload/', if (req.body.should_relay === "true" || req.body.generated === "true") { console.log('relaying...') const client = require('./bridge').client - client.emit('api_res', { type: 'create', datatype: 'file', data: JSON.stringify(db_file) }) + client.emit('api_res', JSON.stringify({ type: 'create', datatype: 'file', data: db_file })) } resolve(db_file) }).catch( (err) => { |